repack-pcre

Gbp-Pq: Name repack-pcre.patch

diff --git a/configure.in b/configure.in
index ad1ed84aa74a7e5e0088a0553b4d8a0aeeba71cc..29d55c50714b4b4b7c346b4834e6ef51d822ee4d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -485,6 +485,8 @@ AC_CHECK_LIB(inet, gethostbyname, [VLIBS="-linet $VLIBS"], [], -lnsl) # Sequent
 AC_CHECK_LIB(socket, socket, [VLIBS="-lsocket $VLIBS"], [], $VLIBS) # SVR4 sockets
 fi
 AC_CHECK_LIB(m, cos, [VLIBS="-lm $VLIBS"]) # complex math
+# Added by Debian maintainer, replaces shipped pcre
+AC_CHECK_LIB(pcre, pcre_compile)
 
 ##########################################################################
 ##                                                                     ##

diff --git a/libsrc/Wi/bif_regexp.c b/libsrc/Wi/bif_regexp.c
index f8ab5a1d73d3c5c9ea993e516895fe1ce035eb90..ca690bda03c20e1627ca961593d5510607caff79 100644 (file)
--- a/libsrc/Wi/bif_regexp.c
+++ b/libsrc/Wi/bif_regexp.c
@@ -28,7 +28,9 @@
 #include "multibyte.h"
 #include "srvmultibyte.h"
 
-#include "util/pcrelib/pcre.h"
+// Debian maintainer: replaced by external PCRE
+// #include "util/pcrelib/pcre.h"
+#include "pcre.h"
 
 /*
    typedef struct rx_query_s {

diff --git a/libsrc/Wi/xqf.c b/libsrc/Wi/xqf.c
index c484a67e27bcd9e299d7891780a8ce952461dcb5..eb98b0efaa04b71914350de2a59b4500c022dedd 100644 (file)
--- a/libsrc/Wi/xqf.c
+++ b/libsrc/Wi/xqf.c
@@ -38,7 +38,9 @@
 #include "xpf.h"
 #include "xqf.h"
 
-#include "util/pcrelib/pcre.h"
+// Debian maintainer: replaced by external PCRE
+// #include "util/pcrelib/pcre.h"
+#include "pcre.h"
 
 #define ecm_isname(c) \
   ( ((c) & ~0xFF) ? (ecm_utf8props[(c)] & ECM_ISNAME) : \

diff --git a/libsrc/util/Makefile.am b/libsrc/util/Makefile.am
index 9525c04c0756e2fae9cbf068991bb9d604c73d68..da53bd2c31cea24022935599deabead2a13313ee 100644 (file)
--- a/libsrc/util/Makefile.am
+++ b/libsrc/util/Makefile.am
@@ -85,24 +85,26 @@ libutil_la_SOURCES = \
        virt_mbsnrtowcs.c \
        virt_wcrtomb.c \
        virt_wcs_mask.c \
-       virt_wcsnrtombs.c \
-       pcrelib/pcre_chartables.c \
-       pcrelib/pcre_compile.c \
-       pcrelib/pcre_config.c \
-       pcrelib/pcre_dfa_exec.c \
-       pcrelib/pcre_exec.c \
-       pcrelib/pcre_fullinfo.c \
-       pcrelib/pcre_get.c \
-       pcrelib/pcre_globals.c \
-       pcrelib/pcre_newline.c \
-       pcrelib/pcre_ord2utf8.c \
-       pcrelib/pcre_study.c \
-       pcrelib/pcre_tables.c \
-       pcrelib/pcre_try_flipped.c \
-       pcrelib/pcre_ucd.c \
-       pcrelib/pcre_valid_utf8.c \
-       pcrelib/pcre_version.c \
-       pcrelib/pcre_xclass.c
+       virt_wcsnrtombs.c
+# From above:
+# Debian maintainer: Replaced by external PCRE
+#      pcrelib/pcre_chartables.c \
+#      pcrelib/pcre_compile.c \
+#      pcrelib/pcre_config.c \
+#      pcrelib/pcre_dfa_exec.c \
+#      pcrelib/pcre_exec.c \
+#      pcrelib/pcre_fullinfo.c \
+#      pcrelib/pcre_get.c \
+#      pcrelib/pcre_globals.c \
+#      pcrelib/pcre_newline.c \
+#      pcrelib/pcre_ord2utf8.c \
+#      pcrelib/pcre_study.c \
+#      pcrelib/pcre_tables.c \
+#      pcrelib/pcre_try_flipped.c \
+#      pcrelib/pcre_ucd.c \
+#      pcrelib/pcre_valid_utf8.c \
+#      pcrelib/pcre_version.c \
+#      pcrelib/pcre_xclass.c
 
 
 BUILT_SOURCES = getdate.c
@@ -121,14 +123,16 @@ EXTRA_DIST = \
        getdate.y \
        MSG_BG.bin \
        MSG_EN.bin \
-       pcrelib/AUTHORS \
-       pcrelib/LICENCE \
-       pcrelib/*.c \
-       pcrelib/*.h \
-       pcrelib/*.src \
        win32/ptrlong.h \
        win32/syslog.c \
        win32/syslog.h \
        winlog.mc \
        winlog.rc
+# From above:
+# Debian maintainer: Replaced by external PCRE
+#      pcrelib/AUTHORS \
+#      pcrelib/LICENCE \
+#      pcrelib/*.c \
+#      pcrelib/*.h \
+#      pcrelib/*.src