httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ras...@vex.net
Subject regex problems
Date Sat, 07 Dec 1996 07:13:00 GMT
I am having some problems with the way libregex is handled in 1.2.
The HAVE_POSIX_REGEX check in mod_include.c is pointless.  Nothing ever
sets this value.  And, the name of it is useless as well.  Both the HS
regex library and any system ones we find is likely to be Posix compliant.
What we are really asking here is whether or not we should include the
bundled regex.h file or the system file.  We are always including "regex.h"
as opposed to <regex.h> since HAVE_POSIX_REGEX is never defined.  Because
most compilers will happily include "regex.h" from a system library path,
few people will notice this problem.  This should fix it:

*** Configure.old       Wed Nov 20 01:04:29 1996
--- Configure   Sat Dec  7 01:53:21 1996
***************
*** 368,371 ****
--- 368,372 ----
      REGLIB="regex/libregex.a"
      INCLUDES="$INCLUDES -Iregex"
+     DEFINES="-DHSREGEX=1"
  fi
  
***************
*** 408,411 ****
--- 409,413 ----
  fi
  echo "CFLAGS1=$CFLAGS">> Makefile
+ echo "DEFINES=$DEFINES">> Makefile
  echo "INCLUDES1=$INCLUDES">> Makefile
  echo "LIBS1=$LIBS">> Makefile

*** Makefile.tmpl.old   Wed Nov 20 14:55:06 1996
--- Makefile.tmpl       Sat Dec  7 02:00:31 1996
***************
*** 26,30 ****
  
  httpd: $(REGLIB) $(OBJS)
!       $(CC) $(LFLAGS)  -o httpd $(OBJS) $(REGLIB) $(LIBS)
  
  regex/libregex.a:
--- 26,30 ----
  
  httpd: $(REGLIB) $(OBJS)
!       $(CC) $(LFLAGS) $(DEFINES) -o httpd $(OBJS) $(REGLIB) $(LIBS)
  
  regex/libregex.a:

*** mod_include.c.old   Sun Dec  1 15:29:05 1996
--- mod_include.c       Sat Dec  7 01:55:11 1996
***************
*** 67,71 ****
  #include "http_main.h"
  #include "util_script.h"
! #ifdef HAVE_POSIX_REGEX
  #include <regex.h>
  #else
--- 67,71 ----
  #include "http_main.h"
  #include "util_script.h"
! #ifndef HSREGEX
  #include <regex.h>
  #else


-Rasmus

Mime
View raw message