X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=860ab7574e3ce27b6dc9d5d37947982d7eaa1180;hb=abffa9c62b61267e02a9bd7401d09ae7045a0177;hp=9ad9a47a0d74cc981517c71180ffe6e4772b0fb4;hpb=632f6a85e45af5846388c51f91f3e28786d37167;p=netatalk.git diff --git a/configure.in b/configure.in index 9ad9a47a..860ab757 100644 --- a/configure.in +++ b/configure.in @@ -1,18 +1,15 @@ -dnl $Id: configure.in,v 1.98 2001-08-28 07:13:03 lancel Exp $ +dnl $Id: configure.in,v 1.175 2003-01-04 21:41:48 jmarcus Exp $ dnl configure.in for netatalk AC_INIT(bin/adv1tov2/adv1tov2.c) -NETATALK_VERSION=`cat VERSION` +NETATALK_VERSION=`cat $srcdir/VERSION` AC_SUBST(NETATALK_VERSION) 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 @@ -36,8 +36,6 @@ dnl Replace `main' with a function in -lauth: AC_CHECK_LIB(auth, main) dnl Replace `main' with a function in -lcmd: AC_CHECK_LIB(cmd, main) -dnl Replace `main' with a function in -lcom_err: -AC_CHECK_LIB(com_err, main) dnl Replace `main' with a function in -lcrypt: AC_CHECK_LIB(crypt, main) dnl Replace `main' with a function in -ld: @@ -56,10 +54,6 @@ dnl Replace `main' with a function in -lnsl: AC_CHECK_LIB(nsl, main) dnl Replace `main' with a function in -lprot: AC_CHECK_LIB(prot, main) -dnl Replace `main' with a function in -lresolv: -AC_CHECK_LIB(resolv, main) -dnl Replace `main' with a function in -lrpcsvc: -AC_CHECK_LIB(rpcsvc, main) dnl Replace `main' with a function in -lrx: AC_CHECK_LIB(rx, main) dnl Replace `main' with a function in -lrxkad: @@ -78,35 +72,19 @@ AC_CHECK_LIB(ubik, main) # Be sure to test before adding AFS libs in LIBS path as AFS lib # has such a function that works only on AFS filesystems. AC_CHECK_FUNCS(access) +# +AC_CHECK_FUNCS(pread pwrite) dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(fcntl.h limits.h stdint.h strings.h sys/fcntl.h sys/file.h sys/ioctl.h sys/time.h sys/mnttab.h sys/statvfs.h sys/stat.h sys/vfs.h mntent.h syslog.h unistd.h termios.h sys/termios.h netdb.h sgtty.h ufs/quota.h mount.h sys/mount.h statfs.h sys/types.h dlfcn.h) +AC_CHECK_HEADERS(fcntl.h limits.h stdint.h strings.h sys/fcntl.h sys/file.h sys/ioctl.h sys/time.h sys/mnttab.h sys/statvfs.h sys/stat.h sys/vfs.h mntent.h syslog.h unistd.h termios.h sys/termios.h netdb.h sgtty.h ufs/quota.h mount.h sys/mount.h statfs.h sys/types.h dlfcn.h errno.h sys/errno.h) AC_CHECK_HEADER(sys/cdefs.h,, AC_MSG_RESULT([enabling generic cdefs.h from tree]) 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 @@ -128,9 +106,12 @@ AC_FUNC_MMAP AC_TYPE_SIGNAL AC_FUNC_UTIME_NULL AC_FUNC_WAIT3 -AC_CHECK_FUNCS(flock getcwd gethostname gettimeofday getusershell mkdir rmdir select socket strdup strstr strtoul setpgrp) +AC_CHECK_FUNCS(getcwd gethostname gettimeofday getusershell mkdir rmdir select socket strdup strcasestr strstr strtoul setpgrp strchr memcpy) AC_FUNC_SETPGRP +dnl Checks for (v)snprintf +NETATALK_SNPRINTF_CHECK + dnl -------------------------------------------------------------------------- dnl specific configuration comes in here: dnl -------------------------------------------------------------------------- @@ -143,35 +124,31 @@ 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(config-dir, - [ --with-config-dir=DIR obsolete - use --pkgconfdir], - sysconfdir="$withval", - if test "x$prefix" = "xNONE"; then - sysconfdir="$ac_default_prefix/etc" - else - sysconfdir="${prefix}/etc" - fi -) +NETATALK_AFS_CHECK + +NETATALK_CONFIG_DIRS -AC_ARG_WITH(pkgconfdir, - [ --with-pkgconfdir=DIR package specific configuration in DIR - [default=SYSCONF/netatalk]], - PKGCONFDIR="$withval", - PKGCONFDIR="${sysconfdir}/netatalk" +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, - [ --with-cracklib=dict enable/set location of cracklib dictionary], + [ --with-cracklib=DICT enable/set location of cracklib dictionary], if test "x$withval" != "xno" ; then cracklib="$withval" AC_CHECK_LIB(crack, main, @@ -206,11 +183,23 @@ AC_ARG_ENABLE(debug, AC_DEFINE_UNQUOTED(DEBUG, $enableval) fi AC_MSG_RESULT([enabling debugging code]) - else - AC_DEFINE(DEBUG, 0) fi ) +afp3=no +AC_ARG_ENABLE(afp3, + [ --enable-afp3 enable AFP 3.x calls], + if test "$enableval" = "yes"; then + afp3=yes + AC_DEFINE(AFP3x, 1) + AC_MSG_RESULT([enabling AFP 3.x calls]) + fi +) + +if test "$afp3" = "yes"; then + AC_SYS_LARGEFILE +fi + dnl ----------- A NOTE ABOUT DROPKLUDGE dnl The trouble with this fix is that if you know what the file is called, it @@ -235,113 +224,113 @@ AC_ARG_ENABLE(force-uidgid, fi ) -dnl Don't use DB3 unless it's needed -db3_required=no +dnl Don't use BDB unless it's needed +bdb_required=no -dnl Check for CNID DB support -AC_ARG_ENABLE(cnid-db, - [ --enable-cnid-db use persistent cnid database per volume (EXPERIMENTAL) ], - if test "x$enableval" = "xyes"; then - dnl Now we need DB3 - db3_required="yes" +dnl Determine DID scheme +AC_MSG_CHECKING([for DID scheme to use]) +AC_ARG_WITH(did, + [ --with-did=SCHEME set DID scheme (cnid,last)], + [ did_scheme="$withval" ], + [ did_scheme="cnid" ] +) + +if test "x$did_scheme" = "xlast"; then + AC_DEFINE(USE_LASTDID, 1) + AC_MSG_RESULT([last]) +elif test "x$did_scheme" = "xcnid"; then + bdb_required="yes" + AC_DEFINE(CNID_DB, 1) + AC_MSG_RESULT([enabling build with CNID DB support]) +else + AC_MSG_ERROR([unknown DID scheme]) +fi +AM_CONDITIONAL(COMPILE_CNID, test "x$did_scheme" = "xcnid") - dnl Note that we don't AC_DEFINE(CNID_DB, 1) here... - dnl we have to check for the library first. - dnl AC_MSG_RESULT([db3 check enabled]) - fi +dnl Determine whether or not to use filename mangling +AC_MSG_CHECKING([whether or not to use filename mangling]) +AC_ARG_WITH(mangling, + [ --with-mangling enable filename mangling], + [ + if test "x$withval" = "xyes"; then + if test "x$did_scheme" != "xcnid"; then + AC_MSG_ERROR([DID scheme must be CNID to use filename mangling]) + else + AC_DEFINE(FILE_MANGLING, 1) + AC_MSG_RESULT([yes]) + fi + else + AC_MSG_RESULT([no]) + fi + ], [ + if test "x$did_scheme" = "xcnid"; then + AC_DEFINE(FILE_MANGLING, 1) + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ] ) -dnl Check for Berkeley DB3 library -AC_ARG_WITH(db3, - [ --with-db3=PATH specify path to Berkeley DB3 installation], - if test "x$withval" != "xno"; then - trydb3dir="$withval" - fi -) +if test "$did_scheme" = "cnid"; then + USE_CDB="yes" +else + USE_CDB="no" +fi -db3_found=no -for db3dir in "" $trydb3dir /usr /usr /usr/local ; do - if test -f "$db3dir/include/db3/db.h" ; then - LDFLAGS="$LDFLAGS -L$db3dir/lib -L$db3dir" - CFLAGS="$CFLAGS -I$db3dir/include" - - dnl If we require DB3, die if we don't have it - if test "x$db3_required" != "xno"; then - AC_CHECK_LIB(db, main, - dnl AC_MSG_RESULT([enabling db3 support]) - db3_found=yes - dnl -- also enable CNID DB when this is found - AC_DEFINE(CNID_DB, 1) - AC_MSG_RESULT([using persistent cnid database per volume]) - LIBS="$LIBS -ldb", - dnl Not Found - AC_MSG_ERROR([Berkeley DB3 library not found!]) - ) - fi - break +dnl Determine whether or not to use CDB or transactional DB store +AC_MSG_CHECKING([whether or not to use CNID with Concurrent Data Store]) +AC_ARG_WITH(cdb, + [ --with-cdb enable CNID with Concurrent Data Store], + if test "$withval" = "no"; then + if test "x$did_scheme" != "xcnid"; then + USE_CDB="no" + AC_MSG_ERROR([DID scheme must be CNID to use CDB]) + else + USE_CDB="no" + AC_MSG_RESULT([no]) + fi + else + USE_CDB="yes" + AC_MSG_RESULT([yes]) fi -done + , AC_MSG_RESULT([yes]) +) -dnl Die if the library is required, but not found -if test "x$db3_required" != "xno"; then - if test "x$db3_found" = "xno"; then - dnl Not Found - AC_MSG_ERROR([Berkeley DB3 library not found!]) - fi +if test "$USE_CDB" = "yes"; then + AC_DEFINE(CNID_DB_CDB, 1) fi -AC_ARG_WITH(did, - [ --with-did=[scheme] set DID scheme (last,mtab)], - if test "x$withval" != "xno" ; then - if test "$withval" = "last"; then - AC_DEFINE(USE_LASTDID, 1) - AC_MSG_RESULT([enabling build without DID dev/inode mapping kludge]) - fi - if test "$withval" = "mtab"; then - AC_DEFINE(DID_MTAB, 1) - AC_MSG_RESULT([enabling mtab-based DID creation support]) - fi - fi -) +dnl Check for Berkeley DB library +if test "x$bdb_required" = "xyes"; then + AC_PATH_BDB(, [AC_MSG_ERROR([Berkeley DB library not found!])]) +fi -msg_dir="" -AC_ARG_WITH(message-dir, - [ --with-msg-dir=path path to message files [default=$ac_prefix_default/etc/msg]], - msg_dir="$withval" - if test x"$msg_dir" = "x"; then - msg_dir="${PKGCONFDIR}/msg" - fi - AC_DEFINE_UNQUOTED(SERVERTEXT, "$msg_dir", - [path to message dir [default=$ac_prefix_default/etc/msg]]) - SERVERTEXT="$msg_dir" - AC_SUBST(SERVERTEXT) -) +dnl Check for quota support +AC_CHECK_QUOTA -AC_CHECK_LIB(pam, pam_start, - AC_DEFINE(USE_PAM, 1) - LIBS="$LIBS -lpam" - compile_pam=yes -) +dnl Check for optional server location protocol support (used by MacOS X) +NETATALK_SRVLOC -AC_ARG_WITH(pam, - [ --without-pam disable password authentication modules support], - compile_pam=no - use_pam_so=no - AC_DEFINE(USE_PAM, 0) - AC_MSG_RESULT([disabling pam modules support]) -) -if test "x$compile_pam" = "xyes"; then +dnl Check for PAM libs +AC_PATH_PAM([ + PAPD_LIBS="$PAPD_LIBS $PAM_LIBS" + AFPD_LIBS="$AFPD_LIBS $PAM_LIBS" use_pam_so=yes - AC_MSG_RESULT([enabling pam modules support]) -fi + compile_pam=yes + AC_DEFINE(USE_PAM) +]) -shadowpw=no +AC_MSG_CHECKING([whether shadow support should be enabled]) AC_ARG_WITH(shadow, [ --with-shadow enable shadow password support], - AC_MSG_RESULT([enabling shadow password support]) - AC_DEFINE(SHADOWPW) - shadowpw=yes + [shadowpw="$withval"], + [shadowpw=no] ) +if test "x$shadowpw" = "xyes"; then + AC_DEFINE(SHADOWPW) +fi +AC_MSG_RESULT([$shadowpw]) AC_ARG_ENABLE(shell-check, [ --disable-shell-check disable checking for a valid shell], @@ -351,12 +340,6 @@ AC_ARG_ENABLE(shell-check, fi ) -AC_ARG_WITH(flock-locks, - [ --with-flock-locks enable flock locks support], - AC_MSG_RESULT([enabling flock locks]) - AC_DEFINE(USE_FLOCK_LOCKS) -) - AC_ARG_WITH(tcp-wrappers, [ --with-tcp-wrappers enable TCP wrappers support], AC_CHECK_LIB(wrap, tcpd_warn, @@ -390,18 +373,26 @@ 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 AC_ARG_ENABLE(timelord, [ --enable-timelord enable compilation of timelord server], - if test "$enableval" = "yes"; then - compile_timelord=yes - fi - AC_MSG_RESULT([enabling timelord compilation]) + [compile_timelord="$enableval"], + [compile_timelord="no"] ) +AC_MSG_RESULT([$compile_timelord]) AC_ARG_WITH(uams-path, - [ --with-uams-path=path path to UAMs [default=PKGCONF/uams]], + [ --with-uams-path=PATH path to UAMs [[PKGCONF/uams]]], uams_path="$withval", uams_path="${PKGCONFDIR}/uams" ) @@ -417,7 +408,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]) @@ -427,7 +418,7 @@ dnl -------------------------------------------------------------------------- dnl post-FHS substitutions, etc dnl -------------------------------------------------------------------------- -***** UAMS_PATH +dnl ***** UAMS_PATH AC_DEFINE_UNQUOTED(UAMS_PATH, "${uams_path}", [path to UAMs [default=PKGCONF/uams]]) UAMS_PATH="${uams_path}" @@ -436,8 +427,12 @@ AC_SUBST(UAMS_PATH) dnl -------------------------------------------------------------------------- dnl drop in includes for top level directory structures here... dnl -------------------------------------------------------------------------- -LDFLAGS="$LDFLAGS -L\$(top_srcdir)/libatalk/" -CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I\$(top_srcdir)/sys" + +dnl Note: $(top_srcdir)/include should be added before all other includes +dnl so that includes from that directory a preferred to includes from +dnl /usr/include or similar places. +LIBS="$LIBS -L\$(top_srcdir)/libatalk" +CFLAGS="-I\$(top_srcdir)/include $CFLAGS -I\$(top_srcdir)/sys" dnl -------------------------------------------------------------------------- dnl specific configuration comes in here: @@ -453,6 +448,7 @@ case "$host_os" in *irix*) this_os=irix ;; *linux*) this_os=linux ;; *osx*) this_os=macosx ;; + *darwin*) this_os=macosx ;; *netbsd*) this_os=netbsd ;; *openbsd*) this_os=openbsd ;; *osf*) this_os=tru64 ;; @@ -485,8 +481,6 @@ if test x"$this_os" = "xfreebsd"; then AC_DEFINE(BSD4_4) AC_DEFINE(SENDFILE_FLAVOR_BSD) - dnl ----- Set -shared flag - LDSHAREDFLAGS="-shared" AC_DEFINE(NO_CRYPT_H, 1) fi @@ -509,9 +503,6 @@ dnl ----- Linux specific ----- if test x"$this_os" = "xlinux"; then AC_MSG_RESULT([ * Linux specific configuration]) - dnl ----- Set -shared flag - LDSHAREDFLAGS="-shared" - dnl ----- check if we need the quotactl wrapper AC_CHECK_HEADERS(sys/quota.h linux/quota.h) AC_CHECK_FUNC(quotactl,, @@ -555,27 +546,23 @@ if test x"$this_os" = "xmacosx"; then AC_DEFINE(HAVE_2ARG_DBTOB) dnl AC_DEFINE(NO_DLFCN_H) AC_DEFINE(MACOSX_SERVER) - - dnl ----- Set -shared flag - LDSHAREDFLAGS="-shared" fi 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 - dnl ----- Set -shared flag - LDSHAREDFLAGS="-shared" - dnl ----- NetBSD does not have crypt.h, uses unistd.h ----- AC_DEFINE(UAM_DHX, 1) - AC_DEFINE(UAM_RNDNUM, 1) - compile_dhx=yes - compile_ssl=yes AC_DEFINE(NO_CRYPT_H, 1) fi @@ -585,14 +572,8 @@ if test x"$this_os" = "xopenbsd"; then AC_DEFINE(BSD4_4) AC_DEFINE(DLSYM_PREPEND_UNDERSCORE) - dnl ----- Set -shared flag - LDSHAREDFLAGS="-Bforcearchive -shared" - dnl ----- OpenBSD does not have crypt.h, uses unistd.h ----- AC_DEFINE(UAM_DHX, 1) - AC_DEFINE(UAM_RNDNUM, 1) - compile_dhx=yes - compile_ssl=yes AC_DEFINE(NO_CRYPT_H, 1) fi @@ -606,9 +587,6 @@ if test x"$this_os" = "xsolaris"; then CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS" need_dash_r=yes - dnl ----- Set -shared flag - LDSHAREDFLAGS="-G" - AC_MSG_RESULT([enabling Solaris kernel module build]) solaris_module=yes fi @@ -624,48 +602,12 @@ if test x"$this_os" = "xtru64"; then AC_DEFINE(TRU64) AC_CHECK_LIB(security,set_auth_parameters) CFLAGS="-I\$(top_srcdir)/sys/tru64 $CFLAGS" - LDSHAREDFLAGS="-shared -expect_unresolved \*" need_dash_r=no sysv_style=tru64 - - dnl ----- Set -shared flag - LDSHAREDFLAGS="-shared" fi -dnl -- look for openssl -AC_ARG_WITH(ssl-dir, - [ --with-ssl-dir=PATH specify path to openssl installation (must contain - lib and include dirs) ], - [ - if test "x$withval" != "xno"; then - tryssldir=$withval - fi - ] -) - -for ssldir in "" $tryssldir /usr /usr/local/openssl /usr/lib/openssl/ /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl /usr/local/ssl ; do - if test -f "$ssldir/include/openssl/cast.h" ; then - LDFLAGS="$LDFLAGS -L$ssldir/lib -L$ssldir" - CFLAGS="$CFLAGS -I$ssldir/include -I$ssldir/include/openssl" - if test "$need_dash_r" = "yes"; then - LIBS="$LIBS -R$ssldir/lib -R$ssldir" - fi - - dnl Check for the crypto library: - AC_CHECK_LIB(crypto, main) - dnl LIBS="$LIBS -lcrypto" - dnl Check for "DES" library (for SSLeay, not openssl): - AC_CHECK_LIB(des, main) - - AC_DEFINE(OPENSSL_DHX, 1) - AC_DEFINE(UAM_DHX, 1) - AC_DEFINE(UAM_RNDNUM, 1) - compile_dhx=yes - compile_ssl=yes - AC_MSG_RESULT([Found ssl and enabling RANDNUM and DHX support "$ssldir"]) - break - fi -done +dnl -- look for openssl +AC_PATH_SSL dnl --------------------- check for building PGP UAM module @@ -683,7 +625,7 @@ AC_ARG_ENABLE(pgp-uam, dnl --------------------- check for building Kerberos v4 UAM module AC_ARG_ENABLE(krb4-uam, - [ --enable-krb4-uam enable build of Kerberos v4 UAM module], + [ --enable-krb4-uam enable build of Kerberos v4 UAM module], if test "$enableval" = "yes"; then AC_DEFINE(UAM_KRB4, 1) compile_kerberos=yes @@ -692,47 +634,32 @@ AC_ARG_ENABLE(krb4-uam, ) dnl --------------------- overwrite the config files . . . or not. -files="AppleVolumes.default AppleVolumes.system atalkd.conf netatalk.conf netatalk.pamd papd.conf afpd.conf" - +AC_MSG_CHECKING([whether configuration files should be overwritten]) AC_ARG_ENABLE(overwrite, - [ --enable-overwrite Overwrite configuration files - default=PKGCONFDIR], - [ - OVERWRITE="$files" - AC_MSG_RESULT([Overwrite configuration files]) - ], - - [ - for f in $files ; do - if test -f "${PKGCONFDIR}/$f" ; - then :; - else OVERWRITE="${OVERWRITE} $f"; - fi - done - AC_MSG_RESULT([Don't overwrite existing configuration files]) - ] + [ --enable-overwrite overwrite configuration files during installation], + [OVERWRITE_CONFIG="${enable_overwrite}"], + [OVERWRITE_CONFIG="no"] ) +AC_MSG_RESULT([$OVERWRITE_CONFIG]) dnl --------------------- last minute substitutions - AC_SUBST(LIBS) AC_SUBST(AFPD_LIBS) AC_SUBST(PAPD_LIBS) AC_SUBST(CFLAGS) -AC_SUBST(LDSHAREDFLAGS) -AC_SUBST(PKGCONFDIR) -AC_SUBST(OVERWRITE) +AC_SUBST(OVERWRITE_CONFIG) AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes) AM_CONDITIONAL(COMPILE_TIMELORD, test x$compile_timelord = xyes) -AM_CONDITIONAL(USE_DHX, test x$compile_dhx = xyes) +AM_CONDITIONAL(USE_DHX, test x$compile_ssl = xyes) AM_CONDITIONAL(USE_KERBEROS, test x$compile_kerberos = xyes) AM_CONDITIONAL(USE_PAM_SO, test x$use_pam_so = xyes) 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) @@ -746,6 +673,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 @@ -754,9 +683,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 @@ -784,6 +721,7 @@ AC_OUTPUT([Makefile libatalk/nbp/Makefile libatalk/netddp/Makefile libatalk/util/Makefile + macros/Makefile man/Makefile man/man1/Makefile man/man3/Makefile @@ -797,6 +735,7 @@ AC_OUTPUT([Makefile sys/netbsd/Makefile sys/netbsd/netatalk/Makefile sys/solaris/Makefile + sys/solaris/Makefile.kernel sys/sunos/Makefile sys/ultrix/Makefile ],