diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x autom4te.cache -x '*compile' -x Makefile.in.in -x 'intltool*.in' -x 'xml-i18n-*.in' -x '*.pyc' -x '*.mo' -x '*.gmo' -x ABOUT-NLS -x Makevars.template -x COPYING -x INSTALL -x mdate-sh -x '*.orig' -x '*.rej' -x '*~' -x '*.temp' -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x omf.make -x xmldocs.make origsrc/gnome-build-0.1.4/configure.in src/gnome-build-0.1.4/configure.in
--- origsrc/gnome-build-0.1.4/configure.in	2007-01-14 09:30:31.000000000 -0600
+++ src/gnome-build-0.1.4/configure.in	2007-01-17 02:09:08.453125000 -0600
@@ -118,6 +118,16 @@
 AM_GLIB_GNU_GETTEXT
 AM_GLIB_DEFINE_LOCALEDIR(GNOMELOCALEDIR)
 
+# Check for GNU regex functions
+AH_TEMPLATE(NATIVE_GNU_REGEX, [Define if the C library implements the GNU regular expressions API])
+BUILD_GNU_REGEX=false
+AC_CHECK_FUNCS([re_compile_pattern re_compile_fastmap re_search re_match], [
+	AC_DEFINE(NATIVE_GNU_REGEX)
+], [
+	BUILD_GNU_REGEX=true
+])
+AM_CONDITIONAL(BUILD_GNU_REGEX,$BUILD_GNU_REGEX)
+
 # Set location for backends installation
 gbf_save_prefix="$prefix"
 gbf_save_exec_prefix="$exec_prefix"
