Pass name to afp_config_parse and use NULL for processname as test

[netatalk.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c556887bcc74585e84860eced75ecd5f47d28899..484a0dedf8f72eec16f52a88100b55b3cc9c4fb4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -184,10 +184,12 @@ AC_NETATALK_REALPATH
 dnl Check for sendfile()
 AC_NETATALK_SENDFILE
 
+dnl Check whether bundled libevent shall not be used
+AC_NETATALK_LIBEVENT
+
 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}"
 
@@ -199,7 +201,7 @@ AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
 AM_CONDITIONAL(HAVE_LIBGCRYPT, test x$neta_cv_have_libgcrypt = xyes)
 AM_CONDITIONAL(HAVE_OPENSSL, test x$neta_cv_have_openssl = xyes)
 AM_CONDITIONAL(HAVE_ACLS, test x"$with_acl_support" = x"yes")
-AM_CONDITIONAL(HAVE_LDAP, test x"$with_ldap" = x"yes")
+AM_CONDITIONAL(HAVE_LDAP, test x"$netatalk_cv_ldap" = x"yes")
 AM_CONDITIONAL(USE_DHX, test x$neta_cv_compile_dhx = xyes)
 AM_CONDITIONAL(USE_DHX2, test x$neta_cv_compile_dhx2 = xyes)
 AM_CONDITIONAL(USE_RANDNUM, test x$neta_cv_have_openssl = xyes)
@@ -212,7 +214,6 @@ AM_CONDITIONAL(USE_BDB, test x$bdb_required = xyes)
 AM_CONDITIONAL(HAVE_ATFUNCS, test x"$ac_neta_haveatfuncs" = x"yes")
 
 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