Adjust loglevel

[netatalk.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fa91c6e93ec4d10e1ea3d8760b44fd3ebae71d04..176c03b144f3af0aeca66efbbdb94d8c6b5c6e28 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -393,7 +393,6 @@ AC_ARG_ENABLE(locking,
 AC_ARG_ENABLE(redhat,
        [  --enable-redhat         obsoleted ],[
        echo "ERROR: --enable-redhat is obsoleted. Use --enable-redhat-sysv or --enable-redhat-systemd."
-       echo "exit 1"
        exit 1
        ]
 )
@@ -417,14 +416,30 @@ AC_ARG_ENABLE(redhat-systemd,
 )
 
 AC_ARG_ENABLE(suse,
-       [  --enable-suse           use suse-style sysv configuration ],[
+       [  --enable-suse           obsoleted ],[
+       echo "ERROR: --enable-suse is obsoleted. Use --enable-suse-sysv or --enable-suse-systemd."
+       exit 1
+       ]
+)
+
+AC_ARG_ENABLE(suse-sysv,
+       [  --enable-suse-sysv      use suse-style sysv configuration ],[
        if test "$enableval" = "yes"; then
-               sysv_style=suse
+               sysv_style=suse-sysv
        fi
        AC_MSG_RESULT([enabling suse-style sysv support])
        ]
 )
 
+AC_ARG_ENABLE(suse-systemd,
+       [  --enable-suse-systemd   use suse-style systemd (>=openSUSE12.1) configuration ],[
+       if test "$enableval" = "yes"; then
+               sysv_style=suse-systemd
+       fi
+       AC_MSG_RESULT([enabling suse-style systemd support])
+       ]
+)
+
 AC_ARG_ENABLE(gentoo,
        [  --enable-gentoo         use gentoo-style sysv configuration ],[
        if test "$enableval" = "yes"; then
@@ -451,6 +466,15 @@ AC_ARG_ENABLE(debian,
        ]
 )
 
+AC_ARG_ENABLE(systemd,
+       [  --enable-systemd        use general systemd configuration],[
+       if test "$enableval" = "yes"; then
+               sysv_style=systemd
+       fi
+       AC_MSG_RESULT([enabling general systemd support])
+       ]
+)
+
 dnl ----- timelord compilation (disabled by default)
 AC_MSG_CHECKING([whether timelord should be compiled])
 compile_timelord=no
@@ -592,7 +616,6 @@ if test x"$this_os" = "xfreebsd"; then
        AC_MSG_RESULT([ * FreeBSD specific configuration])
        AC_DEFINE(BSD4_4, 1, [BSD compatiblity macro])
        AC_DEFINE(FREEBSD, 1, [Define if OS is FreeBSD])
-
     AC_DEFINE(OPEN_NOFOLLOW_ERRNO, EMLINK, errno returned by open with O_NOFOLLOW)
 fi
 
@@ -601,7 +624,6 @@ if test x"$this_os" = "xkfreebsd-gnu"; then
        AC_MSG_RESULT([ * GNU/kFreeBSD specific configuration])
        AC_DEFINE(BSD4_4, 1, [BSD compatiblity macro])
        AC_DEFINE(FREEBSD, 1, [Define if OS is FreeBSD])
-       AC_DEFINE(SENDFILE_FLAVOR_BSD, 1, [Define if the sendfile() function uses BSD semantics])
     AC_DEFINE(OPEN_NOFOLLOW_ERRNO, EMLINK, errno returned by open with O_NOFOLLOW)
 fi
 
@@ -718,6 +740,8 @@ if test x"$this_os" = "xsolaris"; then
        AC_DEFINE(_ISOC9X_SOURCE, 1, [Compatibility macro])
        AC_DEFINE(NO_STRUCT_TM_GMTOFF, 1, [Define if the gmtoff member of struct tm is not available])
        AC_DEFINE(SOLARIS, 1, [Solaris compatibility macro])
+    AC_DEFINE(_XOPEN_SOURCE, 600, [Solaris compilation environment])
+    AC_DEFINE(__EXTENSIONS__,  1, [Solaris compilation environment])
        CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
        need_dash_r=yes
        sysv_style=solaris
@@ -832,43 +856,8 @@ AC_ARG_ENABLE(sendfile,
 if test x"$netatalk_cv_search_sendfile" = x"yes"; then
    case "$host_os" in
    *linux*)
-       AC_DEFINE(SENDFILE_FLAVOR_LINUX,1,[Whether linux sendfile() API is available])
-       AC_MSG_CHECKING([for sendfile() syscall])
-       AC_CACHE_CHECK([for sendfile support],
-           [netatalk_cv_HAVE_SENDFILE],
-           [AC_TRY_LINK(
-               [#include <sys/sendfile.h>],
-               [int tofd, fromfd;
-                   off_t offset;
-                   size_t total;
-                   ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);],
-               [netatalk_cv_HAVE_SENDFILE=yes]
-            )]
-        )
-
-        # Try and cope with broken Linux sendfile....
-        AC_CACHE_CHECK([for broken Linux sendfile support],
-            [netatalk_cv_HAVE_BROKEN_LINUX_SENDFILE],
-            [AC_TRY_LINK(
-                [#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-                    #undef _FILE_OFFSET_BITS
-                    #endif
-                    #include <sys/sendfile.h>],
-                [int tofd, fromfd;
-                    off_t offset;
-                    size_t total;
-                    ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);],
-                [netatalk_cv_HAVE_SENDFILE=yes; netatalk_cv_HAVE_BROKEN_SENDFILE=yes]
-            )]
-        )
-        if test x"$netatalk_cv_HAVE_SENDFILE" = x"yes"; then
-            AC_MSG_RESULT(yes);
-        else
-            AC_MSG_RESULT(no);
-        fi
-        if test x"$netatalk_cv_HAVE_BROKEN_SENDFILE" = x"yes"; then
-            AC_DEFINE(LINUX_BROKEN_SENDFILE_API,1,[Whether Linux sendfile() is broken])
-        fi
+        AC_DEFINE(SENDFILE_FLAVOR_LINUX,1,[Whether linux sendfile() API is available])
+        AC_CHECK_FUNC([sendfile], [netatalk_cv_HAVE_SENDFILE=yes])
         ;;
 
     *solaris*)
@@ -888,7 +877,6 @@ if test x"$netatalk_cv_search_sendfile" = x"yes"; then
     esac
 
     if test x"$netatalk_cv_HAVE_SENDFILE" = x"yes"; then
-        AC_DEFINE(HAVE_SENDFILE,1,[Whether sendfile() is available])
         AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() should be used])
     fi
 fi
@@ -1312,13 +1300,13 @@ 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_NETBSD, test x$sysv_style = xnetbsd)
 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_SUSE_SYSV, test x$sysv_style = xsuse-sysv)
 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_SYSTEMD, test x$sysv_style = xsystemd || test x$sysv_style = xredhat-systemd || test x$sysv_style = xsuse-systemd)
 AM_CONDITIONAL(USE_UNDEF, test x$sysv_style = x)
 AM_CONDITIONAL(USE_BDB, test x$bdb_required = xyes)
 AM_CONDITIONAL(USE_APPLETALK, test x$netatalk_cv_ddp_enabled = xyes)
@@ -1358,6 +1346,7 @@ AC_OUTPUT([Makefile
        distrib/config/netatalk-config
        distrib/initscripts/Makefile
        distrib/m4/Makefile
+       distrib/systemd/Makefile
        doc/Makefile
        etc/Makefile
        etc/afpd/Makefile