summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriain <iain@sleepfive.com>2012-05-14 12:02:41 +0100
committeriain <iain@sleepfive.com>2012-05-14 12:02:41 +0100
commit563716fc596d53f1085949a9dd11a62f39b2d624 (patch)
treef1f6027060ffb26494360cca4721f8f14c481d88
parent89ef7cd375871eea99f2430d5f17eb2d389ca706 (diff)
Add some m4 required stuff, fix 48564
From Luca Ferretti <lferrett@gnome.org>
-rw-r--r--Makefile.am1
-rwxr-xr-xautogen.sh3
-rw-r--r--configure.ac2
3 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 8b4090e..643b1a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
SUBDIRS = interfaces src gypsy examples docs
+ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gypsy.pc
diff --git a/autogen.sh b/autogen.sh
index 047bcc5..8473fb7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,7 @@
#! /bin/sh
+
+test -d m4 || mkdir -p m4
+
gtkdocize || exit 1
# back in the stupidity of autoreconf
diff --git a/configure.ac b/configure.ac
index 26bec28..3ecd500 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,8 @@ AC_CONFIG_SRCDIR(src/main.c)
AM_INIT_AUTOMAKE([1.9 foreign])
AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
+
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_PROG_CC