httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject svn commit: r722122 - in /httpd/httpd/trunk: NWGNUmakefile build/NWGNUenvironment.inc docs/manual/platform/netware.xml
Date Mon, 01 Dec 2008 16:42:57 GMT
Author: bnicholes
Date: Mon Dec  1 08:42:56 2008
New Revision: 722122

URL: http://svn.apache.org/viewvc?rev=722122&view=rev
Log:
Allow for external PCRE on netware

Modified:
    httpd/httpd/trunk/NWGNUmakefile
    httpd/httpd/trunk/build/NWGNUenvironment.inc
    httpd/httpd/trunk/docs/manual/platform/netware.xml

Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=722122&r1=722121&r2=722122&view=diff
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Mon Dec  1 08:42:56 2008
@@ -40,7 +40,7 @@
 			$(AP_WORK)/modules/proxy/ \
 			$(AP_WORK)/os/NetWare \
 			$(AP_WORK)/server/mpm/NetWare \
-			$(AP_WORK)/srclib/pcre \
+			$(PCRESDK) \
 			$(NWOS) \
 			$(AP_WORK)/modules/ssl \
 			$(EOLIST)
@@ -373,10 +373,10 @@
 
 prebuild :: FORCE
 	$(MAKE) -C server -f NWGNUMakefile
-	$(MAKE) -C srclib/pcre -f NWGNUMakefile
+	$(MAKE) -C $(PCRESDK) -f NWGNUMakefile
 	$(CHKNOT) $(PREBUILD_INST)\nul          mkdir $(PREBUILD_INST)
 	-copy $(AP_WORK)\server\$(OBJDIR)\*.nlm $(PREBUILD_INST)\*.*
-	-copy $(AP_WORK)\srclib\pcre\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
+	-copy $(PCRESDK)\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
 
 #
 # Any specialized rules here
@@ -384,7 +384,7 @@
 
 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:$(PCRESDK)
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined

Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUenvironment.inc?rev=722122&r1=722121&r2=722122&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/trunk/build/NWGNUenvironment.inc Mon Dec  1 08:42:56 2008
@@ -49,6 +49,11 @@
 # ZLIBSDK = C:/novell/ndk/zlibsdk
 # endif
 
+# This is a placeholder
+# ifndef PCRESDK
+# PCRESDK = C:/novell/ndk/pcresdk
+# endif
+
 ifndef METROWERKS
 METROWERKS = C:\Program Files\Metrowerks\CodeWarrior
 endif
@@ -137,6 +142,9 @@
 ifneq "$(ZLIBSDK)" ""
 INCDIRS := $(INCDIRS);$(ZLIBSDK)
 endif
+ifneq "$(PCRESDK)" ""
+INCDIRS := $(INCDIRS);$(PCRESDK)
+endif
 
 DEFINES	= -DNETWARE 
 ifndef USE_STDSOCKETS
@@ -309,7 +317,7 @@
 APRUTIL		= $(APU_WORK)
 APULDAP		= $(APU_WORK)/ldap
 SUPMOD		= $(AP_WORK)/support
-PCRE		= $(AP_WORK)/srclib/pcre
+PCRE		= $(PCRESDK)
 APRTEST		= $(APR_WORK)/test
 HTTPD		= $(AP_WORK)/modules/http
 XML		= $(APU_WORK)/xml

Modified: httpd/httpd/trunk/docs/manual/platform/netware.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/platform/netware.xml?rev=722122&r1=722121&r2=722122&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/platform/netware.xml (original)
+++ httpd/httpd/trunk/docs/manual/platform/netware.xml Mon Dec  1 08:42:56 2008
@@ -498,6 +498,11 @@
         <example>Set ZLIBSDK=D:\NOVELL\zlib</example>
         </li>
         
+        <li>Set the environment variable <code>PCRESDK</code> to the location
+        where you installed the source code for the PCRE Library, for example:
+        <example>Set PCRESDK=D:\NOVELL\pcre</example>
+        </li>
+
         <li>Set the environment variable <code>AP_WORK</code> to the full
path of
         the <code>httpd</code> source code directory.
         <example>Set AP_WORK=D:\httpd-2.0.x</example>



Mime
View raw message