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