X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=f94535c4cbb2282c96afceca0cb9c991e288b1cb;hb=b19bf8b3569ca2fc8199b55306482f71db14dd89;hp=9a36e46d6aee2a265603525a872dcd3395373815;hpb=c8d4f62d3f5e7511e004b245daf1ca0746311c79;p=netatalk.git diff --git a/configure.in b/configure.in index 9a36e46d..f94535c4 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.120 2001-10-27 13:16:03 srittau Exp $ +dnl $Id: configure.in,v 1.132 2001-11-25 21:48:01 srittau Exp $ dnl configure.in for netatalk AC_INIT(bin/adv1tov2/adv1tov2.c) @@ -83,7 +83,7 @@ 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 errno.h sys/errno.h security/pam_appl.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" @@ -153,16 +153,6 @@ AC_ARG_ENABLE(afs, fi ) -AC_ARG_WITH(config-dir, - [ --with-config-dir=DIR obsolete - use --with-pkgconfdir], - sysconfdir="$withval", - if test "x$prefix" = "xNONE"; then - sysconfdir="$ac_default_prefix/etc" - else - sysconfdir="${prefix}/etc" - fi -) - AC_ARG_WITH(pkgconfdir, [ --with-pkgconfdir=DIR package specific configuration in DIR [[SYSCONF/netatalk]]], @@ -239,76 +229,49 @@ dnl Don't use DB3 unless it's needed db3_required=no dnl Check for CNID DB support +AC_MSG_CHECKING([whether CNID support should be enabled]) 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 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 + [ + if test "x$enableval" = "xyes"; then + dnl Now we need DB3 + db3_required="yes" + AC_DEFINE(CNID_DB) + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ],[AC_MSG_RESULT([no])] ) 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 -) - -db3_found=no -for db3dir in "" $trydb3dir "$trydb3dir/include" /usr/local/BerkeleyDB.3.3/include /usr/include/db3 /usr/local/include/db3 ; do - if test -f "$db3dir/db.h" ; then - db3libdir="`echo $db3dir | sed 's/include\/db3$/lib/'`" - db3libdir="`echo $db3libdir | sed 's/include$/lib/'`" - LDFLAGS="$LDFLAGS -L$db3libdir" - CFLAGS="$CFLAGS -I$db3dir" - - 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 - fi -done - -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 "x$db3_required" = "xyes"; then + AC_PATH_DB3(, [AC_MSG_ERROR([Berkeley DB3 library not found!])]) fi +dnl Determine DID scheme +AC_MSG_CHECKING([for DID scheme to use]) 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 + [ did_scheme="$withval" ], + [ did_scheme="last" ] ) +if test "x$did_scheme" = "xlast"; then + AC_DEFINE(USE_LASTDID, 1) + AC_MSG_RESULT([last]) +elif test "x$did_scheme" = "xmtab"; then + AC_DEFINE(DID_MTAB, 1) + AC_MSG_RESULT([mtab-based DID creation support]) +elif test "x$did_scheme" != "xno"; then + AC_MSG_RESULT([default]) +else + AC_MSG_ERROR([unknown DID scheme]) +fi + msg_dir="" AC_ARG_WITH(message-dir, - [ --with-msg-dir=PATH path to message files [[PKGCONF/msg]]], + [ --with-message-dir=PATH path to message files [[PKGCONF/msg]]], msg_dir="$withval" if test x"$msg_dir" = "x"; then msg_dir="${PKGCONFDIR}/msg" @@ -330,7 +293,7 @@ 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 - LDFLAGS="$LDFLAGS -L$slpdir/lib -lslp" + LIBS="$LIBS -L$slpdir/lib -lslp" CFLAGS="$CFLAGS -I$slpdir/include" AC_CHECK_LIB(slp,SLPOpen) AC_CHECK_FUNCS(SLPReg SLPDereg SLPClose) @@ -341,28 +304,13 @@ if test "x$srvloc" != "xno"; then fi # Check for PAM libs -AC_MSG_CHECKING([whether PAM support should be enabled]) -AC_ARG_WITH(pam, - [ --with-pam enable PAM support], - [PAM_MSG="$withval"], - [PAM_MSG="yes"] -) -AC_MSG_RESULT($PAM_MSG) -use_pam_so=yes -compile_pam=yes - -if test "x$PAM_MSG" = "xyes"; then - if test "x$ac_cv_header_security_pam_appl_h" = "xyes" ; then - - AC_CHECK_LIB(pam, pam_set_item, - [PAPD_LIBS="$PAPD_LIBS -lpam"; AFPD_LIBS="$AFPD_LIBS -lpam"; use_pam_so=yes; compile_pam=yes; AC_DEFINE(USE_PAM)], - [use_pam_so=no; compile_pam=no] - ) - fi -else - use_pam_so=no - compile_pam=no -fi +AC_PATH_PAM([ + PAPD_LIBS="$PAPD_LIBS $PAM_LIBS" + AFPD_LIBS="$AFPD_LIBS $PAM_LIBS" + use_pam_so=yes + compile_pam=yes + AC_DEFINE(USE_PAM) +]) AC_MSG_CHECKING([whether shadow support should be enabled]) AC_ARG_WITH(shadow, @@ -473,8 +421,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: @@ -490,6 +442,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 ;; @@ -522,8 +475,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 @@ -546,9 +497,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,, @@ -592,9 +540,6 @@ 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 ----- @@ -605,9 +550,6 @@ if test x"$this_os" = "xnetbsd"; then 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(NO_CRYPT_H, 1) @@ -619,9 +561,6 @@ 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(NO_CRYPT_H, 1) @@ -637,9 +576,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 @@ -655,12 +591,8 @@ 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 @@ -693,7 +625,7 @@ dnl --------------------- overwrite the config files . . . or not. AC_MSG_CHECKING([whether configuration files should be overwritten]) AC_ARG_ENABLE(overwrite, - [ --enable-overwrite overwrite configuration files], + [ --enable-overwrite overwrite configuration files during installation], [OVERWRITE_CONFIG="${enable_overwrite}"], [OVERWRITE_CONFIG="no"] ) @@ -705,7 +637,6 @@ AC_SUBST(LIBS) AC_SUBST(AFPD_LIBS) AC_SUBST(PAPD_LIBS) AC_SUBST(CFLAGS) -AC_SUBST(LDSHAREDFLAGS) AC_SUBST(PKGCONFDIR) AC_SUBST(OVERWRITE_CONFIG)