Merge branch-allea

[netatalk.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6dac0a9a2bb46a527b8b22d0d50dd8171c4a3e6d..54530e77921cbb34445b554ac77ea4c8ef763e62 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -137,7 +137,7 @@ dnl Check for optional valid-shell-check support
 AC_NETATALK_SHELL_CHECK
 
 dnl Check for optional sysv initscript install
-AC_NETATALK_SYSV_STYLE
+AC_NETATALK_INIT_STYLE
 
 dnl Path where UAM modules shall be installed
 AC_ARG_WITH(uams-path, [  --with-uams-path=PATH   path to UAMs [[$libdir/netatalk/]]], [uams_path="$withval/"], [uams_path="$libdir/netatalk/"])
@@ -160,6 +160,9 @@ AC_NETATALK_PGP_UAM
 dnl Check for building Kerberos V UAM module
 AC_NETATALK_KRB5_UAM
 
+dnl Check for Kerberos 5 support
+AC_NETATALK_KERBEROS
+
 dnl Check for overwrite the config files or not
 AC_NETATALK_OVERWRITE_CONFIG
 
@@ -184,7 +187,6 @@ AC_NETATALK_SENDFILE
 dnl FHS stuff has to be done last because it overrides other defaults
 AC_NETATALK_FHS
 
-LIBS="$LIBS -L\$(top_srcdir)/libatalk"
 CFLAGS="-I\$(top_srcdir)/include -I\$(top_srcdir)/sys $CFLAGS"
 UAMS_PATH="${uams_path}"
 
@@ -208,8 +210,10 @@ AM_CONDITIONAL(DEFAULT_HOOK, test x$neta_cv_have_libgcrypt != xyes && test x$net
 AM_CONDITIONAL(USE_BDB, test x$bdb_required = xyes)
 AM_CONDITIONAL(HAVE_ATFUNCS, test x"$ac_neta_haveatfuncs" = x"yes")
 
-dnl --------------------- generate files
+dnl --------------------- configure subpackages
+AC_CONFIG_SUBDIRS([libevent])
 
+dnl --------------------- generate files
 AC_OUTPUT([Makefile
        bin/Makefile
        bin/ad/Makefile
@@ -236,6 +240,7 @@ AC_OUTPUT([Makefile
        etc/Makefile
        etc/afpd/Makefile
        etc/cnid_dbd/Makefile
+       etc/netatalk/Makefile
        etc/uams/Makefile
        include/Makefile
        include/atalk/Makefile