summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac1
3 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index b946dbf..5d9301c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,6 +39,8 @@ DEBIAN_FILES = debian/changelog debian/compat debian/control \
EXTRA_DIST = nss-ldapd.conf nslcd.h nslcd-common.h \
m4/*.m4 HACKING $(DEBIAN_FILES)
+ACLOCAL_AMFLAGS = -I config -I m4
+
NSS_LDAP_PATH_CONF = @NSS_LDAP_PATH_CONF@
install-data-local: install-ldap_conf
diff --git a/autogen.sh b/autogen.sh
index 8644b3f..867dfff 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,7 +19,7 @@
cp -f /usr/share/automake-1.9/INSTALL INSTALL
# generate aclocal.m4 from configure.ac
-aclocal-1.9
+aclocal-1.9 -I m4
# generate config.h.in from configure.ac
autoheader --warnings=all
diff --git a/configure.ac b/configure.ac
index a7e6c21..f03a63b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,7 +271,6 @@ LIBS="$nslcd_LIBS"
save_CFLAGS="$CFLAGS"
# check threading stuff
-m4_sinclude(m4/acx_pthread.m4)
ACX_PTHREAD(,AC_MSG_ERROR([no support for pthreads]))
AC_CHECK_FUNCS(pthread_atfork)