[tasks/gnome3: 7/14] build: remove check for GRegex
- From: Ross Burton <rburton src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tasks/gnome3: 7/14] build: remove check for GRegex
- Date: Wed, 27 Apr 2011 18:44:23 +0000 (UTC)
commit 7ab93365bd5b9bc279d0f2d54de7992082171bec
Author: Ross Burton <ross linux intel com>
Date: Wed Apr 27 19:34:58 2011 +0100
build: remove check for GRegex
configure.ac | 5 -----
libkoto/koto-date-parser.c | 23 -----------------------
2 files changed, 0 insertions(+), 28 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5561db5..275b689 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,11 +68,6 @@ AM_CONDITIONAL(WITH_UNIQUE, test "$with_unique" = "xyes")
old_cflags=$CFLAGS
CFLAGS=$GTK_CFLAGS
-# This was introduced in GLib 2.14
-AC_CHECK_DECLS([g_regex_new],
- [have_regex=yes], [have_regex=no], [#include <glib.h>])
-AM_CONDITIONAL(HAVE_GREGEX, test "x$have_regex" = "xyes")
-
# This was introduced in GTK+ 2.10
AC_CHECK_DECLS([GDK_WINDOW_TYPE_HINT_COMBO, gtk_style_lookup_color],
[], [], [#include <gtk/gtk.h>])
diff --git a/libkoto/koto-date-parser.c b/libkoto/koto-date-parser.c
index 02b2ed9..3bb18bb 100644
--- a/libkoto/koto-date-parser.c
+++ b/libkoto/koto-date-parser.c
@@ -32,8 +32,6 @@
/*
* This entire file is replaced with a stub if we don't have GRegex
*/
-#if HAVE_DECL_G_REGEX_NEW
-
/* Set this to 1 to get lots of debugging output */
#define DEBUG 0
@@ -811,24 +809,3 @@ main (int argc, char **argv)
return 0;
}
#endif /* BUILD_TESTS */
-
-
-#else /* HAVE_DECL_G_REGEX_NEW */
-
-/* Stub implementation for when we don't have GRegex available. */
-
-GDate *
-koto_date_parse (const char *s, char **out_s)
-{
- return NULL;
-}
-
-#if BUILD_TESTS
-int
-main (int argc, char **argv)
-{
- return 0;
-}
-#endif /* BUILD_TESTS */
-
-#endif /* HAVE_DECL_G_REGEX_NEW */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]