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

regex: Remove --disable-regex option

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=622149
This commit is contained in:
Christian Persch 2012-02-11 23:51:11 +01:00 committed by Matthias Clasen
parent 3e7f42654f
commit d70634526d
4 changed files with 49 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -2471,22 +2471,9 @@ AC_MSG_RESULT($broken_poll)
dnl *********************
dnl *** GRegex checks ***
dnl *********************
PCRE_REQUIRED_VERSION=8.11
# Check if we should compile GRegex
AC_ARG_ENABLE(regex, AC_HELP_STRING([--disable-regex],
[disable the compilation of GRegex]),
[case "${enableval}" in
yes) enable_regex=true ;;
no) enable_regex=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-regex) ;;
esac],
[enable_regex=true])
AM_CONDITIONAL(ENABLE_REGEX, $enable_regex)
if test x$enable_regex = xtrue; then
AC_DEFINE(ENABLE_REGEX, [], [include GRegex])
# Check if we should use the internal or the system-supplied pcre
AC_ARG_WITH(pcre,
[AC_HELP_STRING([--with-pcre=@<:@internal/system@:>@],
@ -2538,9 +2525,6 @@ if test x$enable_regex = xtrue; then
fi
fi
AC_SUBST(PCRE_WARN_CFLAGS)
else
AM_CONDITIONAL(USE_SYSTEM_PCRE, false])
fi
dnl **********************
dnl *** Win32 API libs ***

16
glib/Makefile.am
View File

@ -30,17 +30,10 @@ PRINTF_SUBDIR = gnulib
printf_la = gnulib/libgnulib.la
endif
if ENABLE_REGEX
if USE_SYSTEM_PCRE
else
MAYBE_PCRE = pcre
endif
gregex_c = gregex.c
gregex_h = gregex.h
else
gregex_c =
gregex_h =
endif
SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
@ -173,7 +166,7 @@ libglib_2_0_la_SOURCES = \
gqsort.c \
gqueue.c \
grand.c \
$(gregex_c) \
gregex.c \
gscanner.c \
gscripttable.h \
gsequence.c \
@ -299,7 +292,7 @@ glibsubinclude_HEADERS = \
gquark.h \
gqueue.h \
grand.h \
$(gregex_h) \
gregex.h \
gscanner.h \
gsequence.h \
gshell.h \
@ -368,7 +361,6 @@ uninstall-def-file:
export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
endif
if ENABLE_REGEX
if USE_SYSTEM_PCRE
pcre_lib = $(PCRE_LIBS)
pcre_inc = $(PCRE_CFLAGS)
@ -376,10 +368,6 @@ else
pcre_lib = pcre/libpcre.la
pcre_inc =
endif
else
pcre_lib =
pcre_inc =
endif
libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD)
libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)

13
glib/tests/regex.c
View File

@ -27,8 +27,6 @@
#include <locale.h>
#include "glib.h"
#ifdef ENABLE_REGEX
/* U+20AC EURO SIGN (symbol, currency) */
#define EURO "\xe2\x82\xac"
/* U+00E0 LATIN SMALL LETTER A WITH GRAVE (letter, lowercase) */
@ -2659,14 +2657,3 @@ main (int argc, char *argv[])
return g_test_run ();
}
#else /* ENABLE_REGEX false */
int
main (int argc, char *argv[])
{
g_print ("GRegex is disabled.\n");
return 0;
}
#endif /* ENABLE_REGEX */

5
gobject/gboxed.c
View File

@ -132,13 +132,8 @@ G_DEFINE_BOXED_TYPE (GPtrArray, g_ptr_array,g_ptr_array_ref, g_ptr_array_unref)
G_DEFINE_BOXED_TYPE (GByteArray, g_byte_array, g_byte_array_ref, g_byte_array_unref)
G_DEFINE_BOXED_TYPE (GBytes, g_bytes, g_bytes_ref, g_bytes_unref);
#ifdef ENABLE_REGEX
G_DEFINE_BOXED_TYPE (GRegex, g_regex, g_regex_ref, g_regex_unref)
G_DEFINE_BOXED_TYPE (GMatchInfo, g_match_info, g_match_info_ref, g_match_info_unref)
#else
GType g_regex_get_type (void) { return G_TYPE_INVALID; }
GType g_match_info_get_type (void) { return G_TYPE_INVALID; }
#endif /* ENABLE_REGEX */
#define g_variant_type_get_type g_variant_type_get_gtype
G_DEFINE_BOXED_TYPE (GVariantType, g_variant_type, g_variant_type_copy, g_variant_type_free)