Merge remote branch 'origin/product-2-2' into develop

[netatalk.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c556887bcc74585e84860eced75ecd5f47d28899..54530e77921cbb34445b554ac77ea4c8ef763e62 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -187,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}"
 
@@ -211,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
@@ -239,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