CNID backend mtab has already gone.

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index bbdee98320a9a0b1916bfe568d01df45bf3e4cb0..d8ca34c94da3e2c42424c10f478f8a55b6b57be8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,6 +8,7 @@ AC_SUBST(NETATALK_VERSION)
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(netatalk, ${NETATALK_VERSION})
 AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE([enable])
 
 dnl Checks for programs.
 AC_PROG_AWK
@@ -384,16 +385,32 @@ AC_ARG_ENABLE(locking,
 
 )
 
-
 AC_ARG_ENABLE(redhat,
-       [  --enable-redhat         use redhat-style sysv configuration ],[
+       [  --enable-redhat         obsoleted ],[
+       echo "ERROR: --enable-redhat is obsoleted. Use --enable-redhat-sysv or --enable-redhat-systemd."
+       echo "exit 1"
+       exit 1
+       ]
+)
+
+AC_ARG_ENABLE(redhat-sysv,
+       [  --enable-redhat-sysv    use redhat-style sysv (upstart) configuration ],[
        if test "$enableval" = "yes"; then
-               sysv_style=redhat
+               sysv_style=redhat-sysv
        fi
        AC_MSG_RESULT([enabling redhat-style sysv support])
        ]
 )
 
+AC_ARG_ENABLE(redhat-systemd,
+       [  --enable-redhat-systemd use redhat-style systemd (>=Fedora15) configuration ],[
+       if test "$enableval" = "yes"; then
+               sysv_style=redhat-systemd
+       fi
+       AC_MSG_RESULT([enabling redhat-style systemd support])
+       ]
+)
+
 AC_ARG_ENABLE(suse,
        [  --enable-suse           use suse-style sysv configuration ],[
        if test "$enableval" = "yes"; then
@@ -412,14 +429,6 @@ AC_ARG_ENABLE(gentoo,
        ]
 )
 
-AC_ARG_ENABLE(cobalt,
-       [  --enable-cobalt         use cobalt-style sysv configuration ],
-       if test "$enableval" = "yes"; then
-               sysv_style=cobalt
-       fi
-       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
@@ -555,6 +564,8 @@ dnl --------------------- GNU source
 case "$this_os" in
        linux)  AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions])
         ;;
+     *kfreebsd-gnu*) AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions])
+        ;;
 esac
 
 dnl --------------------- operating system specific flags (port from sys/*)
@@ -1078,7 +1089,7 @@ if test x"$with_acl_support" = x"yes" ; then
                                [netatalk_cv_HAVE_ACL_GET_PERM_NP=no])
                                LIBS=$acl_LIBS
                        ])
-                       if test x"netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
+                       if test x"$netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
                                AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
                        fi
 
@@ -1265,9 +1276,9 @@ 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)
+AM_CONDITIONAL(USE_REDHAT_SYSV, test x$sysv_style = xredhat-sysv)
+AM_CONDITIONAL(USE_REDHAT_SYSTEMD, test x$sysv_style = xredhat-systemd)
 AM_CONDITIONAL(USE_SUSE, test x$sysv_style = xsuse)
 AM_CONDITIONAL(USE_SHADOWPW, test x$shadowpw = xyes)
 AM_CONDITIONAL(USE_TRU64, test x$sysv_style = xtru64)
@@ -1291,20 +1302,19 @@ AC_OUTPUT([Makefile
        bin/cnid/cnid2_create
        bin/getzones/Makefile
        bin/megatron/Makefile
-    bin/misc/Makefile
+       bin/misc/Makefile
        bin/nbp/Makefile
        bin/pap/Makefile
        bin/psorder/Makefile
        bin/uniconv/Makefile
        config/Makefile
-    config/pam/Makefile
+       config/pam/Makefile
        contrib/Makefile
        contrib/macusers/Makefile
        contrib/macusers/macusers
        contrib/printing/Makefile
        contrib/shell_utils/Makefile
-       contrib/shell_utils/afpd-mtab.pl
-    contrib/shell_utils/apple_dump
+       contrib/shell_utils/apple_dump
        contrib/shell_utils/asip-status.pl
        contrib/timelord/Makefile
        contrib/a2boot/Makefile