Change build system

Fixes bug 617356

diff --git a/Makefile.am b/Makefile.am
index 844b0ff..ccfb23a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/Makefile.decl
+ACLOCAL_AMFLAGS = -I m4
 NULL =
 
 if ENABLE_DOC

diff --git a/autogen.sh b/autogen.sh
index b30e288..ba9dc30 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,7 +9,7 @@ cd $srcdir
 # Automake requires that ChangeLog exists.
 touch ChangeLog
 
-autoreconf -v --install || exit 1
+gnome-autogen.sh || exit 1
 cd $ORIGDIR || exit $?
 
 if test -z "$NOCONFIGURE"; then

diff --git a/configure.ac b/configure.ac
index 9475c8a..e622d72 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 AC_INIT([libgee], [0.5.2], [ptitjes@free.fr], [libgee])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([dist-bzip2])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])