summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2011-09-13 07:16:15 +0000
committerPatrick Ohly <patrick.ohly@intel.com>2011-09-13 07:16:15 +0000
commit1dded79da1de6afd87c594d2b9873d51408f1ffb (patch)
tree19bee47c8bd8b950c2f3170530df564f03b95857
parent1e78a7fe81d7d6140a0f7ecaa428a31170d62d72 (diff)
autotools: fixed --enable-warning integration
Switching between distros only works when wiping out the wrong m4 macros. Use the same approach as in SyncEvolution: temporary macros in m4, permanent ones under git control in m4-repo.
-rwxr-xr-xautogen.sh5
-rw-r--r--m4-repo/dk-warn.m4 (renamed from m4/dk-warn.m4)0
2 files changed, 3 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh
index f08c81c..93c407a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,12 +4,13 @@ set -e
# wipe out temporary autotools files, necessary
# when switching between distros
-rm -rf aclocal.m4 autom4te.cache config.guess config.sub config.h.in configure depcomp install-sh ltmain.sh missing
+rm -rf m4 aclocal.m4 autom4te.cache config.guess config.sub config.h.in configure depcomp install-sh ltmain.sh missing
+mkdir m4
(cd src && ./gen-makefile-am.sh)
libtoolize -c
-aclocal -I m4
+aclocal -I m4 -I m4-repo
autoheader
automake -a -c
autoconf
diff --git a/m4/dk-warn.m4 b/m4-repo/dk-warn.m4
index 90243bd..90243bd 100644
--- a/m4/dk-warn.m4
+++ b/m4-repo/dk-warn.m4