summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCody Russell <bratsche@gnome.org>2007-05-30 02:45:22 +0000
committerCody Russell <bratsche@src.gnome.org>2007-05-30 02:45:22 +0000
commit92ebd4eac05dab1c3ac4e88d0f14ef9f984921f3 (patch)
treefa3c1dd123bc4844a2dabc8ca6fb791ee1ae7563
parentcdadca21c55ba9599e0120a34a7f4826c5bb9f96 (diff)
Fix a sed script that doesn't correctly detect i586-mingw32-gcc-3.4
2007-05-29 Cody Russell <bratsche@gnome.org> * configure.in: Fix a sed script that doesn't correctly detect i586-mingw32-gcc-3.4 compiler, and was causing -Wno-pointer-sign errors when building with that compiler. (#440896, Yevgen Muntyan) svn path=/trunk/; revision=5520
-rw-r--r--ChangeLog6
-rw-r--r--configure.in13
2 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 03c753478..584d89e72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-29 Cody Russell <bratsche@gnome.org>
+
+ * configure.in: Fix a sed script that doesn't correctly detect
+ i586-mingw32-gcc-3.4 compiler, and was causing -Wno-pointer-sign
+ errors when building with that compiler. (#440896, Yevgen Muntyan)
+
2007-05-29 Marco Barisione <marco@barisione.org>
* glib/gregex.c: Fix g_regex_fetch_named() and
diff --git a/configure.in b/configure.in
index 0a10e98dc..68b45dce3 100644
--- a/configure.in
+++ b/configure.in
@@ -2201,13 +2201,12 @@ if test x$enable_regex = xtrue; then
else
# If using gcc 4 pass -Wno-pointer-sign when compiling the internal PCRE
if test x"$GCC" = xyes; then
- AC_MSG_CHECKING([whether gcc understands -Wno-pointer-sign])
- if test [`$CC --version | sed -e 's/[^0-9]*\([0-9]\).*/\1/' -e q`] -ge 4; then
- PCRE_WARN_CFLAGS="$PCRE_WARN_CFLAGS -Wno-pointer-sign"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- fi
+ AC_MSG_CHECKING([whether compiler understands -Wno-pointer-sign])
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Wno-pointer-sign"
+ AC_TRY_COMPILE([],[],[PCRE_WARN_CFLAGS="$PCRE_WARN_CFLAGS -Wno-pointer-sign"
+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
+ CFLAGS="$save_CFLAGS"
fi
fi
AC_SUBST(PCRE_WARN_CFLAGS)