patch #432052 to add portability to IRIX, HP-UX and AIX (Russ Allbery)

diff --git a/acconfig.h b/acconfig.h
index f77a5e4335e17fe39b919cb9dc8fa1a20a30d8ee..0557907f32220c2e4ea0c02cf287402546d7ee1c 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -12,6 +12,7 @@
 #undef FHS_COMPATIBILITY
 #undef FORCE_UIDGID
 #undef HAVE_2ARG_DBTOB
+#undef HAVE_32BIT_LONGS
 #undef HAVE_64BIT_LONGS
 #undef HAVE_BROKEN_CPP
 #undef HAVE_BROKEN_DBTOB

diff --git a/configure.in b/configure.in
index d34a46f646f82a4dc24f9a0e0530fc1ba548826b..e7c0727673d8049aaa6260f99102f18190177507 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.83 2001-06-11 17:27:29 rufustfirefly Exp $
+dnl $Id: configure.in,v 1.84 2001-06-11 17:31:46 rufustfirefly Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -380,7 +380,10 @@ dnl ac_cv_target_os is now host_os, ac_cv_target_cpu is now host_cpu
 
 dnl --------------------- determine operating system from "target"
 case "$host_os" in
+       *aix*)                          this_os=aix ;;
        *freebsd*)                      this_os=freebsd ;;
+       *hpux11*)                       this_os=hpux11 ;;
+       *irix*)                         this_os=irix ;;
        *linux*)                        this_os=linux ;;
        *osx*)                          this_os=macosx ;;
        *netbsd*)                       this_os=netbsd ;;
@@ -398,6 +401,17 @@ esac
 
 dnl --------------------- operating system specific flags (port from sys/*)
 
+dnl ----- AIX specific -----
+if test x"$this_os" = "xaix"; then
+       AC_MSG_RESULT([ * AIX specific configuration])
+       AC_DEFINE(NO_STRUCT_TM_GMTOFF)
+
+       dnl This is probably a lie; AIX 4.3 supports a 64-bit long
+       dnl compilation environment.  It's enough to get things defined
+       dnl right in endian.h provided that long long is supported, though.
+       AC_DEFINE(HAVE_32BIT_LONGS)
+fi
+
 dnl ----- FreeBSD specific -----
 if test x"$this_os" = "xfreebsd"; then 
        AC_MSG_RESULT([ * FreeBSD specific configuration])
@@ -408,6 +422,21 @@ if test x"$this_os" = "xfreebsd"; then
        LDSHAREDFLAGS="-shared"
 fi
 
+dnl ----- HP-UX 11 specific -----
+if test x"$this_os" = "xhpux11"; then
+       AC_MSG_RESULT([ * HP-UX 11 specific configuration])
+
+       AC_DEFINE(_ISOC9X_SOURCE)
+       AC_DEFINE(NO_STRUCT_TM_GMTOFF)
+fi
+
+dnl ----- IRIX specific -----
+if test x"$this_os" = "xirix"; then
+       AC_MSG_RESULT([ * IRIX specific configuration])
+
+       AC_DEFINE(NO_STRUCT_TM_GMTOFF)
+fi
+
 dnl ----- Linux specific -----
 if test x"$this_os" = "xlinux"; then 
        AC_MSG_RESULT([ * Linux specific configuration])

diff --git a/libatalk/util/server_child.c b/libatalk/util/server_child.c
index 7e26eb0332715f875ca64fda77d7dac9bc26aefe..5ecc7368aa9d3156d294ce9994dafd6213e38ace 100644 (file)
--- a/libatalk/util/server_child.c
+++ b/libatalk/util/server_child.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <signal.h>
-#include <sys/syslog.h>
+#include <syslog.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 

diff --git a/libatalk/util/server_lock.c b/libatalk/util/server_lock.c
index e3669ac8a1caf1fd39f7b9d37b08c5937e9edafa..8d023e7033aff244c5c9473e82eb8cf81a8edd2c 100644 (file)
--- a/libatalk/util/server_lock.c
+++ b/libatalk/util/server_lock.c
@@ -65,11 +65,15 @@ pid_t server_lock(char *program, char *pidfile, int debug)
       fclose(stdout);
       fclose(stderr);
 
+#ifdef TIOCNOTTY
       if (( i = open( "/dev/tty", O_RDWR )) >= 0 ) {
        (void)ioctl( i, TIOCNOTTY, 0 );
        setpgid( 0, getpid());
        (void) close(i);
       }
+#else
+      setpgid( 0, getpid());
+#endif
       break;
     case -1 :  /* error */
       perror( "fork" );

diff --git a/sys/netatalk/endian.h b/sys/netatalk/endian.h
index 532eb28cfc84ac651365756de5f6ace30eb7def7..f4bf069c962173f17345b7f38b8b5be43dfd0a05 100644 (file)
--- a/sys/netatalk/endian.h
+++ b/sys/netatalk/endian.h
@@ -91,7 +91,7 @@ typedef unsigned long long  u_int64_t;
 #define BYTE_ORDER     BIG_ENDIAN
 #endif /*i386*/
 #else
-#ifdef MIPSEB
+#if defined(MIPSEB) || defined(__hppa)
 #define BYTE_ORDER     BIG_ENDIAN
 #else
 #ifdef MIPSEL