X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=51dbdcab882c17394a0b8bcdae010dc19fe2b2ee;hb=d4fdc0119a3fd21571e27aad6c3e6ff5c56ac880;hp=71c72447c5bbb0321252c2770a201eaee51824ac;hpb=93414a20654cde933490ab20da953a13c3ba3181;p=netatalk.git

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 71c72447..51dbdcab 100644
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -15,18 +15,30 @@ AC_DEFUN([AC_DEVELOPER], [
 
 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)])
-    AC_ARG_ENABLE(
-        bundled-libevent,
-        [AS_HELP_STRING([--disable-bundled-libevent],[whether the bundled version of libevent shall not be used (define CPPFLAGS and LDFLAGS otherwise appropiately to pick up installed version)
-        ])],
-        use_bundled_libevent=$enableval,
+    AC_MSG_CHECKING([whether to use bundled libevent])
+    AC_ARG_WITH(
+        libevent,
+        [AS_HELP_STRING([--with-libevent],[whether to use the bundled libevent (default: yes)])],
+        use_bundled_libevent=$withval,
         use_bundled_libevent=yes
     )
-
-    if test x"$use_bundled_libevent" = x"yes" ; then
-        AC_CONFIG_SUBDIRS([libevent])
+    AC_ARG_WITH(
+        libevent-header,
+        [AS_HELP_STRING([--with-libevent-header],[path to libevent header files])],
+        [use_bundled_libevent=no; LIBEVENT_CFLAGS=-I$withval]
+    )
+    AC_ARG_WITH(
+        libevent-lib,
+        [AS_HELP_STRING([--with-libevent-lib],[path to libevent library])],
+        [use_bundled_libevent=no; LIBEVENT_LDFLAGS=-L$withval]
+    )
+    if test x"$LIBEVENT_CFLAGS" = x"-Iyes" -o x"$LIBEVENT_LDFLAGS" = x"-Lyes" ; then
+        AC_MSG_ERROR([--with-libevent requires a path])
     fi
+    AC_MSG_RESULT([$use_bundled_libevent])
+    AC_CONFIG_SUBDIRS([libevent])
+    AC_SUBST(LIBEVENT_CFLAGS)
+    AC_SUBST(LIBEVENT_LDFLAGS)
     AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$use_bundled_libevent" = x"yes")
 ])
 
@@ -248,7 +260,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])
@@ -257,25 +269,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 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])