summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYselkowitz <yselkowitz@users.sourceforge.net>2007-04-24 10:00:43 +0000
committerMurray Cumming <murrayc@src.gnome.org>2007-04-24 10:00:43 +0000
commit950b49a8580c4471f1a1bddd29fc81724db62b4d (patch)
treea5aca2df79adc80483fa5c8f119622c2a2420409
parent5d98c94d74200345a5e4aad2013f302ba973c2bc (diff)
downloadglibmm-950b49a8580c4471f1a1bddd29fc81724db62b4d.tar.gz
Check for both m4 and M4 in the GNU m4 output, to fix the build on some
2007-04-24 Yselkowitz <yselkowitz@users.sourceforge.net> * scripts/macros.m4: Check for both m4 and M4 in the GNU m4 output, to fix the build on some platforms. Bug #423990 svn path=/branches/glibmm-2-12/; revision=403
-rw-r--r--ChangeLog6
-rw-r--r--scripts/macros.m42
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 45275f45..caa23da4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-24 Yselkowitz <yselkowitz@users.sourceforge.net>
+
+ * scripts/macros.m4: Check for both m4 and M4 in the GNU m4 output,
+ to fix the build on some platforms.
+ Bug #423990
+
2.12.8:
2007-04-11 Armin Burgmeier <armin@openismus.com>
diff --git a/scripts/macros.m4 b/scripts/macros.m4
index 44a9c4de..abc7f8ae 100644
--- a/scripts/macros.m4
+++ b/scripts/macros.m4
@@ -10,7 +10,7 @@ AC_CHECK_PROGS(M4, gm4 m4, m4)
if test "$M4" = "m4"; then
AC_MSG_CHECKING(whether m4 is GNU m4)
- if $M4 --version </dev/null 2>/dev/null | grep '^GNU m4 ' >/dev/null ; then
+ if $M4 --version </dev/null 2>/dev/null | grep '^GNU [Mm]4 ' >/dev/null ; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)