Index: ossp-pkg/fsl/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/fsl/ChangeLog,v
rcsdiff -q -kk '-r1.28' '-r1.29' -u '/v/ossp/cvs/ossp-pkg/fsl/ChangeLog,v' 2>/dev/null
--- ChangeLog	2004/03/19 22:36:07	1.28
+++ ChangeLog	2004/04/22 09:32:50	1.29
@@ -8,7 +8,16 @@
 
   CHANGELOG
 
-  Changes between 1.4.0 and 1.5a1 (dd-mmm-2004)
+  Changes between 1.4.0 and 1.5a1 (22-Apr-2004)
+
+    *) Improve name space cleanness embedding a OSSP pcre which offers
+       PREFIX logic and modify configure.ac to pass down the prefix.
+       [Thomas Lotterer <thomas@lotterer.net>]
+
+    *) Fix regex name space dirt by embedding a OSSP pcre which no
+       longer provides POSIX functions regcomp, regerror, regexec and
+       regfree.
+       [Thomas Lotterer <thomas@lotterer.net>]
 
     *) Fix PR#39: configure --with-l2 does not work because it checks
        for a function that no longer exists. Reported by Kimura Fuyuki.
Index: ossp-pkg/fsl/configure.ac
RCS File: /v/ossp/cvs/ossp-pkg/fsl/configure.ac,v
rcsdiff -q -kk '-r1.18' '-r1.19' -u '/v/ossp/cvs/ossp-pkg/fsl/configure.ac,v' 2>/dev/null
--- configure.ac	2004/03/19 22:36:08	1.18
+++ configure.ac	2004/04/22 09:32:50	1.19
@@ -86,7 +86,7 @@
                 pcre, pcre_compile, pcre.h,
                 [SUBDIR_PCRE=""],
                 [SUBDIR_PCRE="lib_pcre"
-                 CPPFLAGS="$CPPFLAGS -Ilib_pcre"
+                 CPPFLAGS="$CPPFLAGS -Ilib_pcre -DPCRE_PREFIX=fsl_";
                  CFLAGS="$CFLAGS -Ilib_pcre"
                  LIB_DEPS="$LIB_DEPS lib_pcre/*.lo"])
 AC_SUBST(SUBDIR_PCRE)
@@ -96,6 +96,8 @@
 if test ".$SUBDIR_L2"   != .; then AC_CONFIG_SUBDIRS(lib_l2)   fi
 if test ".$SUBDIR_CFG"  != .; then AC_CONFIG_SUBDIRS(lib_cfg)  fi
 if test ".$SUBDIR_PCRE" != .; then AC_CONFIG_SUBDIRS(lib_pcre) fi
+dnl #   export is a hack to pass CPPFLAGS down to subdirs (introduced for PCRE_PREFIX)
+export CPPFLAGS
 
 dnl #   output generation
 AC_CONFIG_HEADERS(config.h)
Index: ossp-pkg/pcre/ChangeLog.OSSP
RCS File: /v/ossp/cvs/ossp-pkg/pcre/ChangeLog.OSSP,v
rcsdiff -q -kk '-r1.20' '-r1.21' -u '/v/ossp/cvs/ossp-pkg/pcre/ChangeLog.OSSP,v' 2>/dev/null
--- ChangeLog.OSSP	2004/04/21 13:44:06	1.20
+++ ChangeLog.OSSP	2004/04/22 09:32:51	1.21
@@ -2,6 +2,8 @@
  OSSP ChangeLog for PCRE
  =======================
 
+  *) Import PREFIX logic from OSSP l2 cvs diff -r1.2 -r1.3 l2_ut_pcre.h
+
   *) Remove libpcreposix.la target from Makefile.in to disable
      provisioning of embedded POSIX regex library functions regcomp,
      regerror, regexec and regfree. OSSP petidomo was a victim as it
