luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-04 13:06:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

propagate the pcre flags to libglib and not to all parts of glib.

Browse Source 
2007-09-11  Marco Barisione <marco@barisione.org>

	* glib/Makefile.am:
	* configure.in: propagate the pcre flags to libglib and not to all
	parts of glib. (#475854, dmacks@netspace.org)

svn path=/trunk/; revision=5749
This commit is contained in:
Marco Barisione 2007-09-11 20:10:31 +00:00 committed by Marco Barisione
parent f4a8a220b5
commit 3c4e0759d6
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-09-11 Marco Barisione <marco@barisione.org>
* glib/Makefile.am:
* configure.in: propagate the pcre flags to libglib and not to all
parts of glib. (#475854, dmacks@netspace.org)
2007-09-11 Matthias Clasen <mclasen@redhat.com> 2007-09-11 Matthias Clasen <mclasen@redhat.com>
* configure.in: Define G_ATOMIC_ARM. * configure.in: Define G_ATOMIC_ARM.

7
configure.in
View File

@ -2196,6 +2196,8 @@ if test x$enable_regex = xtrue; then
PKG_CHECK_MODULES(PCRE, PKG_CHECK_MODULES(PCRE,
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_LDFLAGS="$LDFLAGS"
CFLAGS="$CFLAGS $PCRE_CFLAGS" LDFLAGS="$LDFLAGS $PCRE_LIBS" CFLAGS="$CFLAGS $PCRE_CFLAGS" LDFLAGS="$LDFLAGS $PCRE_LIBS"
AC_TRY_RUN([#include <pcre.h> AC_TRY_RUN([#include <pcre.h>
int main () { int main () {
@ -2210,7 +2212,10 @@ if test x$enable_regex = xtrue; then
}], }],
glib_cv_pcre_has_unicode=yes, glib_cv_pcre_has_unicode=yes,
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="$lib_save_CFLAGS"
LDFLAGS="$glib_save_LDFLAGS"
])
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.])
fi fi

5
glib/Makefile.am
View File

@ -22,7 +22,7 @@ SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre
DIST_SUBDIRS = libcharset gnulib pcre update-pcre DIST_SUBDIRS = libcharset gnulib pcre update-pcre
INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"GLib\" \ INCLUDES = -I$(top_srcdir) $(pcre_inc) -DG_LOG_DOMAIN=\"GLib\" \
$(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION $(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
glib.def: glib.symbols glib.def: glib.symbols
@ -261,11 +261,14 @@ endif
if ENABLE_REGEX if ENABLE_REGEX
if USE_SYSTEM_PCRE if USE_SYSTEM_PCRE
pcre_lib = $(PCRE_LIBS) pcre_lib = $(PCRE_LIBS)
pcre_inc = $(PCRE_CFLAGS)
else else
pcre_lib = pcre/libpcre.la pcre_lib = pcre/libpcre.la
pcre_inc =
endif endif
else else
pcre_lib = pcre_lib =
pcre_inc =
endif endif
libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib)