--- BibTool/rewrite.c.regex 2010-02-27 12:40:16.000000000 +0100
+++ BibTool/rewrite.c 2011-05-18 08:40:54.000000000 +0200
@@ -24,7 +24,8 @@
#include <bibtool/rewrite.h>
#ifdef REGEX
-#include <bibtool/regex.h>
+#define __USE_GNU
+#include <regex.h>
#endif
typedef struct rULE
--- BibTool/AutoConf/makefile.in.regex 2015-02-09 20:29:03.000000000 +0100
+++ BibTool/AutoConf/makefile.in 2015-02-28 12:28:26.622331580 +0100
@@ -218,9 +218,9 @@
REGEX_DIR = regex-0.12
#
-REGEX_DEF = -DREGEX -I$(REGEX_DIR) -I..
+REGEX_DEF = -DREGEX
-REGEX = regex$(OBJ)
+REGEX =
# -------------------------------------------------------
# Kpathsea Library support.
@@ -343,7 +343,6 @@
${HPATH}parse.h \
${HPATH}print.h \
${HPATH}pxfile.h \
- ${HPATH}regex.h \
${HPATH}record.h \
${HPATH}resource.h \
${HPATH}rewrite.h \
@@ -477,8 +476,8 @@
# __________________________________________________________________
# Targets from the GNU Regular Expression Library.
-regex$(OBJ): $(REGEX_DIR)$(DIR_SEP)regex.c $(MAKEFILE)
- $(CC) $(C_FLAGS) -I$(REGEX_DIR) -I.. $(NON_ANSI_DEFS) $(REGEX_DIR)$(DIR_SEP)regex.c $(DONT_LINK) -o $@
+#regex$(OBJ): $(REGEX_DIR)$(DIR_SEP)regex.c $(MAKEFILE)
+# $(CC) $(C_FLAGS) -I$(REGEX_DIR) -I.. $(NON_ANSI_DEFS) $(REGEX_DIR)$(DIR_SEP)regex.c $(DONT_LINK) -o $@
bibtcl:
@@ -512,7 +511,7 @@
(cd test; $(MAKE))
libbib.a: $(OLIBFILES)
- $(AR) $@ $(OLIBFILES) regex.o
+ $(AR) $@ $(OLIBFILES)
$(RANLIB) $@
depend: