add a missing $DESTDIR from Vlad Agranovsky exanet.com.

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index 88eec162d25c331e1294a3dc2d3dcf7f225d20e7..a5edb524ced3fdb2c44afdd871f42af8c1318d07 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.179.2.3.2.28 2004-05-18 23:42:30 bfernhomberg Exp $
+dnl $Id: configure.in,v 1.179.2.3.2.32 2004-06-28 22:48:48 didg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -546,6 +546,8 @@ AC_ARG_WITH(uams-path,
        ]
 )
 
+NETATALK_AC_CUPS
+
 dnl --------------------------------------------------------------------------
 dnl FHS stuff has to be done last because it overrides other defaults
 dnl --------------------------------------------------------------------------
@@ -703,14 +705,15 @@ fi
        AC_DEFINE(HAVE_BROKEN_DBTOB, 1, [Define if dbtob is broken])
 
        netatalk_cv_linux_sendfile=no
-        AC_ARG_ENABLE(sendfile,
-           [  --enable-sendfile       use sendfile syscall default (no) ],[
-               if test "$enableval" = "yes"; then
-                       netatalk_cv_linux_sendfile=yes
-               fi
-               AC_MSG_RESULT([enabling sendfile syscall])
-           ]
-        )
+dnl    disable this for now, code doesn't use sendfile anyway
+dnl        AC_ARG_ENABLE(sendfile,
+dnl        [  --enable-sendfile       use sendfile syscall default (no) ],[
+dnl            if test "$enableval" = "yes"; then
+dnl                    netatalk_cv_linux_sendfile=yes
+dnl            fi
+dnl            AC_MSG_RESULT([enabling sendfile syscall])
+dnl        ]
+dnl       )
 
        if test x"$netatalk_cv_linux_sendfile" = "xyes"; then 
            AC_CACHE_CHECK([for linux sendfile support],netatalk_cv_HAVE_SENDFILE,[
@@ -830,14 +833,26 @@ if test x"$this_os" = "xsolaris"; then
 
           AC_MSG_RESULT([$COMPILE_64BIT_KMODULE])
 
-
           if test "${GCC}" = yes; then
                COMPILE_KERNEL_GCC=yes
                if test "$COMPILE_64BIT_KMODULE" = yes; then
-                       # use for 64 bit
-                       KCFLAGS="-m64"
-                       #KLDFLAGS="-melf64_sparc"
-                       KLDFLAGS="-64"
+               
+                        AC_MSG_CHECKING([if we can build a 64bit kernel module])
+                       
+                        case `$CC --version 2>/dev/null` in
+                       [[12]].* | 3.0.*)
+                               COMPILE_64BIT_KMODULE=no
+                               COMPILE_KERNEL_GCC=no   
+                               solaris_module=no;;
+                       *)
+                               # use for 64 bit
+                               KCFLAGS="-m64"
+                               #KLDFLAGS="-melf64_sparc"
+                               KLDFLAGS="-64";;
+                       esac    
+                       
+                       AC_MSG_RESULT([$COMPILE_64BIT_KMODULE])
+                       
                else
                        KCFLAGS=""
                        KLDFLAGS=""
@@ -1021,6 +1036,7 @@ AC_OUTPUT([Makefile
        contrib/shell_utils/apple_cp
        contrib/shell_utils/apple_mv
        contrib/shell_utils/apple_rm
+       contrib/shell_utils/asip-status.pl
        contrib/shell_utils/cleanappledouble.pl
        contrib/shell_utils/netatalkshorternamelinks.pl
        contrib/timelord/Makefile