From 3773991fdf657e5d27dca9d90dc8b934e42285a0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 27 Jan 2008 22:49:25 +0000 Subject: [PATCH] Fix the pcre Unicode test to work with LDFLAGS=-Wl,--as-needed. (#484261, 2008-01-27 Matthias Clasen * configure.in: Fix the pcre Unicode test to work with LDFLAGS=-Wl,--as-needed. (#484261, Mark Lee) svn path=/trunk/; revision=6387 --- ChangeLog | 5 +++++ configure.in | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 520dab38f..d05ebaacf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-01-27 Matthias Clasen + + * configure.in: Fix the pcre Unicode test to work with + LDFLAGS=-Wl,--as-needed. (#484261, Mark Lee) + 2008-01-27 Murray Cumming * gio/gfile.c: (g_file_replace_contents), diff --git a/configure.in b/configure.in index 47a7aa321..98573f77e 100644 --- a/configure.in +++ b/configure.in @@ -2434,8 +2434,8 @@ if test x$enable_regex = xtrue; then 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 int main () { int support; @@ -2451,7 +2451,7 @@ if test x$enable_regex = xtrue; then 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.])