httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1087707 - in /httpd/httpd/branches/2.2.x: NWGNUmakefile build/NWGNUenvironment.inc
Date Fri, 01 Apr 2011 13:47:07 GMT
Author: fuankg
Date: Fri Apr  1 13:47:07 2011
New Revision: 1087707

URL: http://svn.apache.org/viewvc?rev=1087707&view=rev
Log:
Make 2.2.x build working with external (and newer) PCRE.

Modified:
    httpd/httpd/branches/2.2.x/NWGNUmakefile
    httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc

Modified: httpd/httpd/branches/2.2.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/NWGNUmakefile?rev=1087707&r1=1087706&r2=1087707&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/NWGNUmakefile Fri Apr  1 13:47:07 2011
@@ -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

Modified: httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc?rev=1087707&r1=1087706&r2=1087707&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc Fri Apr  1 13:47:07 2011
@@ -49,9 +49,9 @@ ifneq "$(wildcard $(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



Mime
View raw message