glib r7815 - in trunk: . gobject

[matthiasc svn gnome org]

Author: matthiasc
Date: Sun Jan 18 06:53:44 2009
New Revision: 7815
URL: http://svn.gnome.org/viewvc/glib?rev=7815&view=rev

Log:
        * configure.in: Define an ENABLE_REGEX macro

        * gobject/gboxed.c: Don't refer to g_regex_ref if ENABLE_REGEX
        is not defined.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gobject/gboxed.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jan 18 06:53:44 2009
@@ -2502,6 +2502,7 @@
 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@:>@],

Modified: trunk/gobject/gboxed.c
==============================================================================
--- trunk/gobject/gboxed.c	(original)
+++ trunk/gobject/gboxed.c	Sun Jan 18 06:53:44 2009
@@ -263,10 +263,14 @@
 g_regex_get_type (void)
 {
   static GType type_id = 0;
+
+#ifdef ENABLE_REGEX
   if (!type_id)
     type_id = g_boxed_type_register_static (g_intern_static_string ("GRegex"),
 					    (GBoxedCopyFunc) g_regex_ref,
 					    (GBoxedFreeFunc) g_regex_unref);
+#endif
+
   return type_id;
 }