X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=1c06a17852bf08731e2a1d107ee26f5ab166a5bb;hb=3a9b2b868ff959c5d21a8e4080546915c349c736;hp=72a47295cbebbd707fd5f938615320876f5cf3ee;hpb=9fee078c146b92b4afa48d24c175e72439feeb8a;p=netatalk.git diff --git a/configure.in b/configure.in index 72a47295..1c06a178 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.138 2001-12-03 15:50:06 jmarcus Exp $ +dnl $Id: configure.in,v 1.156 2002-02-13 16:48:10 srittau 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 @@ -83,24 +83,6 @@ AC_CHECK_HEADER(sys/cdefs.h,, CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS" ) -# Allow user to specify flags -AC_ARG_WITH(cflags, - [ --with-cflags specify additional flags to pass to compiler], - [ - if test "x$withval" != "xno" ; then - CFLAGS="$CFLAGS $withval" - fi - ] -) -AC_ARG_WITH(libs, - [ --with-libs specify additional libraries to link with], - [ - if test "x$withval" != "xno" ; then - LIBS="$LIBS $withval" - fi - ] -) - dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_UID_T @@ -137,21 +119,27 @@ 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(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, @@ -190,8 +178,6 @@ AC_ARG_ENABLE(debug, AC_DEFINE_UNQUOTED(DEBUG, $enableval) fi AC_MSG_RESULT([enabling debugging code]) - else - AC_DEFINE(DEBUG, 0) fi ) @@ -246,6 +232,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 @@ -268,28 +255,10 @@ 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 -# Check for PAM libs +dnl Check for PAM libs AC_PATH_PAM([ PAPD_LIBS="$PAPD_LIBS $PAM_LIBS" AFPD_LIBS="$AFPD_LIBS $PAM_LIBS" @@ -361,6 +330,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 @@ -388,7 +365,7 @@ AC_ARG_ENABLE(fhs, sysconfdir="/etc" PKGCONFDIR=${sysconfdir}/netatalk use_pam_so=yes - dnl FIXME: NEED TO HAVE --mandir=/usr/share/man AT SOME POINT... + mandir="/usr/share/man" AC_DEFINE(FHS_COMPATIBILITY) fi AC_MSG_RESULT([enabling Filesystem Hierarchy Standard (FHS) compatibility]) @@ -532,7 +509,12 @@ dnl ----- NetBSD specific ----- if test x"$this_os" = "xnetbsd"; then AC_MSG_RESULT([ * NetBSD specific configuration]) AC_DEFINE(BSD4_4) - AC_DEFINE(DLSYM_PREPEND_UNDERSCORE) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + # NetBSD ELF machines don't have to have DLSYM_PREPEND_UNDERSCORE. + # If this test is true, it's not an ELF box. + # This REALLY should be a configure test. + AC_DEFINE(DLSYM_PREPEND_UNDERSCORE) + fi CFLAGS="-I\$(top_srcdir)/sys/netbsd -I/usr/include/kerberosIV $CFLAGS" need_dash_r=yes @@ -623,7 +605,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) @@ -635,6 +616,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) @@ -648,6 +630,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 @@ -656,9 +640,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 @@ -700,6 +692,7 @@ AC_OUTPUT([Makefile sys/netbsd/Makefile sys/netbsd/netatalk/Makefile sys/solaris/Makefile + sys/solaris/Makefile.kernel sys/sunos/Makefile sys/ultrix/Makefile ],