Index: ossp-pkg/pcre/Makefile.in
RCS File: /v/ossp/cvs/ossp-pkg/pcre/Makefile.in,v
rcsdiff -q -kk '-r1.9' '-r1.10' -u '/v/ossp/cvs/ossp-pkg/pcre/Makefile.in,v' 2>/dev/null
--- Makefile.in	2004/04/21 13:44:06	1.9
+++ Makefile.in	2004/04/22 09:32:51	1.10
@@ -9,7 +9,8 @@
 SHELL       = /bin/sh
 
 CC          = @CC@
-CFLAGS      = @CFLAGS@ -I.
+CPPFLAGS    = @CPPFLAGS@
+CFLAGS      = @DEFS@ @CFLAGS@ -I.
 LDFLAGS     = @LDFLAGS@ -L.
 SHTOOL      = ./shtool
 LIBTOOL     = ./libtool
@@ -28,9 +29,9 @@
 .SUFFIXES: .c .o .lo
 
 .c.o:
-	$(CC) -c $(CFLAGS) $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 .c.lo:
-	$(LIBTOOL) --quiet --mode=compile $(CC) -c $(CFLAGS) $<
+	$(LIBTOOL) --quiet --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 
 libpcre.la: pcre.lo pcre_get.lo pcre_maketables.lo pcre_study.lo pcre_match.lo
 	$(LIBTOOL) --quiet --mode=link $(CC) -o libpcre.la \
Index: ossp-pkg/pcre/pcre.h
RCS File: /v/ossp/cvs/ossp-pkg/pcre/pcre.h,v
rcsdiff -q -kk '-r1.9' '-r1.10' -u '/v/ossp/cvs/ossp-pkg/pcre/pcre.h,v' 2>/dev/null
--- pcre.h	2002/01/11 10:19:12	1.9
+++ pcre.h	2004/04/22 09:32:51	1.10
@@ -17,6 +17,31 @@
                      __PCRE_XSTRING(PCRE_MINOR) " " \
                      __PCRE_XSTRING(PCRE_DATE);
 
+#ifdef PCRE_PREFIX
+#if defined(__STDC__) || defined(__cplusplus)
+#define __PCRE_CONCAT(x,y) x ## y
+#define PCRE_CONCAT(x,y) __PCRE_CONCAT(x,y)
+#else
+#define __PCRE_CONCAT(x) x
+#define PCRE_CONCAT(x,y) __PCRE_CONCAT(x)y
+#endif
+#define pcre_malloc PCRE_CONCAT(PCRE_PREFIX,pcre_malloc)
+#define pcre_free PCRE_CONCAT(PCRE_PREFIX,pcre_free)
+#define pcre_compile PCRE_CONCAT(PCRE_PREFIX,pcre_compile)
+#define pcre_copy_substring PCRE_CONCAT(PCRE_PREFIX,pcre_copy_substring)
+#define pcre_exec PCRE_CONCAT(PCRE_PREFIX,pcre_exec)
+#define pcre_free_substring PCRE_CONCAT(PCRE_PREFIX,pcre_free_substring)
+#define pcre_free_substring_list PCRE_CONCAT(PCRE_PREFIX,pcre_free_substring_list)
+#define pcre_get_substring PCRE_CONCAT(PCRE_PREFIX,pcre_get_substring)
+#define pcre_get_substring_list PCRE_CONCAT(PCRE_PREFIX,pcre_get_substring_list)
+#define pcre_info PCRE_CONCAT(PCRE_PREFIX,pcre_info)
+#define pcre_fullinfo PCRE_CONCAT(PCRE_PREFIX,pcre_fullinfo)
+#define pcre_maketables PCRE_CONCAT(PCRE_PREFIX,pcre_maketables)
+#define pcre_study PCRE_CONCAT(PCRE_PREFIX,pcre_study)
+#define pcre_version PCRE_CONCAT(PCRE_PREFIX,pcre_version)
+#define pcre_match PCRE_CONCAT(PCRE_PREFIX,pcre_match)
+#endif
+
 /* Win32 uses DLL by default */
 
 #ifdef _WIN32