X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=b643b90b2ea02d60b35b93790b1059b2a0cc0a20;hb=refs%2Ftags%2Fbefore-ipv6;hp=4425151ae2617a9bae74f1d1b8b659ba44b062cb;hpb=9753ac7c67d4871ea344993538b08c3850ad12e7;p=netatalk.git

diff --git a/configure.in b/configure.in
index 4425151a..b643b90b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.217 2009-04-28 13:01:24 franklahm Exp $
+dnl $Id: configure.in,v 1.223 2009-10-25 09:47:03 didg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -13,6 +13,7 @@ AM_CONFIG_HEADER(config.h)
 dnl Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC
+AC_PROG_CC_C99
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
@@ -206,22 +207,6 @@ NETATALK_AFS_CHECK
 
 NETATALK_CONFIG_DIRS
 
-AC_MSG_CHECKING([whether to force logfile])
-AC_ARG_WITH(logfile,
-	[  --with-logfile=PATH     force logging to file PATH],[
-        if test x"$withval" = x"no"; then
-		AC_MSG_RESULT([no, syslog])
-	elif test "$withval" != "yes"; then
-		AC_DEFINE_UNQUOTED(LOGFILEPATH, "$withval", [Path to the log file])
-		AC_MSG_RESULT([$withval])
-	else
-		AC_DEFINE_UNQUOTED(LOGFILEPATH, "/var/log/netatalk.log", [Path to the log file])
-		AC_MSG_RESULT([/var/log/netatalk.log]) 
-	fi],[
-	AC_MSG_RESULT([no, syslog])
-	]
-)
-
 netatalk_cv_with_cracklib=no
 AC_ARG_WITH(cracklib,
 	[  --with-cracklib=DICT    enable/set location of cracklib dictionary],[
@@ -723,15 +708,14 @@ fi
 	AC_DEFINE(HAVE_BROKEN_DBTOB, 1, [Define if dbtob is broken])
 
 	netatalk_cv_linux_sendfile=no
-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       )
+        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])
+	    ]
+       )
 
 	if test x"$netatalk_cv_linux_sendfile" = "xyes"; then 
 	    AC_CACHE_CHECK([for linux sendfile support],netatalk_cv_HAVE_SENDFILE,[
@@ -1058,27 +1042,20 @@ fi
 AC_SUBST(LIBATALK_ACLS)
 
 dnl --------------------- check for Extended Attributes support
-neta_cv_extattrs="no"
-AC_MSG_CHECKING([if Extended Attribute Support should be enabled])
-AC_ARG_ENABLE(extattrs,
-	[  --enable-extattrs       enable Extended Attributes],[
-	if test x"$enableval" = x"yes"; then
-	   AC_MSG_RESULT([yes])
-	   neta_cv_extattrs="yes"
-	else
-	   AC_MSG_RESULT([no])
-	fi],[
-	   AC_MSG_RESULT([no])
-	]
-)
-if test x$neta_cv_extattrs = xyes; then
-   	AC_CHECK_LIB(c,attropen,neta_cv_extattrs=yes,neta_cv_extattrs=no)
-fi
-if test x$neta_cv_extattrs = xyes; then
-	AC_MSG_NOTICE([Enabling Extended Attributes support])
-	AC_DEFINE([HAVE_EXT_ATTRS], 1, [Enable Extended Attributes])
+neta_cv_eas="adouble"
+if test "x$this_os" = "xsolaris"; then
+   	AC_CHECK_LIB(c,attropen, [
+            neta_cv_eas="$neta_cv_eas Solaris"
+            neta_cv_solaris_eas="yes"
+            AC_MSG_NOTICE([Enabling Solaris Extended Attributes support])
+            AC_DEFINE([HAVE_SOLARIS_EAS], 1, [Enable Extended Attributes])
+        ]
+    )
 fi
 
+dnl --------------------- Netatalk Webmin
+NETATALK_WEBMIN
+
 dnl --------------------- last minute substitutions
 
 AC_SUBST(LIBS)
@@ -1091,7 +1068,7 @@ AM_CONDITIONAL(COMPILE_A2BOOT, test x$compile_a2boot = xyes)
 AM_CONDITIONAL(HAVE_LIBGCRYPT, test x$neta_cv_have_libgcrypt = xyes)
 AM_CONDITIONAL(HAVE_OPENSSL, test x$neta_cv_have_openssl = xyes)
 AM_CONDITIONAL(USE_NFSv4_ACLS, test x$neta_cv_nfsv4acl = xyes)
-AM_CONDITIONAL(USE_EXT_ATTRS, test x$neta_cv_extattrs = xyes)
+AM_CONDITIONAL(USE_SOLARIS_EAS, test x$neta_cv_solaris_eas = xyes)
 AM_CONDITIONAL(USE_DHX, test x$neta_cv_compile_dhx = xyes)
 AM_CONDITIONAL(USE_DHX2, test x$neta_cv_compile_dhx2 = xyes)
 AM_CONDITIONAL(USE_RANDNUM, test x$neta_cv_have_openssl = xyes)
@@ -1185,6 +1162,7 @@ AC_OUTPUT([Makefile
 	libatalk/tdb/Makefile
 	libatalk/unicode/Makefile
 	libatalk/unicode/charsets/Makefile
+	libatalk/vfs/Makefile
 	macros/Makefile
 	man/Makefile
 	man/man1/Makefile