summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2009-05-09 18:13:49 +0300
committerColin Walters <walters@verbum.org>2009-07-16 10:57:03 -0400
commit29513843b22dbd2aba1d3ba2930bb38e2c6631e5 (patch)
tree5d838def42a17114e4444e2375585c6b15f70f51
parentd66337bdf9fc8f5372d84b05ae68c818bb9c881b (diff)
build: fix undefined macro: AM_PROG_LIBTOOL with recent libtool
Without this patch, I get: configure.ac:206: warning: macro `AM_PROG_LIBTOOL' not found in library configure.ac:213: error: possibly undefined macro: AM_PROG_LIBTOOL If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. autoreconf2.50: /usr/bin/autoconf failed with exit status: 1 (I am using libltdl-dev 2.2.6a-4 from Debian)
-rw-r--r--Makefile.am1
-rwxr-xr-xautogen.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index def7f53..bb49d8e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
GLIB_PC=dbus-glib-1.pc
SUBDIRS=dbus tools test doc
diff --git a/autogen.sh b/autogen.sh
index 56183be..a7c8129 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -131,6 +131,7 @@ if test -z "$*"; then
fi
+libtoolize --force || echo "libtoolize failed"
gtkdocize || echo "gtkdocize failed"
export AUTOMAKE ACLOCAL