gtksourceview r1943 - in trunk: . docs/reference gtksourceview gtksourceview/regex

[muntyan svn gnome org]

Author: muntyan
Date: Wed Apr  9 18:22:58 2008
New Revision: 1943
URL: http://svn.gnome.org/viewvc/gtksourceview?rev=1943&view=rev

Log:
2008-04-09  Yevgen Muntyan  <muntyan tamu edu>

	gtksourceview depends on gtk-2.12 now, so it will not be
	built with glib older than 2.14, so pcre stuff may go now.

	* configure.ac:
	* gtksourceview/Makefile.am:
	* docs/reference/Makefile.am: removed regex stuff.

	* acinclude.m4:
	* gtksourceview/regex: deleted.



Removed:
   trunk/acinclude.m4
   trunk/gtksourceview/regex/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/docs/reference/Makefile.am
   trunk/gtksourceview/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Apr  9 18:22:58 2008
@@ -67,13 +67,6 @@
 AC_SUBST(DEP_CFLAGS)
 AC_SUBST(DEP_LIBS)
 
-# If the regex system is included in glib we should check that
-BUILD_EGG_REGEX=true
-AM_CONDITIONAL(BUILD_EGG_REGEX,$BUILD_EGG_REGEX)
-
-# this macro is defined in acinclude.m4
-GTK_SOURCE_VIEW_AC_REGEX
-
 # Do we build optional tests?
 AC_ARG_ENABLE(build_tests,
               AC_HELP_STRING([--disable-build-tests],
@@ -116,9 +109,6 @@
 gtksourceview-zip
 po/Makefile.in
 gtksourceview/Makefile
-gtksourceview/regex/Makefile
-gtksourceview/regex/pcre/Makefile
-gtksourceview/regex/glib/Makefile
 gtksourceview/language-specs/Makefile
 docs/Makefile
 docs/reference/Makefile
@@ -136,5 +126,4 @@
 	Source code location:	${srcdir}
 	Compiler:		${CC}
 	build tests:		$msg_tests
-        use system pcre:        $USE_SYSTEM_PCRE
 "

Modified: trunk/docs/reference/Makefile.am
==============================================================================
--- trunk/docs/reference/Makefile.am	(original)
+++ trunk/docs/reference/Makefile.am	Wed Apr  9 18:22:58 2008
@@ -33,12 +33,7 @@
 	gtktextregion.h				\
 	gtksourceengine.h			\
 	gtksourcecontextengine.h		\
-	gtksourceprintjob.h			\
-	eggregex.h				\
-	pcre.h					\
-	pcre_internal.h				\
-	ucp.h					\
-	ucpinternal.h
+	gtksourceprintjob.h
 
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS = --sgml-mode --output-format=xml --ignore-files=trio

Modified: trunk/gtksourceview/Makefile.am
==============================================================================
--- trunk/gtksourceview/Makefile.am	(original)
+++ trunk/gtksourceview/Makefile.am	Wed Apr  9 18:22:58 2008
@@ -1,24 +1,6 @@
-DIST_SUBDIRS = language-specs regex
 SUBDIRS = language-specs
 
-REGEX_LIBS =
-REGEX_CFLAGS =
-
-if BUILD_GREGEX
-REGEX_LIBS += regex/glib/libgregex.la
-REGEX_CFLAGS += -I$(srcdir)/regex
-SUBDIRS += regex
-endif
-
-if !USE_SYSTEM_PCRE
-REGEX_LIBS += regex/pcre/libpcre.la
-else
-REGEX_LIBS += $(PCRE_LIBS)
-REGEX_CFLAGS += $(PCRE_CFLAGS)
-endif
-
 INCLUDES = 				\
-	$(REGEX_CFLAGS)			\
 	-DDATADIR=\""$(datadir)"\" 	\
 	-DG_LOG_DOMAIN=\"GtkSourceView\"\
 	-I$(top_srcdir) -I$(srcdir) 	\
@@ -80,7 +62,7 @@
 nodist_libgtksourceview_2_0_la_SOURCES =\
 	$(BUILT_SOURCES)
 
-libgtksourceview_2_0_la_LIBADD = $(DEP_LIBS) $(REGEX_LIBS)
+libgtksourceview_2_0_la_LIBADD = $(DEP_LIBS)
 libgtksourceview_2_0_la_LDFLAGS = -no-undefined -export-symbols-regex "^gtk_source_.*"
 libgtksourceview_2_0_includedir = $(includedir)/gtksourceview-2.0/gtksourceview