Commit 12e2108e authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Make 2.2.x build working with external (and newer) PCRE. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1087707 13f79535-47bb-0310-9956-ffa450edef68
parent c2743b63

NWGNUmakefile

+3 −1
Original line number Diff line number Diff line
@@ -357,6 +357,8 @@ FILES_lib_objs = \ 
	$(OBJDIR)/chartables.o \

	$(EOLIST)



XDEFINES += -DHAVE_CONFIG_H



endif



#
@@ -440,7 +442,7 @@ prebuild :: FORCE 


vpath %.c server:modules/arch/netware:modules/http:modules/aaa:modules/mappers

vpath %.c modules/generators:modules/metadata:modules/filters:modules/loggers

vpath %.c os/netware:server/mpm/netware:srclib/pcre

vpath %.c os/netware:server/mpm/netware:$(PCRE)



#

# Include the 'tail' makefile that has targets that depend on variables defined

build/NWGNUenvironment.inc

+2 −2
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ ifneq "$(wildcard $(LDAPSDK)/inc/ldap.h)" "$(LDAPSDK)/inc/ldap.h" 
$(error LDAPSDK does not point to a valid Novell CLDAP SDK) 

endif



#ifndef PCRESRC

ifndef PCRESRC

PCRESRC = $(AP_WORK)/srclib/pcre

#endif

endif

ifneq "$(wildcard $(PCRESRC)/pcre-config.in)" "$(PCRESRC)/pcre-config.in"

$(error PCRESRC does not point to a valid PCRE source tree) 

endif