Fix for two things:

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index 5bf13be17da223ce3995ac07ea6bcae884cf60dd..cc1d7933a8ec5b39da026ecd749202de25d64336 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.143 2001-12-16 18:37:20 srittau Exp $
+dnl $Id: configure.in,v 1.153 2002-02-08 16:42:31 jmarcus Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -10,9 +10,6 @@ AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(netatalk, ${NETATALK_VERSION})
 AM_CONFIG_HEADER(config.h)
 
-dnl Reset locations to proper places
-AC_PREFIX_DEFAULT(/usr/local)
-
 dnl Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC
@@ -21,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
@@ -119,21 +119,35 @@ 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
 )
 
+NETATALK_AFS_CHECK
+
 AC_ARG_WITH(pkgconfdir,
-       [  --with-pkgconfdir=DIR   package specific configuration in DIR
+        [  --with-pkgconfdir=DIR   package specific configuration in DIR
                           [[SYSCONF/netatalk]]],
-               PKGCONFDIR="$withval",
-               PKGCONFDIR="${sysconfdir}/netatalk"
+                PKGCONFDIR="$withval",
+                PKGCONFDIR="${sysconfdir}/netatalk"
+)
+
+dnl FIXME: make this an extra check
+NLSDIR="${PKGCONFDIR}/nls"
+
+AC_ARG_WITH(logfile,
+       [  --with-logfile=PATH     path for file used by logger [/var/log/netatalk.log]
+                          use --without-logfile to disable logger],
+        if test "$withval" = "no"; then
+               AC_DEFINE(DISABLE_LOGGER, 1)
+               AC_MSG_RESULT([logger disabled])
+       elif test "$withval" != "yes"; then
+               AC_DEFINE_UNQUOTED(LOGFILEPATH, $withval)
+               AC_MSG_RESULT([logfile set to $withval])
+       else
+                AC_DEFINE_UNQUOTED(LOGFILEPATH, "/var/log/netatalk.log")
+                AC_MSG_RESULT([logfile set to default]) 
+       fi,
+               AC_DEFINE_UNQUOTED(LOGFILEPATH, "/var/log/netatalk.log")
+               AC_MSG_RESULT([logfile set to default])
 )
 
 AC_ARG_WITH(cracklib,
@@ -172,8 +186,6 @@ AC_ARG_ENABLE(debug,
                        AC_DEFINE_UNQUOTED(DEBUG, $enableval)
                fi 
                AC_MSG_RESULT([enabling debugging code])
-       else
-               AC_DEFINE(DEBUG, 0)
        fi
 )
 
@@ -326,6 +338,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
@@ -541,6 +561,7 @@ if test x"$this_os" = "xtru64"; then
        dnl AC_DEFINE(USE_UFS_QUOTA_H)
        AC_DEFINE(TRU64)
        AC_CHECK_LIB(security,set_auth_parameters)
+       AC_CHECK_LIB(db,main)
        CFLAGS="-I\$(top_srcdir)/sys/tru64 $CFLAGS"
        need_dash_r=no
        sysv_style=tru64
@@ -589,6 +610,7 @@ AC_SUBST(AFPD_LIBS)
 AC_SUBST(PAPD_LIBS)
 AC_SUBST(CFLAGS)
 AC_SUBST(PKGCONFDIR)
+AC_SUBST(NLSDIR)
 AC_SUBST(OVERWRITE_CONFIG)
 
 AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
@@ -600,6 +622,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)
@@ -614,6 +637,7 @@ AC_OUTPUT([Makefile
        bin/afile/Makefile
        bin/afppasswd/Makefile
        bin/cnid/Makefile
+       bin/cnid/cnid_maint
        bin/getzones/Makefile
        bin/megatron/Makefile
        bin/nbp/Makefile
@@ -622,9 +646,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
@@ -666,6 +698,7 @@ AC_OUTPUT([Makefile
        sys/netbsd/Makefile
        sys/netbsd/netatalk/Makefile
        sys/solaris/Makefile
+       sys/solaris/Makefile.kernel
        sys/sunos/Makefile
        sys/ultrix/Makefile
        ],