fixed NetWare makefiles for newer pcre.

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

4 files changed, 35 insertions, 8 deletions

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 523f85a0b9..9f59a9d9b7 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -80,6 +80,7 @@ XINCDIRS	+= \
 # These flags will come after CFLAGS
 #
 XCFLAGS		+= \
+			-DHAVE_CONFIG_H \
 			$(EOLIST)
 
 #
@@ -216,6 +217,7 @@ TARGET_nlm = \
 # If there is an LIB target, put it here
 #
 TARGET_lib = \
+	$(OBJDIR)/pcre.lib \
 	$(EOLIST)
 
 #
@@ -258,7 +260,6 @@ FILES_nlm_objs = \
 	$(OBJDIR)/modules.o \
 	$(OBJDIR)/mpm_common.o \
 	$(OBJDIR)/mpm_netware.o \
-	$(OBJDIR)/pcre.o \
 	$(OBJDIR)/protocol.o \
 	$(OBJDIR)/provider.o \
 	$(OBJDIR)/request.o \
@@ -291,6 +292,7 @@ endif
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
+	$(PCRELIB) \
 	libcpre.o \
 	$(EOLIST)
 
@@ -345,9 +347,29 @@ FILES_nlm_exports = \
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
+ifeq "$(wildcard $(PCRE)/pcre.c)" "$(PCRE)/pcre.c"
+
 FILES_lib_objs = \
+	$(OBJDIR)/pcre.o \
 	$(EOLIST)
 
+else
+
+FILES_lib_objs = \
+	$(OBJDIR)/pcre_compile.o \
+	$(OBJDIR)/pcre_exec.o \
+	$(OBJDIR)/pcre_fullinfo.o \
+	$(OBJDIR)/pcre_globals.o \
+	$(OBJDIR)/pcre_info.o \
+	$(OBJDIR)/pcre_newline.o \
+	$(OBJDIR)/pcre_tables.o \
+	$(OBJDIR)/pcre_try_flipped.o \
+	$(OBJDIR)/pcre_version.o \
+	$(OBJDIR)/chartables.o \
+	$(EOLIST)
+
+endif
+
 #
 # implement targets and dependancies (leave this section alone)
 #
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 67d15a760a..6b192d0463 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -50,11 +50,11 @@ $(error LDAPSDK does not point to a valid Novell CLDAP SDK)
 endif
 
 ifndef PCRESRC
-ifeq "$(wildcard $(AP_WORK)/srclib/pcre/pcre.in)" "$(AP_WORK)/srclib/pcre/pcre.in"
+ifeq "$(wildcard $(AP_WORK)/srclib/pcre/pcre-config.in)" "$(AP_WORK)/srclib/pcre/pcre-config.in"
 PCRESRC = $(AP_WORK)/srclib/pcre
 endif
 endif
-ifneq "$(wildcard $(PCRESRC)/pcre.in)" "$(PCRESRC)/pcre.in"
+ifneq "$(wildcard $(PCRESRC)/pcre-config.in)" "$(PCRESRC)/pcre-config.in"
 $(error PCRESRC does not point to a valid PCRE source tree) 
 endif
 
@@ -344,7 +344,7 @@ APRLIB		= $(APR)/$(OBJDIR)/aprlib.lib
 APRUTLIB	= $(APRUTIL)/$(OBJDIR)/aprutil.lib
 APULDAPLIB	= $(APULDAP)/$(OBJDIR)/apuldap.lib
 STMODLIB	= $(STDMOD)/$(OBJDIR)/stdmod.lib
-PCRELIB		= $(PCRE)/$(OBJDIR)/pcre.lib
+PCRELIB		= $(SRC)/$(OBJDIR)/pcre.lib
 NWOSLIB		= $(NWOS)/$(OBJDIR)/netware.lib
 SERVLIB		= $(SERVER)/$(OBJDIR)/server.lib
 HTTPDLIB	= $(HTTPD)/$(OBJDIR)/httpd.lib
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 2054beb12f..8256b9a86f 100644
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-	$(APR_WORK)\build \
+	$(APR_WORK)/build \
 	$(EOLIST) 
 
 #
@@ -11,7 +11,7 @@ SUBDIRS = \
 # paths to tools
 #
 
-include $(AP_WORK)\build\NWGNUhead.inc
+include $(AP_WORK)/build/NWGNUhead.inc
 
 #
 # build this level's files
@@ -50,6 +50,10 @@ cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WORK)\build\NW
 	@echo -I$(APRUTIL)\include >> $@
 	@echo -ir $(NOVELLLIBC) >> $@
 
+$(PCRE)/%.h: $(subst /,\,$(PCRE))\%.h.generic
+	@echo Creating $(subst /,\,$@)
+	copy $< $(subst /,\,$(PCRE))\$(@F)
+
 $(PCRE)/%.h: $(subst /,\,$(PCRE))\%.hw
 	@echo Creating $(subst /,\,$@)
 	copy $< $(subst /,\,$(PCRE))\$(@F)
@@ -62,7 +66,7 @@ $(NWOS)/chartables.c: dftables.exe $(PCRE)/dftables.c $(FILES_prebuild_headers)
 
 %.exe: $(PCRE)/%.c
 	@echo Creating Build Helper $@
-	@$(WIN_CC) $(WIN_CFLAGS) $< -o $@
+	@$(WIN_CC) $(WIN_CFLAGS) -DHAVE_CONFIG_H $< -o $@
 
 $(NWOS)/test_char.h: gen_test_char.exe $(AP_WORK)/server/gen_test_char.c
 	@echo Creating $(subst /,\,$@)
@@ -116,5 +120,5 @@ endif
 # in this makefile
 #
 
-include $(AP_WORK)\build\NWGNUtail.inc
+include $(AP_WORK)/build/NWGNUtail.inc
     
diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index 8f8943f841..8f1bdde4ee 100644
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -237,6 +237,7 @@ ifneq "$(LDAPSDK)" ""
 endif
 	@echo -l $(APULDAP)/$(OBJDIR) >> $@
 	@echo -l $(XML)/$(OBJDIR) >> $@
+	@echo -l $(SRC)/$(OBJDIR) >> $@
 	@echo -nodefaults >> $@
 	@echo -map $(OBJDIR)\$(NLM_NAME).map>> $@
 ifneq "$(strip $(XLFLAGS))" ""