Jonathan Newman's USE_LASTDID and host_{os,cpu} patches

diff --git a/acconfig.h b/acconfig.h
index 164048f0c2451456a3834457b7a75d03fdd35b7c..a1ea43670dbecf3717943d8e4b595d44728b1f9c 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -27,4 +27,5 @@
 #undef USE_CAP
 #undef USE_CRACKLIB
 #undef USE_FLOCK_LOCKS
+#undef USE_LASTDID
 #undef USE_PAM

diff --git a/configure.in b/configure.in
index 2614a6b07fa1dd92193eab9754e335f80100f6e1..62d5ab50eb4edd73bccc3fabc04a500b936b61a5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -83,7 +83,7 @@ AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/file.h sys/ioctl.h sys/time.h sy
 
 # Allow user to specify flags
 AC_ARG_WITH(cflags,
-       [  --with-cflags           Specify additional flags to pass to compiler],
+       [  --with-cflags           specify additional flags to pass to compiler],
        [
                if test "x$withval" != "xno" ; then
                        CFLAGS="$CFLAGS $withval"
@@ -91,7 +91,7 @@ AC_ARG_WITH(cflags,
        ]       
 )
 AC_ARG_WITH(libs,
-       [  --with-libs             Specify additional libraries to link with],
+       [  --with-libs             specify additional libraries to link with],
        [
                if test "x$withval" != "xno" ; then
                        LIBS="$LIBS $withval"
@@ -201,11 +201,19 @@ dnl currently no one working on further development/fixes of DROPKLUDGE.
 dnl -----------
 
 AC_ARG_ENABLE(dropkludge,
-       [  --enable-dropkludge    enable the experimental dropbox fix (INSECURE!) ],
+       [  --enable-dropkludge     enable the experimental dropbox fix (INSECURE!) ],
        AC_DEFINE(DROPKLUDGE, 1)
        AC_MSG_RESULT([enabling experimental dropbox support])
 )
 
+AC_ARG_ENABLE(lastdid,
+       [  --enable-lastdid        enable build without DID dev/inode mapping kludge],
+       if test "$enableval" = "yes"; then 
+               AC_DEFINE(USE_LASTDID, 1)
+               AC_MSG_RESULT([enabling build without DID dev/inode mapping kludge])
+       fi
+)
+
 msg_dir=""
 AC_ARG_WITH(message-dir,
        [  --with-msg-dir=path     path to message files [default=/etc/atalk/msg]],
@@ -269,8 +277,10 @@ dnl --------------------------------------------------------------------------
 dnl specific configuration comes in here:
 dnl --------------------------------------------------------------------------
 
+dnl ac_cv_target_os is now host_os, ac_cv_target_cpu is now host_cpu
+
 dnl --------------------- determine operating system from "target"
-case "$ac_cv_target_os" in
+case "$host_os" in
        *freebsd*)                      this_os=freebsd ;;
        *linux*)                        this_os=linux ;;
        *osx*)                          this_os=macosx ;;
@@ -279,7 +289,7 @@ case "$ac_cv_target_os" in
        *solaris*)                      this_os=solaris ;;
 esac
 
-case "$ac_cv_target_cpu" in
+case "$host_cpu" in
        i386|i486|i586|i686|k7)         this_cpu=x86 ;;
        alpha)                          this_cpu=alpha ;;
        mips)                           this_cpu=mips ;;
@@ -351,7 +361,8 @@ fi
 
 dnl -- look for openssl  
 AC_ARG_WITH(ssl-dir,
-       [  --with-ssl-dir=PATH  Specify path to openssl installation (must contain lib and include dirs) ],
+       [  --with-ssl-dir=PATH     specify path to openssl installation (must contain
+                          lib and include dirs) ],
        [
                if test "x$withval" != "$xno"; then
                        tryssldir=$withval