X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=7288b848a9e6c27509b673f0aed6967a9551679a;hb=65232b9dece9dcd0115c715f173586c8da02ff76;hp=507fe40124a2e24d959c0b5fbdaaa00030304261;hpb=ab79a014dea2226aa310ba583a7181b2c63536b4;p=netatalk.git diff --git a/configure.in b/configure.in index 507fe401..7288b848 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.179.2.3.2.37 2004-09-26 09:17:41 didg Exp $ +dnl $Id: configure.in,v 1.179.2.3.2.37.2.10 2008-12-22 21:18:13 didg Exp $ dnl configure.in for netatalk AC_INIT(etc/afpd/main.c) @@ -46,7 +46,7 @@ dnl AC_CHECK_LIB(crypt, main) dnl Replace `main' with a function in -ld: dnl AC_CHECK_LIB(d, main) dnl Replace `main' with a function in -ldl: -AC_CHECK_LIB(dl, dlopen) +dnl AC_CHECK_LIB(dl, dlopen) dnl Replace `main' with a function in -lkauth: dnl AC_CHECK_LIB(kauth, main) dnl Replace `main' with a function in -lkrb: @@ -55,16 +55,17 @@ dnl Replace `main' with a function in -llwp: dnl AC_CHECK_LIB(lwp, main) dnl Replace `main' with a function in -ln: dnl AC_CHECK_LIB(n, main) -dnl Replace `main' with a function in -lnsl: -AC_CHECK_LIB(nsl, main) + +dnl not the right stuff but should be enough for now +AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) +AC_CHECK_FUNC(connect,,[AC_CHECK_LIB(socket,connect)]) + dnl Replace `main' with a function in -lprot: dnl AC_CHECK_LIB(prot, main) dnl Replace `main' with a function in -lrx: dnl AC_CHECK_LIB(rx, main) dnl Replace `main' with a function in -lrxkad: dnl AC_CHECK_LIB(rxkad, main) -dnl Replace `main' with a function in -lsocket: -AC_CHECK_LIB(socket, socket) dnl Replace `main' with a function in -lsys: dnl AC_CHECK_LIB(sys, main) dnl Replace `main' with a function in -lubik: @@ -183,19 +184,20 @@ dnl -------------------------------------------------------------------------- dnl specific configuration comes in here: dnl -------------------------------------------------------------------------- -AC_DEFINE(ADMIN_GRP, 1, [Define if the admin group should be enabled]) netatalk_cv_admin_group=yes AC_MSG_CHECKING([for administrative group support]) -AC_ARG_WITH(admin-group, +AC_ARG_ENABLE(admin-group, [ --disable-admin-group disable admin group],[ - if test "$enableval" = "no"; then + if test x"$enableval" = x"no"; then AC_DEFINE(ADMIN_GRP, 0, [Define if the admin group should be enabled]) - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) netatalk_cv_admin_group=no + AC_MSG_RESULT([no]) + else + AC_DEFINE(ADMIN_GRP, 1, [Define if the admin group should be enabled]) + AC_MSG_RESULT([yes]) fi],[ + AC_DEFINE(ADMIN_GRP, 1, [Define if the admin group should be enabled]) AC_MSG_RESULT([yes]) ] ) @@ -204,22 +206,21 @@ NETATALK_AFS_CHECK NETATALK_CONFIG_DIRS -AC_MSG_CHECKING([for logfile path]) +AC_MSG_CHECKING([whether to use logfile]) AC_ARG_WITH(logfile, - [ --with-logfile=PATH path for file used by logger [/var/log/netatalk.log] - use --without-logfile to disable logger],[ + [ --with-logfile=PATH path for file used by logger],[ if test x"$withval" = x"no"; then AC_DEFINE(DISABLE_LOGGER, 1, [Define if the logger should not be used]) - AC_MSG_RESULT([syslog]) + AC_MSG_RESULT([no, syslog]) elif test "$withval" != "yes"; then AC_DEFINE_UNQUOTED(LOGFILEPATH, "$withval", [Path to the log file]) AC_MSG_RESULT([$withval]) else - AC_DEFINE_UNQUOTED(LOGFILEPATH, "/var/log/netatalk.log", [Path to the log file]) - AC_MSG_RESULT([/var/log/netatalk.log]) - fi],[ AC_DEFINE_UNQUOTED(LOGFILEPATH, "/var/log/netatalk.log", [Path to the log file]) - AC_MSG_RESULT([/var/log/netatalk.log]) + AC_MSG_RESULT([/var/log/netatalk.log]) + fi],[ + AC_DEFINE(DISABLE_LOGGER, 1, [Define if the logger should not be used]) + AC_MSG_RESULT([no, syslog]) ] ) @@ -379,19 +380,6 @@ dnl Check for CNID database backends bdb_required=no AC_NETATALK_CNID([bdb_required=yes],[bdb_required=no]) -dnl Check for Berkeley DB library -if test "x$bdb_required" = "xyes"; then - AC_PATH_BDB(, [ - AC_MSG_RESULT([]) - AC_MSG_RESULT([Make sure you have the required Berkeley DB libraries AND headers installed.]) - AC_MSG_RESULT([You can download the latest version from http://www.sleepycat.com.]) - AC_MSG_RESULT([If you have installed BDB in a non standard location use the]) - AC_MSG_RESULT([--with-bdb=/path/to/bdb configure option and make sure]) - AC_MSG_RESULT([your linker is configured to check for libraries there.]) - AC_MSG_ERROR([Berkeley DB library required but not found!]) - ]) -fi - dnl Check for quota support AC_CHECK_QUOTA @@ -515,6 +503,15 @@ AC_ARG_ENABLE(netbsd, AC_MSG_RESULT([enabling NetBSD-style rc.d support]) ) +AC_ARG_ENABLE(debian, + [ --enable-debian use debian-style sysv configuration ],[ + if test "$enableval" = "yes"; then + sysv_style=debian + fi + AC_MSG_RESULT([enabling debian-style sysv support]) + ] +) + dnl ----- timelord compilation (disabled by default) AC_MSG_CHECKING([whether timelord should be compiled]) compile_timelord=no @@ -545,6 +542,16 @@ AC_ARG_WITH(uams-path, NETATALK_AC_CUPS +dnl check if we can use attribute unused (gcc only) from ethereal +AC_MSG_CHECKING(to see if we can add '__attribute__((unused))' to CFLAGS) +if test x$GCC != x ; then + CFLAGS="-D_U_=\"__attribute__((unused))\" $CFLAGS" + AC_MSG_RESULT(yes) +else + CFLAGS="-D_U_=\"\" $CFLAGS" + AC_MSG_RESULT(no) +fi + dnl -------------------------------------------------------------------------- dnl FHS stuff has to be done last because it overrides other defaults dnl -------------------------------------------------------------------------- @@ -664,14 +671,10 @@ dnl AC_COMPILE_IFELSE([ #include #include #include -], -[ -int main() { - struct atalk_addr foo; - return 0; -} - ], [ + struct atalk_addr foo; +], +[ ], [ ac_have_atalk_addr=yes AC_MSG_RESULT([yes]) ], [ @@ -690,10 +693,12 @@ fi # ) # For quotas on Linux XFS filesystems - AC_CHECK_HEADERS(linux/xqm.h linux/xfs_fs.h) - AC_CHECK_HEADERS(xfs/libxfs.h xfs/xqm.h xfs/xfs_fs.h) + # For linux > 2.5.56 - AC_CHECK_HEADERS(linux/dqblk_xfs.h) + AC_CHECK_HEADERS(linux/dqblk_xfs.h,, + [AC_CHECK_HEADERS(linux/xqm.h linux/xfs_fs.h) + AC_CHECK_HEADERS(xfs/libxfs.h xfs/xqm.h xfs/xfs_fs.h)] + ) dnl ----- as far as I can tell, dbtob always does the wrong thing @@ -901,9 +906,30 @@ if test x"$this_os" = "xtru64"; then sysv_style=tru64 fi -dnl -- look for openssl +dnl -- check for libgcrypt, if found enables DHX UAM +AM_PATH_LIBGCRYPT([1:1.2.3],[neta_cv_compile_dhx2=yes + neta_cv_have_libgcrypt=yes + AC_MSG_NOTICE([Enabling DHX2 UAM]) + AC_DEFINE(HAVE_LIBGCRYPT, 1, [Define if the DHX2 modules should be built with libgcrypt]) + AC_DEFINE(UAM_DHX2, 1, [Define if the DHX2 UAM modules should be compiled]) + ]) + +dnl -- look for openssl, if found enables DHX UAM and Randnum UAM AC_PATH_SSL +dnl Check for Berkeley DB library +if test "x$bdb_required" = "xyes"; then + AC_PATH_BDB(, [ + AC_MSG_RESULT([]) + AC_MSG_RESULT([Make sure you have the required Berkeley DB libraries AND headers installed.]) + AC_MSG_RESULT([You can download the latest version from http://www.sleepycat.com.]) + AC_MSG_RESULT([If you have installed BDB in a non standard location use the]) + AC_MSG_RESULT([--with-bdb=/path/to/bdb configure option and make sure]) + AC_MSG_RESULT([your linker is configured to check for libraries there.]) + AC_MSG_ERROR([Berkeley DB library required but not found!]) + ]) +fi + dnl -- check for crypt AC_CRYPT @@ -913,7 +939,7 @@ AC_MSG_CHECKING([whether the PGP UAM should be build]) AC_ARG_ENABLE(pgp-uam, [ --enable-pgp-uam enable build of PGP UAM module],[ if test "$enableval" = "yes"; then - if test "$compile_ssl" = "yes"; then + if test "x$neta_cv_have_openssl" = "xyes"; then AC_DEFINE(UAM_PGP, 1, [Define if the PGP UAM module should be compiled]) compile_pgp=yes AC_MSG_RESULT([yes]) @@ -987,12 +1013,17 @@ AC_SUBST(OVERWRITE_CONFIG) AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes) AM_CONDITIONAL(COMPILE_TIMELORD, test x$compile_timelord = xyes) AM_CONDITIONAL(COMPILE_A2BOOT, test x$compile_a2boot = xyes) -AM_CONDITIONAL(USE_DHX, test x$compile_ssl = xyes) +AM_CONDITIONAL(HAVE_LIBGCRYPT, test x$neta_cv_have_libgcrypt = xyes) +AM_CONDITIONAL(HAVE_OPENSSL, test x$neta_cv_have_openssl = xyes) +AM_CONDITIONAL(USE_DHX, test x$neta_cv_compile_dhx = xyes) +AM_CONDITIONAL(USE_DHX2, test x$neta_cv_compile_dhx2 = xyes) +AM_CONDITIONAL(USE_RANDNUM, test x$neta_cv_have_openssl = 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$netatalk_cv_install_pam = xyes) AM_CONDITIONAL(BUILD_PAM, test x$compile_pam = xyes) AM_CONDITIONAL(USE_PGP, test x$compile_pgp = xyes) +AM_CONDITIONAL(DEFAULT_HOOK, test x$neta_cv_have_libgcrypt != xyes && test x$neta_cv_have_openssl != 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) @@ -1001,7 +1032,9 @@ AM_CONDITIONAL(USE_SHADOWPW, test x$shadowpw = xyes) AM_CONDITIONAL(USE_TRU64, test x$sysv_style = xtru64) AM_CONDITIONAL(USE_SOLARIS, test x$sysv_style = xsolaris) AM_CONDITIONAL(USE_GENTOO, test x$sysv_style = xgentoo) +AM_CONDITIONAL(USE_DEBIAN, test x$sysv_style = xdebian) AM_CONDITIONAL(USE_UNDEF, test x$sysv_style = x) +AM_CONDITIONAL(USE_BDB, test x$bdb_required = xyes) dnl --------------------- generate files @@ -1034,7 +1067,6 @@ AC_OUTPUT([Makefile contrib/shell_utils/apple_rm contrib/shell_utils/asip-status.pl contrib/shell_utils/cleanappledouble.pl - contrib/shell_utils/netatalkshorternamelinks.pl contrib/timelord/Makefile contrib/a2boot/Makefile distrib/Makefile