Commit 6860c770 authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

Allow for external PCRE on netware 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722122 13f79535-47bb-0310-9956-ffa450edef68
parent bb6b3fa8

NWGNUmakefile

+4 −4
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ XINCDIRS += \ 
			$(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 @@ installdev :: FORCE 


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 @@ 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:$(PCRESDK)



#

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

build/NWGNUenvironment.inc

+9 −1
Original line number Diff line number Diff line
@@ -49,6 +49,11 @@ endif 
# 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 @@ endif 
ifneq "$(ZLIBSDK)" ""

INCDIRS := $(INCDIRS);$(ZLIBSDK)

endif

ifneq "$(PCRESDK)" ""

INCDIRS := $(INCDIRS);$(PCRESDK)

endif



DEFINES	= -DNETWARE 

ifndef USE_STDSOCKETS
@@ -309,7 +317,7 @@ APR = $(APR_WORK) 
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

docs/manual/platform/netware.xml

+5 −0
Original line number Diff line number Diff line
@@ -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>