glib r6387 - trunk

[matthiasc svn gnome org]

Author: matthiasc
Date: Sun Jan 27 22:49:25 2008
New Revision: 6387
URL: http://svn.gnome.org/viewvc/glib?rev=6387&view=rev

Log:
2008-01-27  Matthias Clasen  <mclasen redhat com>

        * configure.in: Fix the pcre Unicode test to work with
        LDFLAGS=-Wl,--as-needed.  (#484261, Mark Lee)




Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jan 27 22:49:25 2008
@@ -2434,8 +2434,8 @@
                       libpcre >= $PCRE_REQUIRED_VERSION)
     AC_CACHE_CHECK([for Unicode support in PCRE],glib_cv_pcre_has_unicode,[
                    glib_save_CFLAGS="$CFLAGS"
-                   glib_save_LDFLAGS="$LDFLAGS"
-                   CFLAGS="$CFLAGS $PCRE_CFLAGS" LDFLAGS="$LDFLAGS $PCRE_LIBS"
+                   glib_save_LIBS="$LIBS"
+                   CFLAGS="$CFLAGS $PCRE_CFLAGS" LIBS="$PCRE_LIBS"
                    AC_TRY_RUN([#include <pcre.h>
                                int main () {
                                  int support;
@@ -2451,7 +2451,7 @@
                    glib_cv_pcre_has_unicode=no,
                    glib_cv_pcre_has_unicode=yes)
                    CFLAGS="$glib_save_CFLAGS"
-                   LDFLAGS="$glib_save_LDFLAGS"
+                   LIBS="$glib_save_LIBS"
 	])
     if test "$glib_cv_pcre_has_unicode" = "no"; then
       AC_MSG_ERROR([*** The system-supplied PCRE does not support Unicode properties or UTF-8.])