autoconf updates from trunk.

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index 262430b3da0e03373680fe6c800c2b84c9d63d4b..806b44f3346d11989039edd0cf8b1c4e322fe0cf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.126.2.7 2001-12-31 20:09:38 srittau Exp $
+dnl $Id: configure.in,v 1.126.2.19 2002-03-12 11:19:27 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -18,6 +18,9 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
+AC_PROG_PERL
+AC_PROG_GREP
+AC_PROG_PS
 
 dnl *********************************************************************
 dnl FIXME! FIXME! These should be selectable properly, and should produce
@@ -116,22 +119,11 @@ AC_ARG_WITH(admin-group,
                AC_DEFINE(ADMIN_GRP, 0)
                AC_MSG_RESULT([disabling administrative group support])
         fi
- )
-
-AC_ARG_ENABLE(afs,
-       [  --enable-afs            enable AFS support],
-       if test "$enableval" = "yes"; then
-               AC_DEFINE(AFS, 1)
-               AC_MSG_RESULT([enabling AFS support])
-       fi
 )
 
-AC_ARG_WITH(pkgconfdir,
-       [  --with-pkgconfdir=DIR   package specific configuration in DIR
-                          [[SYSCONF/netatalk]]],
-               PKGCONFDIR="$withval",
-               PKGCONFDIR="${sysconfdir}/netatalk"
-)
+NETATALK_AFS_CHECK
+
+NETATALK_CONFIG_DIRS
 
 AC_ARG_WITH(cracklib,
        [  --with-cracklib=DICT    enable/set location of cracklib dictionary],
@@ -169,8 +161,6 @@ AC_ARG_ENABLE(debug,
                        AC_DEFINE_UNQUOTED(DEBUG, $enableval)
                fi 
                AC_MSG_RESULT([enabling debugging code])
-       else
-               AC_DEFINE(DEBUG, 0)
        fi
 )
 
@@ -225,6 +215,7 @@ elif test "x$did_scheme" = "xcnid"; then
 else
        AC_MSG_ERROR([unknown DID scheme])
 fi
+AM_CONDITIONAL(COMPILE_CNID, test "x$did_scheme" = "xcnid")
 
 dnl Check for Berkeley DB3 library
 if test "x$db3_required" = "xyes"; then
@@ -247,26 +238,8 @@ AC_ARG_WITH(message-dir,
                AC_SUBST(SERVERTEXT)
 )
 
-AC_ARG_ENABLE(srvloc,
-       [  --enable-srvloc         turn on Server Location Protocol support (EXPERIMENTAL)],
-       srvloc=$enableval,
-       srvloc=no
-)
-
-dnl Conditional for optional server location protocol support (used by OS X)
-AM_CONDITIONAL(USE_SRVLOC, test "x$srvloc" != "xno")
-if test "x$srvloc" != "xno"; then
-    for slpdir in "" $srvloc /usr /usr/local ; do
-               if test -f "$slpdir/include/slp.h" ; then
-                       LIBS="$LIBS -L$slpdir/lib -lslp"
-                       CFLAGS="$CFLAGS -I$slpdir/include"
-               AC_CHECK_LIB(slp,SLPOpen)
-               AC_CHECK_FUNCS(SLPReg SLPDereg SLPClose)
-               AC_DEFINE(USE_SRVLOC, 1)
-                       break
-               fi
-       done
-fi
+dnl Check for optional server location protocol support (used by MacOS X)
+NETATALK_SRVLOC
 
 dnl Check for PAM libs
 AC_PATH_PAM([
@@ -340,6 +313,14 @@ AC_ARG_ENABLE(cobalt,
        AC_MSG_RESULT([enabling cobalt-style sysv support])
 )
 
+AC_ARG_ENABLE(netbsd,
+       [  --enable-netbsd         use NetBSD-style rc.d configuration ],
+       if test "x$enableval" = "xyes"; then
+               sysv_style=netbsd
+       fi
+       AC_MSG_RESULT([enabling NetBSD-style rc.d support])
+)
+
 dnl ----- timelord compilation (disabled by default)
 AC_MSG_CHECKING([whether timelord should be compiled])
 compile_timelord=no
@@ -602,7 +583,6 @@ AC_SUBST(LIBS)
 AC_SUBST(AFPD_LIBS)
 AC_SUBST(PAPD_LIBS)
 AC_SUBST(CFLAGS)
-AC_SUBST(PKGCONFDIR)
 AC_SUBST(OVERWRITE_CONFIG)
 
 AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
@@ -614,6 +594,7 @@ AM_CONDITIONAL(USE_PAM, test x$compile_pam = xyes)
 AM_CONDITIONAL(BUILD_PAM, test x$compile_pam = xyes)
 AM_CONDITIONAL(USE_PGP, test x$compile_pgp = xyes)
 AM_CONDITIONAL(USE_COBALT, test x$sysv_style = xcobalt)
+AM_CONDITIONAL(USE_NETBSD, test x$sysv_style = xnetbsd)
 AM_CONDITIONAL(USE_REDHAT, test x$sysv_style = xredhat)
 AM_CONDITIONAL(USE_SUSE, test x$sysv_style = xsuse)
 AM_CONDITIONAL(USE_SHADOWPW, test x$shadowpw = xyes)
@@ -627,6 +608,8 @@ AC_OUTPUT([Makefile
        bin/aecho/Makefile
        bin/afile/Makefile
        bin/afppasswd/Makefile
+       bin/cnid/Makefile
+       bin/cnid/cnid_maint
        bin/getzones/Makefile
        bin/megatron/Makefile
        bin/nbp/Makefile
@@ -635,9 +618,17 @@ AC_OUTPUT([Makefile
        config/Makefile
        contrib/Makefile
        contrib/macusers/Makefile
+       contrib/macusers/macusers
        contrib/nu/Makefile
+       contrib/nu/nu
        contrib/printing/Makefile
        contrib/shell_utils/Makefile
+       contrib/shell_utils/afpd-mtab.pl
+       contrib/shell_utils/apple_cp
+       contrib/shell_utils/apple_mv
+       contrib/shell_utils/apple_rm
+       contrib/shell_utils/cleanappledouble.pl
+       contrib/shell_utils/netatalkshorternamelinks.pl
        contrib/timelord/Makefile
        distrib/Makefile
        distrib/config/Makefile
@@ -679,6 +670,7 @@ AC_OUTPUT([Makefile
        sys/netbsd/Makefile
        sys/netbsd/netatalk/Makefile
        sys/solaris/Makefile
+       sys/solaris/Makefile.kernel
        sys/sunos/Makefile
        sys/ultrix/Makefile
        ],