You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2012/03/15 23:53:27 UTC
svn commit: r1301258 - in /httpd/httpd: branches/2.2.x/NWGNUmakefile
branches/2.4.x/NWGNUmakefile trunk/NWGNUmakefile
Author: fuankg
Date: Thu Mar 15 22:53:27 2012
New Revision: 1301258
URL: http://svn.apache.org/viewvc?rev=1301258&view=rev
Log:
Fixed Netware builds for PCRE 8.30.
Modified:
httpd/httpd/branches/2.2.x/NWGNUmakefile
httpd/httpd/branches/2.4.x/NWGNUmakefile
httpd/httpd/trunk/NWGNUmakefile
Modified: httpd/httpd/branches/2.2.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/NWGNUmakefile?rev=1301258&r1=1301257&r2=1301258&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/NWGNUmakefile Thu Mar 15 22:53:27 2012
@@ -345,17 +345,20 @@ FILES_lib_objs = \
else
FILES_lib_objs = \
+ $(OBJDIR)/chartables.o \
$(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)
+ifeq "$(wildcard $(PCRE)/pcre_try_flipped.c)" "$(PCRE)/pcre_try_flipped.c"
+FILES_lib_objs += \
+ $(OBJDIR)/pcre_try_flipped.o \
+ $(EOLIST)
+endif
XDEFINES += -DHAVE_CONFIG_H
Modified: httpd/httpd/branches/2.4.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/NWGNUmakefile?rev=1301258&r1=1301257&r2=1301258&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.4.x/NWGNUmakefile Thu Mar 15 22:53:27 2012
@@ -360,17 +360,20 @@ FILES_lib_objs = \
else
FILES_lib_objs = \
+ $(OBJDIR)/chartables.o \
$(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)
+ifeq "$(wildcard $(PCRE)/pcre_try_flipped.c)" "$(PCRE)/pcre_try_flipped.c"
+FILES_lib_objs += \
+ $(OBJDIR)/pcre_try_flipped.o \
+ $(EOLIST)
+endif
endif
Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=1301258&r1=1301257&r2=1301258&view=diff
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Thu Mar 15 22:53:27 2012
@@ -371,17 +371,20 @@ FILES_lib_objs = \
else
FILES_lib_objs = \
+ $(OBJDIR)/chartables.o \
$(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)
+ifeq "$(wildcard $(PCRE)/pcre_try_flipped.c)" "$(PCRE)/pcre_try_flipped.c"
+FILES_lib_objs += \
+ $(OBJDIR)/pcre_try_flipped.o \
+ $(EOLIST)
+endif
endif