From: srittau Date: Sun, 8 Jun 2003 14:52:37 +0000 (+0000) Subject: Put check for DID scheme into a separate macro, fixed configure help string X-Git-Tag: HEAD-before-afp3-merge~62 X-Git-Url: https://arthur.barton.de/gitweb/?a=commitdiff_plain;h=2c77de423b7ca79a1c68f737f7a0e14416457c85;p=netatalk.git Put check for DID scheme into a separate macro, fixed configure help string indention, streamlined "checking foo..." messages. --- diff --git a/configure.in b/configure.in index 590e1e2a..0b957de8 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.183 2003-06-07 12:04:51 srittau Exp $ +dnl $Id: configure.in,v 1.184 2003-06-08 14:52:37 srittau Exp $ dnl configure.in for netatalk AC_INIT(bin/adv1tov2/adv1tov2.c) @@ -120,33 +120,40 @@ dnl -------------------------------------------------------------------------- AC_DEFINE(ADMIN_GRP, 1, [Define if the admin group should be enabled]) +AC_MSG_CHECKING([for administrative group support]) AC_ARG_WITH(admin-group, - [ --disable-admin-group disable admin group], + [ --disable-admin-group disable admin group], [ if test "$enableval" = "no"; then AC_DEFINE(ADMIN_GRP, 0, [Define if the admin group should be enabled]) - AC_MSG_RESULT([disabling administrative group support]) - fi + AC_MSG_RESULT([no]) + else + AC_MSG_RESULT([yes]) + fi], [ + AC_MSG_RESULT([yes]) + ] ) NETATALK_AFS_CHECK NETATALK_CONFIG_DIRS +AC_MSG_CHECKING([for logfile path]) 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 + use --without-logfile to disable logger], [ + if test "x$withval" == "xno"; then AC_DEFINE(DISABLE_LOGGER, 1, [Define if the logger should not be used]) - AC_MSG_RESULT([logger disabled]) + AC_MSG_RESULT([syslog]) elif test "$withval" != "yes"; then AC_DEFINE_UNQUOTED(LOGFILEPATH, "$withval", [Path to the log file]) - AC_MSG_RESULT([logfile set to $withval]) + AC_MSG_RESULT([$withval]) else AC_DEFINE_UNQUOTED(LOGFILEPATH, "/var/log/netatalk.log", [Path to the log file]) - AC_MSG_RESULT([logfile set to default]) - fi, + AC_MSG_RESULT([/var/log/netatalk.log]) + fi], [ AC_DEFINE_UNQUOTED(LOGFILEPATH, "/var/log/netatalk.log", [Path to the log file]) - AC_MSG_RESULT([logfile set to default]) + AC_MSG_RESULT([/var/log/netatalk.log]) + ] ) AC_ARG_WITH(cracklib, @@ -168,24 +175,36 @@ AC_ARG_WITH(cracklib, fi ) +AC_MSG_CHECKING([whether to enable DDP]) AC_ARG_ENABLE(ddp, - [ --disable-ddp disable DDP], - if test "$enableval" = "no"; then + [ --disable-ddp disable DDP], [ + if test "x$enableval" = "xno"; then AC_DEFINE(NO_DDP, 1, [Define if DDP should be disabled]) - AC_MSG_RESULT([disabling DDP]) + AC_MSG_RESULT([no]) + else + AC_MSG_RESULT([yes]) fi + ], [ + AC_MSG_RESULT([yes]) + ] ) +AC_MSG_CHECKING([whether to enable debugging code]) AC_ARG_ENABLE(debug, - [ --enable-debug enable debug code], - if test "$enableval" != "no"; then - if test "$enableval" = "yes"; then + [ --enable-debug enable debug code], [ + if test "x$enableval" != "xno"; then + if test "x$enableval" = "xyes"; then AC_DEFINE(DEBUG, 1, [Define if debugging information should be included]) else AC_DEFINE_UNQUOTED(DEBUG, $enableval, [Define if debugging information should be included]) fi - AC_MSG_RESULT([enabling debugging code]) + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) fi + ], [ + AC_MSG_RESULT([no]) + ] ) afp3=no @@ -211,47 +230,34 @@ dnl since the students don't have telnet access to the Mac servers. There is dnl currently no one working on further development/fixes of DROPKLUDGE. dnl ----------- +AC_MSG_CHECKING([whether to enable experimental dropbox support]) AC_ARG_ENABLE(dropkludge, - [ --enable-dropkludge enable the experimental dropbox fix (INSECURE!) ], - if test "$enableval" = "yes"; then + [ --enable-dropkludge enable the experimental dropbox fix (INSECURE!) ], [ + if test "x$enableval" = "xyes"; then AC_DEFINE(DROPKLUDGE, 1, [Define if you want to use the experimental dropkludge support]) - AC_MSG_RESULT([enabling experimental dropbox support]) + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) fi + ], [AC_MSG_RESULT([no])] ) +AC_MSG_CHECKING([whether to enable forcing of uid/gid per volume]) AC_ARG_ENABLE(force-uidgid, - [ --enable-force-uidgid allow forcing of uid/gid per volume (BROKEN) ], - if test "$enableval" = "yes"; then + [ --enable-force-uidgid allow forcing of uid/gid per volume (BROKEN) ], [ + if test "x$enableval" = "xyes"; then AC_DEFINE(FORCE_UIDGID, 1, [Define if you want forcing of uid/gid per volume]) - AC_MSG_RESULT([enabling forcing of uid/gid per volume]) + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) fi + ], [AC_MSG_RESULT([no])] ) -dnl Don't use BDB unless it's needed -bdb_required=no - -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, [Define if the last DID scheme should be used]) - AC_MSG_RESULT([last]) -elif test "x$did_scheme" = "xcnid"; then - bdb_required="yes" - AC_DEFINE(CNID_DB, 1, [Define if the CNID DB DID scheme should be used]) - 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") +NETATALK_ARG_DID dnl Determine whether or not to use filename mangling -AC_MSG_CHECKING([whether or not to use filename mangling]) +AC_MSG_CHECKING([whether to use filename mangling]) AC_ARG_WITH(mangling, [ --with-mangling enable filename mangling], [ @@ -282,7 +288,7 @@ else fi 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_MSG_CHECKING([whether to use CNID with Concurrent Data Store]) AC_ARG_WITH(cdb, [ --with-cdb enable CNID with Concurrent Data Store], if test "$withval" = "no"; then @@ -304,11 +310,6 @@ if test "$USE_CDB" = "yes"; then AC_DEFINE(CNID_DB_CDB, 1, [Define if CNID should be used with Concurrent Data Store]) 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 - dnl Check for quota support AC_CHECK_QUOTA @@ -397,7 +398,7 @@ dnl ----- a2boot compilation (disabled by default) AC_MSG_CHECKING([whether a2boot should be compiled]) compile_a2boot=no AC_ARG_ENABLE(a2boot, - [ --enable-a2boot enable compilation of Apple2 boot server], + [ --enable-a2boot enable compilation of Apple2 boot server], [compile_a2boot="$enableval"], [compile_a2boot="no"] ) diff --git a/macros/did-scheme.m4 b/macros/did-scheme.m4 new file mode 100644 index 00000000..baa31d2a --- /dev/null +++ b/macros/did-scheme.m4 @@ -0,0 +1,34 @@ +dnl $Id: did-scheme.m4,v 1.1 2003-06-08 14:52:37 srittau Exp $ + +AC_DEFUN([NETATALK_ARG_DID], [ + +dnl Don't use BDB unless it's needed +bdb_required=no + +dnl Determine DID scheme + +AC_MSG_CHECKING([for DID scheme to use]) +AC_ARG_WITH(did, + [ --with-did=SCHEME set DID scheme (cnid,last) [cnid]], + [ did_scheme="$withval" ], + [ did_scheme="cnid" ] +) + +if test "x$did_scheme" = "xlast"; then + AC_DEFINE(USE_LASTDID, 1, [Define if the last DID scheme should be used]) + AC_MSG_RESULT([last]) +elif test "x$did_scheme" = "xcnid"; then + bdb_required="yes" + AC_DEFINE(CNID_DB, 1, [Define if the CNID DB DID scheme should be used]) + AC_MSG_RESULT([CNID DB]) +else + AC_MSG_ERROR([unknown DID scheme]) +fi +AM_CONDITIONAL(COMPILE_CNID, test "x$did_scheme" = "xcnid") + +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 + +])