2.0: dupe regex.h decls w/o USE_HSREGEX *and* AP_USE_HSREGEX

[Jeff Trawick <tr...@ibm.net>]

If both USE_HSREGEX and AP_USE_HSREGEX are defined, I can build
2.0 on Linux with no problems.

Maybe the code in cvs is only partially changed to use
AP_USE_HSREGEX instead of USE_HSREGEX?  On the other hand,
maybe I'm being an idiot and have done something really
stupid.

This is on Linux with an "impatient" configure (simply "./configure
--prefix=something").

httpd.h has 

#ifdef AP_USE_HSREGEX
#include "hsregex.h"
#else
#include <regex.h>
#endif

ap_config.h has

#ifdef WIN32
#include "../include/hsregex.h"
#elif defined(USE_HSREGEX)
#include "hsregex.h"
#else
#include <regex.h>
#endif

If I change src/Configure to put -DAP_USE_HSREGEX -DUSE_HSREGEX in
CFLAGS instead of just -DUSE_HSREGEX, it builds cool.

####################################################################
## Now HS's POSIX regex implementation if needed/wanted. We do it
## now since AddModule may have changed it
##
if [ "x$RULE_WANTHSREGEX" = "xyes" ]; then
    REGLIB="regex/libregex.a"
    SUBDIRS="regex $SUBDIRS"
    CFLAGS="$CFLAGS -DAP_USE_HSREGEX -DUSE_HSREGEX"
fi

I'm seeing similar which-regex-? breakage on a Win32 build using
Makefile_win32_debug.txt.

ap_hooks.c
../include\httpd.h(955) : fatal error C1083: Cannot open include file:
'regex.h'
: No such file or directory
ap_sha1.c
../include\httpd.h(955) : fatal error C1083: Cannot open include file:
'regex.h'
: No such file or directory

I guess AP_USE_HSREGEX needs to be defined but isn't, but I haven't
looked into it enough.

Does anyone else see this?
-- 
Jeff Trawick | trawick@ibm.net | PGP public key at web site:
     http://www.geocities.com/SiliconValley/Park/9289/
          Born in Roswell... married an alien...

Re: 2.0: dupe regex.h decls w/o USE_HSREGEX *and* AP_USE_HSREGEX

[Martin Kraemer <Ma...@Mch.SNI.De>]

On Sat, Jan 29, 2000 at 09:43:44PM -0500, Jeff Trawick wrote:
> If both USE_HSREGEX and AP_USE_HSREGEX are defined, I can build
> 2.0 on Linux with no problems. [...]
> I guess AP_USE_HSREGEX needs to be defined but isn't, but I haven't
> looked into it enough.
> 
> Does anyone else see this?

Yes I do.
(When did anyone last compile apache-2.0 successfully? ;-)

I changed the AP_USE_HSREGEX to USE_HSREGEX (there was only a test,
and nobody set it), and it works now. Committed.

    Martin
-- 
  <Ma...@MchP.Siemens.De>      |       Fujitsu Siemens
       <ma...@apache.org>              |   81730  Munich,  Germany
((See you at ApacheCon 2000 in Orlanda, Florida, March 8-10, 2000!))
		   <URL:http://ApacheCon.Com/>