X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=71c72447c5bbb0321252c2770a201eaee51824ac;hb=80f3b5f66fbf2ef7584813b2ae14090ce4ea11e6;hp=6ae3fab2b0d51ac2a6191652376333e40c817c2f;hpb=f929f4e41ead6abd4cf05d4aeca5ce1f5942e569;p=netatalk.git

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 6ae3fab2..71c72447 100644
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -1,5 +1,18 @@
 dnl Kitchen sink for configuration macros
 
+dnl Whether to enable developer build
+AC_DEFUN([AC_DEVELOPER], [
+    AC_MSG_CHECKING([whether to enable developer build])
+    AC_ARG_ENABLE(
+        developer,
+        AS_HELP_STRING([--enable-developer], [whether to enable developer build (ABI checking)]),
+        enable_dev=$enableval,
+        enable_dev=no
+    )
+    AC_MSG_RESULT([$enable_dev])
+    AM_CONDITIONAL(DEVELOPER, test x"$enable_dev" = x"yes")
+])
+
 dnl Whether to disable bundled libevent
 AC_DEFUN([AC_NETATALK_LIBEVENT], [
     AC_MSG_CHECKING([whether to disable bundled libevent (define CPPFLAGS and LDFLAGS otherwise appropiately to pick up installed version)])
@@ -23,12 +36,16 @@ AC_MSG_CHECKING([whether to use Filesystem Hierarchy Standard (FHS) compatibilit
 AC_ARG_ENABLE(fhs,
 	[  --enable-fhs            use Filesystem Hierarchy Standard (FHS) compatibility],[
 	if test "$enableval" = "yes"; then
-		uams_path="${libdir}/netatalk"
+		bindir="/bin"
+		sbindir="/sbin"
 		sysconfdir="/etc"
-		PKGCONFDIR=${sysconfdir}/netatalk
-		SERVERTEXT="${PKGCONFDIR}/msg"
-		use_pam_so=yes
+		libdir="/lib"
+		localstatedir="/var"
 		mandir="/usr/share/man"
+		uams_path="${libdir}/netatalk"
+		PKGCONFDIR="${sysconfdir}"
+		SERVERTEXT="${localstatedir}/netatalk/msg"
+		use_pam_so=yes
 		AC_DEFINE(FHS_COMPATIBILITY, 1, [Define if you want compatibily with the FHS])
 		AC_MSG_RESULT([yes])
 	else
@@ -101,7 +118,7 @@ dnl Check for optional cracklib support
 AC_DEFUN([AC_NETATALK_CRACKLIB], [
 netatalk_cv_with_cracklib=no
 AC_ARG_WITH(cracklib,
-	[  --with-cracklib=DICT    enable/set location of cracklib dictionary],[
+	[  --with-cracklib[[=DICT]]  enable/set location of cracklib dictionary [[no]]],[
 	if test "x$withval" != "xno" ; then
 		cracklib="$withval"
 		AC_CHECK_LIB(crack, main, [
@@ -255,7 +272,7 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [
 	    AC_MSG_RESULT([enabling debian-style sysv support])
         ;;
     "solaris")
-	    AC_MSG_RESULT([enabling solaris-style sysv support])
+	    AC_MSG_RESULT([enabling solaris-style SMF support])
         ;;
     "systemd")
 	    AC_MSG_RESULT([use general systemd configuration])