X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=176c03b144f3af0aeca66efbbdb94d8c6b5c6e28;hb=d2dfd7f30a8ee93137b206159859c026f446ef2f;hp=0c711b14856fd1cbe2f376a331c1bc22b7af8131;hpb=d9e43153cf13b9307cacb8de155fdd638edf5fb5;p=netatalk.git

diff --git a/configure.ac b/configure.ac
index 0c711b14..176c03b1 100644
--- 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
@@ -716,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
@@ -838,8 +864,6 @@ if test x"$netatalk_cv_search_sendfile" = x"yes"; then
         AC_DEFINE(SENDFILE_FLAVOR_SOLARIS, 1, [Solaris sendfile()])
         AC_SEARCH_LIBS(sendfile, sendfile)
         AC_CHECK_FUNC([sendfile], [netatalk_cv_HAVE_SENDFILE=yes])
-dnl -- there's a bug somewhere, disable for now
-        netatalk_cv_HAVE_SENDFILE=no
         ;;
 
     *freebsd*)
@@ -1276,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)
@@ -1322,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