X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=8832590e7706647241869a76f239e9a121bfdf79;hb=5957fb1e5f05052f7a5e5c8d7a7b81b7b1e1c205;hp=61994a80d2af9b1df194aec07ae32f5ce92c9535;hpb=831306e866cb444e2af19e0f968e04eab5106e9c;p=netatalk.git

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 61994a80..8832590e 100644
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -1,5 +1,40 @@
 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 Tracker, for Spotlight
+AC_DEFUN([AC_NETATALK_SPOTLIGHT], [
+    ac_cv_tracker_pkg_default=tracker-sparql-0.12
+    AC_ARG_WITH([tracker-pkg-config],
+	[AS_HELP_STRING([--with-tracker-pkg-config],[name of the Tracker SPARQL pkg in pkg-config])],
+	[ac_cv_tracker_pkg=$withval],
+	[ac_cv_tracker_pkg=$ac_cv_tracker_pkg_default])
+
+    AC_MSG_NOTICE([searching for $ac_cv_tracker_pkg])
+
+    PKG_CHECK_MODULES([TRACKER], [$ac_cv_tracker_pkg >= 0.12], [ac_cv_have_tracker=yes], [ac_cv_have_tracker=no])
+
+    if test x"$ac_cv_have_tracker" = x"no" ; then
+        if test x"$need_tracker" = x"yes" ; then
+            AC_MSG_ERROR([$ac_cv_tracker_pkg not found])
+	fi
+    fi
+
+    AC_SUBST(TRACKER_CFLAGS)
+    AC_SUBST(TRACKER_LIBS)
+    AM_CONDITIONAL(HAVE_TRACKER, [test x"$ac_cv_have_tracker" = 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)])
@@ -12,7 +47,10 @@ AC_DEFUN([AC_NETATALK_LIBEVENT], [
     )
 
     if test x"$use_bundled_libevent" = x"yes" ; then
+        AC_MSG_RESULT([no])
         AC_CONFIG_SUBDIRS([libevent])
+    else
+        AC_MSG_RESULT([yes])
     fi
     AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$use_bundled_libevent" = x"yes")
 ])
@@ -23,12 +61,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
@@ -231,7 +273,7 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [
 	    AC_MSG_ERROR([--with-init-style=redhat is obsoleted. Use redhat-sysv or redhat-systemd.])
         ;;
     "redhat-sysv")
-	    AC_MSG_RESULT([enabling redhat-style sysv (upstart) configuration])
+	    AC_MSG_RESULT([enabling redhat-style sysv initscript support])
 	    ;;
     "redhat-systemd")
 	    AC_MSG_RESULT([enabling redhat-style systemd support])
@@ -240,25 +282,25 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [
 	    AC_MSG_ERROR([--with-init-style=suse is obsoleted. Use suse-sysv or suse-systemd.])
         ;;
     "suse-sysv")
-	    AC_MSG_RESULT([enabling suse-style sysv configuration])
+	    AC_MSG_RESULT([enabling suse-style sysv initscript support])
 	    ;;
     "suse-systemd")
 	    AC_MSG_RESULT([enabling suse-style systemd support (>=openSUSE12.1)])
 	    ;;
     "gentoo")
-	    AC_MSG_RESULT([enabling gentoo-style sysv support])
+	    AC_MSG_RESULT([enabling gentoo-style initscript support])
         ;;
     "netbsd")
-	    AC_MSG_RESULT([enabling netbsd-style sysv support])
+	    AC_MSG_RESULT([enabling netbsd-style initscript support])
         ;;
     "debian")
-	    AC_MSG_RESULT([enabling debian-style sysv support])
+	    AC_MSG_RESULT([enabling debian-style initscript 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])
+	    AC_MSG_RESULT([enabling general systemd support])
         ;;
     "none")
 	    AC_MSG_RESULT([disabling init-style support])