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

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index ce587f08..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, [
@@ -223,7 +240,7 @@ AC_ARG_ENABLE(shell-check,
 dnl Check for optional sysv initscript install
 AC_DEFUN([AC_NETATALK_INIT_STYLE], [
     AC_ARG_WITH(init-style,
-                [  --with-init-style       use OS specific init config [[redhat-sysv|redhat-systemd|suse-sysv|suse-systemd|gentoo|netbsd|debian|systemd]]],
+                [  --with-init-style       use OS specific init config [[redhat-sysv|redhat-systemd|suse-sysv|suse-systemd|gentoo|netbsd|debian|solaris|systemd]]],
                 init_style="$withval", init_style=none
     )
     case "$init_style" in 
@@ -254,18 +271,22 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [
     "debian")
 	    AC_MSG_RESULT([enabling debian-style sysv support])
         ;;
+    "solaris")
+	    AC_MSG_RESULT([enabling solaris-style SMF support])
+        ;;
     "systemd")
 	    AC_MSG_RESULT([use general systemd configuration])
         ;;
+    "none")
+	    AC_MSG_RESULT([disabling init-style support])
+        ;;
     *)
-	    AC_MSG_RESULT([disabling sysv support])
+	    AC_MSG_ERROR([illegal init-style])
         ;;
     esac
     AM_CONDITIONAL(USE_NETBSD, test x$init_style = xnetbsd)
     AM_CONDITIONAL(USE_REDHAT_SYSV, test x$init_style = xredhat-sysv)
     AM_CONDITIONAL(USE_SUSE_SYSV, test x$init_style = xsuse-sysv)
-    AM_CONDITIONAL(USE_SHADOWPW, test x$shadowpw = xyes)
-    AM_CONDITIONAL(USE_TRU64, test x$init_style = xtru64)
     AM_CONDITIONAL(USE_SOLARIS, test x$init_style = xsolaris)
     AM_CONDITIONAL(USE_GENTOO, test x$init_style = xgentoo)
     AM_CONDITIONAL(USE_DEBIAN, test x$init_style = xdebian)
@@ -546,6 +567,15 @@ fi
 if test x"$with_kerberos" = x"yes"; then
    AC_DEFINE([HAVE_KERBEROS], [1], [Define if Kerberos 5 is available])
 fi
+
+dnl Check for krb5_free_unparsed_name and krb5_free_error_message
+save_CFLAGS="$CFLAGS"
+save_LIBS="$LIBS"
+CFLAGS="$KRB5_CFLAGS"
+LIBS="$KRB5_LIBS"
+AC_CHECK_FUNCS([krb5_free_unparsed_name krb5_free_error_message])
+CFLAGS="$save_CFLAGS"
+LIBS="$save_LIBS"
 ])
 
 dnl Check for overwrite the config files or not
@@ -918,6 +948,7 @@ 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])
+        AC_CHECK_FUNCS([sendfilev])
         ;;
 
     *freebsd*)
@@ -962,4 +993,4 @@ AC_CACHE_CHECK([if the realpath function allows a NULL argument],
 if test x"$neta_cv_REALPATH_TAKES_NULL" = x"yes"; then
     AC_DEFINE(REALPATH_TAKES_NULL,1,[Whether the realpath function allows NULL])
 fi
-])
\ No newline at end of file
+])