@@ -137,6 +147,7 @@
 AC_OUTPUT([
 Makefile
 src/Makefile
+src/gnu-regex/Makefile
 src/gbf/Makefile
 src/backends/Makefile
 src/backends/libgbf_am/Makefile
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x autom4te.cache -x '*compile' -x Makefile.in.in -x 'intltool*.in' -x 'xml-i18n-*.in' -x '*.pyc' -x '*.mo' -x '*.gmo' -x ABOUT-NLS -x Makevars.template -x COPYING -x INSTALL -x mdate-sh -x '*.orig' -x '*.rej' -x '*~' -x '*.temp' -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x omf.make -x xmldocs.make origsrc/gnome-build-0.1.4/src/Makefile.am src/gnome-build-0.1.4/src/Makefile.am
--- origsrc/gnome-build-0.1.4/src/Makefile.am	2007-01-09 13:24:12.000000000 -0600
+++ src/gnome-build-0.1.4/src/Makefile.am	2007-01-17 02:09:26.250000000 -0600
@@ -1 +1 @@
-SUBDIRS = gbf backends
+SUBDIRS = gnu-regex gbf backends
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x autom4te.cache -x '*compile' -x Makefile.in.in -x 'intltool*.in' -x 'xml-i18n-*.in' -x '*.pyc' -x '*.mo' -x '*.gmo' -x ABOUT-NLS -x Makevars.template -x COPYING -x INSTALL -x mdate-sh -x '*.orig' -x '*.rej' -x '*~' -x '*.temp' -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x omf.make -x xmldocs.make origsrc/gnome-build-0.1.4/src/backends/libgbf_am/Makefile.am src/gnome-build-0.1.4/src/backends/libgbf_am/Makefile.am
--- origsrc/gnome-build-0.1.4/src/backends/libgbf_am/Makefile.am	2007-01-09 13:24:10.000000000 -0600
+++ src/gnome-build-0.1.4/src/backends/libgbf_am/Makefile.am	2007-01-17 02:08:18.140625000 -0600
@@ -1,8 +1,17 @@
 SUBDIRS = GBF
 
+if BUILD_GNU_REGEX
+REGEX_CFLAGS = -I$(top_srcdir)/src/gnu-regex
+REGEX_LIBS = $(top_builddir)/src/gnu-regex/libgnuregex.la
+else
+REGEX_CFLAGS =
+REGEX_LIBS = 
+endif
+
 INCLUDES = 					\
 	-I$(top_srcdir)/src			\
 	-I$(top_srcdir)/src/gbf			\
+	$(REGEX_CFLAGS)		\
 	-DSCRIPTS_DIR=\"$(scriptsdir)\"		\
         -DGBF_GLADEDIR=\""$(gladedir)"\"        \
         $(WARN_CFLAGS) $(DEPRECATED_FLAGS)	\
@@ -26,9 +35,10 @@
 	gbf-am-properties.c \
 	gbf-am-properties.h 
 
-libgbf_am_la_LDFLAGS = -version-info $(LTVERSION)
+libgbf_am_la_LDFLAGS = -module -avoid-version -no-undefined
 libgbf_am_la_LIBADD = \
 	$(top_builddir)/src/gbf/libgbf-1.la \
+	$(REGEX_LIBS) \
 	$(GBF_AM_BACKEND_LIBS)
 
 noinst_PROGRAMS = test
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x autom4te.cache -x '*compile' -x Makefile.in.in -x 'intltool*.in' -x 'xml-i18n-*.in' -x '*.pyc' -x '*.mo' -x '*.gmo' -x ABOUT-NLS -x Makevars.template -x COPYING -x INSTALL -x mdate-sh -x '*.orig' -x '*.rej' -x '*~' -x '*.temp' -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x omf.make -x xmldocs.make origsrc/gnome-build-0.1.4/src/backends/libgbf_mkfile/Makefile.am src/gnome-build-0.1.4/src/backends/libgbf_mkfile/Makefile.am
--- origsrc/gnome-build-0.1.4/src/backends/libgbf_mkfile/Makefile.am	2007-01-09 13:24:11.000000000 -0600
+++ src/gnome-build-0.1.4/src/backends/libgbf_mkfile/Makefile.am	2007-01-17 02:08:37.500000000 -0600
@@ -1,8 +1,17 @@
 SUBDIRS = GBF
 
+if BUILD_GNU_REGEX
+REGEX_CFLAGS = -I$(top_srcdir)/src/gnu-regex
+REGEX_LIBS = $(top_builddir)/src/gnu-regex/libgnuregex.la
+else
+REGEX_CFLAGS =
+REGEX_LIBS =
+endif
+
 INCLUDES = 					\
 	-I$(top_srcdir)/src			\
 	-I$(top_srcdir)/src/gbf			\
+	$(REGEX_CFLAGS)		\
 	-DSCRIPTS_DIR=\"$(scriptsdir)\"		\
         $(WARN_CFLAGS) $(DEPRECATED_FLAGS)	\
         $(GBF_MKFILE_BACKEND_CFLAGS)
@@ -25,9 +34,10 @@
 	gbf-mkfile-properties.c \
 	gbf-mkfile-properties.h 
 
-libgbf_mkfile_la_LDFLAGS = -version-info $(LTVERSION)
+libgbf_mkfile_la_LDFLAGS = -module -avoid-version -no-undefined
 libgbf_mkfile_la_LIBADD = \
 	$(top_builddir)/src/gbf/libgbf-1.la \
+	$(REGEX_LIBS) \
 	$(GBF_MKFILE_BACKEND_LIBS)
 
 server_in_files = gbf-mkfile.server.in
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x autom4te.cache -x '*compile' -x Makefile.in.in -x 'intltool*.in' -x 'xml-i18n-*.in' -x '*.pyc' -x '*.mo' -x '*.gmo' -x ABOUT-NLS -x Makevars.template -x COPYING -x INSTALL -x mdate-sh -x '*.orig' -x '*.rej' -x '*~' -x '*.temp' -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x omf.make -x xmldocs.make origsrc/gnome-build-0.1.4/src/gbf/Makefile.am src/gnome-build-0.1.4/src/gbf/Makefile.am
--- origsrc/gnome-build-0.1.4/src/gbf/Makefile.am	2007-01-09 13:24:12.000000000 -0600
+++ src/gnome-build-0.1.4/src/gbf/Makefile.am	2007-01-16 23:34:44.953125000 -0600
@@ -23,7 +23,7 @@
 	gbf-backend.h		\
 	gbf-backend.c
 
-libgbf_1_la_LDFLAGS = -version-info $(LTVERSION)
+libgbf_1_la_LDFLAGS = -version-info $(LTVERSION) -no-undefined
 libgbf_1_la_LIBADD = $(GBF_LIBS)
 
 libgbf_widgets_1_la_SOURCES =	\
@@ -40,7 +40,7 @@
 	gbf-project-util.h	\
 	gbf-project-util.c
 
-libgbf_widgets_1_la_LDFLAGS = -version-info $(LTVERSION)
+libgbf_widgets_1_la_LDFLAGS = -version-info $(LTVERSION) -no-undefined
 libgbf_widgets_1_la_LIBADD = libgbf-1.la $(GBF_LIBS)
 
 libgbfincludedir = $(includedir)/gnome-build-1.0/gbf
