1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
|
use regex functions from glibc
--- a/AutoConf/makefile.in
+++ b/AutoConf/makefile.in
@@ -226,17 +226,12 @@
# GNU Regular Expression Library support.
# First of all the (sub)directory containing the
# necessary files (excluding trailing slash).
-#
-# This directory is contained in the BibTool distribution.
-# I have tried newer versions of this library without
-# positive results. (Try it if you don't believe me:-)
-#
-REGEX_DIR = regex-0.12
-#
+#
+# Debian package uses regex function from glibc:
-REGEX_DEF = -DREGEX -I$(REGEX_DIR) -I..
-
-REGEX = regex$(OBJ)
+REGEX_DIR =
+REGEX_DEF = -DREGEX
+REGEX=
# -------------------------------------------------------
# Kpathsea Library support.
--- a/configure.ac
+++ b/configure.ac
@@ -48,9 +48,9 @@
dnl ---------------------------------------------------------------------------
dnl for regexp
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
+dnl AC_AIX
+dnl AC_ISC_POSIX
+dnl AC_MINIX
dnl ---------------------------------------------------------------------------
dnl Checks for libraries.
@@ -141,7 +141,8 @@
dnl AC_CONFIG_SUBDIRS(BibTcl)
-AC_CONFIG_HEADER(include/bibtool/config.h:AutoConf/config.h.in regex-0.12/config.h:AutoConf/reconfig.h.in)
+AC_CONFIG_HEADER(include/bibtool/config.h:AutoConf/config.h.in)
+dnl AC_CONFIG_HEADER(regex-0.12/config.h:AutoConf/reconfig.h.in)
AC_OUTPUT(makefile:AutoConf/makefile.in)
dnl ---------------------------------------------------------------------------
|