X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=05db1af1523b6da143bb1f39913246016a778271;hb=d2b6cfa8725c54c05874806c859bfd2d8df1834f;hp=e8d4dca20de3990834265da9d52c9ee9d3a45e36;hpb=ee0eafd034fdc01af58bdf257328df456a322b04;p=netatalk.git diff --git a/configure.in b/configure.in index e8d4dca2..05db1af1 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.179.2.3.2.33 2004-07-12 00:15:18 didg Exp $ +dnl $Id: configure.in,v 1.179.2.3.2.37.2.7 2006-09-07 05:02:20 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: @@ -130,8 +131,7 @@ AC_FUNC_MMAP AC_TYPE_SIGNAL AC_FUNC_UTIME_NULL AC_FUNC_WAIT3 -AC_CHECK_FUNCS(getcwd gethostname gettimeofday getusershell mkdir rmdir select socket strdup strcasestr strstr strtoul setpgrp strchr memcpy) -AC_FUNC_SETPGRP +AC_CHECK_FUNCS(getcwd gethostname gettimeofday getusershell mkdir rmdir select socket strdup strcasestr strstr strtoul strchr memcpy) AC_CHECK_FUNCS(backtrace_symbols) AC_CHECK_FUNCS(setlocale nl_langinfo) AC_CHECK_FUNCS(waitpid getcwd strdup strndup strnlen strtoul strerror chown fchown chmod fchmod chroot link mknod mknod64) @@ -184,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]) ] ) @@ -205,28 +206,26 @@ 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]) ] ) netatalk_cv_with_cracklib=no -AC_MSG_CHECKING([for cracklib support]) AC_ARG_WITH(cracklib, [ --with-cracklib=DICT enable/set location of cracklib dictionary],[ if test "x$withval" != "xno" ; then @@ -234,7 +233,6 @@ AC_ARG_WITH(cracklib, AC_CHECK_LIB(crack, main, [ AC_DEFINE(USE_CRACKLIB, 1, [Define if cracklib should be used]) LIBS="$LIBS -lcrack" - AC_MSG_RESULT([yes]) if test "$cracklib" = "yes"; then cracklib="/usr/$atalk_libname/cracklib_dict" fi @@ -246,13 +244,11 @@ AC_ARG_WITH(cracklib, AC_MSG_ERROR([cracklib not found!]) ] ) - else - AC_MSG_RESULT([no]) fi - ],[ - AC_MSG_RESULT([no]) ] ) +AC_MSG_CHECKING([for cracklib support]) +AC_MSG_RESULT([$netatalk_cv_with_cracklib]) netatalk_cv_ddp_enabled=yes AC_MSG_CHECKING([whether to enable DDP]) @@ -389,9 +385,10 @@ 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.sleepcat.com.]) + 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.]) + 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 @@ -519,6 +516,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 @@ -549,6 +555,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 -------------------------------------------------------------------------- @@ -668,14 +684,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]) ], [ @@ -694,10 +706,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 @@ -770,7 +784,6 @@ dnl ----- Mac OSX specific ----- if test x"$this_os" = "xmacosx"; then AC_MSG_RESULT([ * Mac OSX specific configuration]) AC_DEFINE(BSD4_4, 1, [BSD compatiblity macro]) - AC_DEFINE(HAVE_BROKEN_CPP, 1, [Define if cpp is broken]) AC_DEFINE(HAVE_2ARG_DBTOB, 1, [Define if dbtob takes two arguments]) dnl AC_DEFINE(NO_DLFCN_H) AC_DEFINE(NO_DDP, 1, [Define if DDP should be disabled]) @@ -1006,6 +1019,7 @@ 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) dnl --------------------- generate files @@ -1039,7 +1053,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