-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile.am | 3 | ||||
-rwxr-xr-x | autogen.sh | 2 | ||||
-rw-r--r-- | configure.ac | 1 |
4 files changed, 5 insertions, 2 deletions
@@ -14,8 +14,9 @@ config.status stamp-h1 config.h.in libtool autom4te.cache libopkele.pc missing aclocal.m4 install-sh +aclocal.d diff --git a/Makefile.am b/Makefile.am index 3227bdb..7726dad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,13 @@ - SUBDIRS=include lib test EXTRA_DIST= NEWS NEWS.xml NEWS.xsl +ACLOCAL_AMFLAGS=-I aclocal.d + pkgconfigdir=${libdir}/pkgconfig pkgconfig_DATA=libopkele.pc all-local: NEWS if HAVE_DOXYGEN clean-local: rm -rf doxydox endif @@ -1,9 +1,9 @@ #!/bin/sh WANT_AUTOMAKE=1.8 export WANT_AUTOMAKE libtoolize -f \ -&& aclocal \ +&& aclocal -I aclocal.d \ && autoheader \ && automake -a \ && autoconf \ && ./configure "$@" diff --git a/configure.ac b/configure.ac index a6de8c3..fd68b5b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,12 @@ AC_INIT([libopkele], [2.0.2], [libopkele-bugs@klever.net]) AC_CONFIG_SRCDIR([include/opkele/opkele-config.h]) AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h]) +AC_CONFIG_MACRO_DIR([aclocal.d]) AM_INIT_AUTOMAKE([dist-bzip2]) AC_PROG_INSTALL AC_PROG_CXX AC_PROG_CC AC_PROG_LIBTOOL PKG_PROG_PKG_CONFIG |