luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 09:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the pcre Unicode test to work with LDFLAGS=-Wl,--as-needed. (#484261,

Browse Source 
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)



svn path=/trunk/; revision=6387
This commit is contained in:
Matthias Clasen 2008-01-27 22:49:25 +00:00 committed by Matthias Clasen
parent c923700b3d
commit 3773991fdf
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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)
2008-01-27 Murray Cumming <murrayc@murrayc.com> 2008-01-27 Murray Cumming <murrayc@murrayc.com>
* gio/gfile.c: (g_file_replace_contents), * gio/gfile.c: (g_file_replace_contents),

6
configure.in
View File

@ -2434,8 +2434,8 @@ if test x$enable_regex = xtrue; then
libpcre >= $PCRE_REQUIRED_VERSION) libpcre >= $PCRE_REQUIRED_VERSION)
AC_CACHE_CHECK([for Unicode support in PCRE],glib_cv_pcre_has_unicode,[ AC_CACHE_CHECK([for Unicode support in PCRE],glib_cv_pcre_has_unicode,[
glib_save_CFLAGS="$CFLAGS" glib_save_CFLAGS="$CFLAGS"
glib_save_LDFLAGS="$LDFLAGS" glib_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $PCRE_CFLAGS" LDFLAGS="$LDFLAGS $PCRE_LIBS" CFLAGS="$CFLAGS $PCRE_CFLAGS" LIBS="$PCRE_LIBS"
AC_TRY_RUN([#include <pcre.h> AC_TRY_RUN([#include <pcre.h>
int main () { int main () {
int support; int support;
@ -2451,7 +2451,7 @@ if test x$enable_regex = xtrue; then
glib_cv_pcre_has_unicode=no, glib_cv_pcre_has_unicode=no,
glib_cv_pcre_has_unicode=yes) glib_cv_pcre_has_unicode=yes)
CFLAGS="$glib_save_CFLAGS" CFLAGS="$glib_save_CFLAGS"
LDFLAGS="$glib_save_LDFLAGS" LIBS="$glib_save_LIBS"
]) ])
if test "$glib_cv_pcre_has_unicode" = "no"; then if test "$glib_cv_pcre_has_unicode" = "no"; then
AC_MSG_ERROR([*** The system-supplied PCRE does not support Unicode properties or UTF-8.]) AC_MSG_ERROR([*** The system-supplied PCRE does not support Unicode properties or UTF-8.])