httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rodent of Unusual Size <Ken.C...@Golux.Com>
Subject Re: [BUG] with include paths and regex.h
Date Tue, 03 Feb 1998 00:18:13 GMT
How about the attached patch?  I *think* it will retain what we
want to retain; did I miss anything?

The one part missing from the patch is renaming regex.h to
hsregex.h.  I'm so fried right now that I'm not sure of the
right way to do it without losing history or something.

#ken	P-)}

Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.180
diff -u -r1.180 Configure
--- Configure   1998/02/01 16:33:10     1.180
+++ Configure   1998/02/03 00:10:54
@@ -873,6 +873,7 @@
 if [ "$RULE_WANTHSREGEX" = "yes" ]; then
     REGLIB="regex/libregex.a"
     SUBDIRS="$SUBDIRS regex"
+    CFLAGS="$CFLAGS -DUSE_HSREGEX"
 fi
 
 # create modules.c
Index: include/conf.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
retrieving revision 1.177
diff -u -r1.177 conf.h
--- conf.h      1998/01/25 01:40:56     1.177
+++ conf.h      1998/02/03 00:10:57
@@ -868,7 +868,9 @@
 #endif
 
 #ifdef WIN32
-#include "../regex/regex.h"
+#include "../include/hsregex.h"
+#elif defined(USE_HSREGEX)
+#include "hsregex.h"
 #else
 #include <regex.h>
 #endif
Index: regex/Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/regex/Makefile.tmpl,v
retrieving revision 1.3
diff -u -r1.3 Makefile.tmpl
--- Makefile.tmpl       1998/02/01 16:33:12     1.3
+++ Makefile.tmpl       1998/02/03 00:11:01
@@ -46,7 +46,7 @@
        rm -f *.o
 
 # stuff to build regex.h
-REGEXH=../include/regex.h
+REGEXH=../include/hsregex.h
 REGEXHSRC=regex2.h $(REGSRC)
 $(REGEXH):     $(REGEXHSRC) mkh
        sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) > $(REGEXH)
@@ -105,7 +105,7 @@
 
 
 mf.tmp:        Makefile
-       sed '/^REGEXH=/s/=.*/=..\/include\\regex.h/' Makefile \
+       sed '/^REGEXH=/s/=.*/=..\/include\\hsregex.h/' Makefile \
        | sed '/#DEL$$/d' >$@
 
 DTRH=cclass.h cname.h regex2.h utils.h
@@ -132,4 +132,4 @@
 
 # don't do this one unless you know what you're doing
 spotless:      clean
-       rm -f mkh regex.h
+       rm -f mkh ../include/hsregex.h

Mime
View raw message