summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2009-04-11 16:44:46 (UTC)
committer Michael Krelin <hacker@klever.net>2009-04-11 16:44:46 (UTC)
commitd0509b2da90aa54ea923cf5731174e6b0a33d0eb (patch) (side-by-side diff)
tree3dc38d594f11f1588f3a8ac830c1d72ef7a934a3
parentf3308ce9dbe8d07a9b1f71d158b0e67c017044ce (diff)
downloadlibopkele-d0509b2da90aa54ea923cf5731174e6b0a33d0eb.zip
libopkele-d0509b2da90aa54ea923cf5731174e6b0a33d0eb.tar.gz
libopkele-d0509b2da90aa54ea923cf5731174e6b0a33d0eb.tar.bz2
add libtool macros to distributed tarball
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am3
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac1
4 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 87771db..4fe418f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ 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,10 +1,11 @@
-
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:
diff --git a/autogen.sh b/autogen.sh
index ba27501..52b32cc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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,9 +1,10 @@
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