nginx-0.0.2-2004-03-14-23:46:25 import

4 files changed, 34 insertions, 11 deletions

diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 17df99f19..fe8213000 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -9,7 +9,8 @@ if [ $PCRE != NONE ]; then
         cl)
             have=HAVE_PCRE . auto/have
             have=PCRE_STATIC . auto/have
-            CORE_DEPS="$CORE_DEPS $PCRE/pcre.lib"
+            CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
+            LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib"
             CORE_LIBS="$CORE_LIBS pcre.lib"
             CORE_LINK="$CORE_LINK -libpath:$PCRE"
         ;;
@@ -17,10 +18,24 @@ if [ $PCRE != NONE ]; then
         wcl386)
             have=HAVE_PCRE . auto/have
             have=PCRE_STATIC . auto/have
-            CORE_DEPS="$CORE_DEPS $PCRE/pcre.lib"
+            CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
+            LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib"
             CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib"
         ;;
 
+        *icc)
+            have=HAVE_PCRE . auto/have
+            CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
+
+            LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
+
+            # to allow -ipo optimization we link with the *.o but not library
+            CORE_LIBS="$CORE_LIBS $PCRE/maketables.o"
+            CORE_LIBS="$CORE_LIBS $PCRE/get.o"
+            CORE_LIBS="$CORE_LIBS $PCRE/study.o"
+            CORE_LIBS="$CORE_LIBS $PCRE/pcre.o"
+        ;;
+
         *)
             have=HAVE_PCRE . auto/have
             CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index cfb4da778..a4f140224 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -19,7 +19,12 @@ case $PLATFORM in
         cp auto/lib/pcre/patch.config.in $PCRE
         cp auto/lib/pcre/$makefile $PCRE
 
-        echo "$PCRE/pcre.lib:"                                    >> $MAKEFILE
+        echo "$PCRE/pcre.h:"                                      >> $MAKEFILE
+        echo "	cd $PCRE"                                         >> $MAKEFILE
+        echo "	\$(MAKE) -f $makefile pcre.h"                     >> $MAKEFILE
+        echo "	cd ..\\..\\.."                                    >> $MAKEFILE
+        echo                                                      >> $MAKEFILE
+        echo "$PCRE/pcre.lib:	$PCRE/pcre.h"                     >> $MAKEFILE
         echo "	cd $PCRE"                                         >> $MAKEFILE
         echo "	\$(MAKE) -f $makefile CPU_OPT=$CPU_OPT LIBC=$LIBC">> $MAKEFILE
         echo "	cd ..\\..\\.."                                    >> $MAKEFILE
diff --git a/auto/lib/pcre/makefile.msvc b/auto/lib/pcre/makefile.msvc
index 55a9a94e3..31921240c 100644
--- a/auto/lib/pcre/makefile.msvc
+++ b/auto/lib/pcre/makefile.msvc
@@ -3,10 +3,7 @@ CFLAGS =	-O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
 PCREFLAGS =	-DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
 
 
-pcre.lib:
-	patch -o pcre.h pcre.in patch.pcre.in
-	patch -o config.h config.in patch.config.in
-
+pcre.lib:	pcre.h
 	cl -Fedftables dftables.c
 
 	dftables > chartables.c
@@ -16,3 +13,7 @@ pcre.lib:
 
 	link -lib -out:pcre.lib -verbose:lib				\
 		maketables.obj get.obj study.obj pcre.obj
+
+pcre.h:
+	patch -o pcre.h pcre.in patch.pcre.in
+	patch -o config.h config.in patch.config.in
diff --git a/auto/lib/pcre/makefile.owc b/auto/lib/pcre/makefile.owc
index 07ef5ac5c..41194f55f 100644
--- a/auto/lib/pcre/makefile.owc
+++ b/auto/lib/pcre/makefile.owc
@@ -3,12 +3,14 @@ CFLAGS =	-c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)
 PCREFLAGS =	-DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
 
 
-pcre.lib:
-	patch -o pcre.h pcre.in patch.pcre.in
-	patch -o config.h config.in patch.config.in
-
+pcre.lib:	pcre.h
 	wcl386 -zq -bt=nt -l=nt -fe=dftables dftables.c
 	dftables > chartables.c
 
 	wcl386 $(CFLAGS) $(PCREFLAGS) maketables.c get.c study.c pcre.c
 	wlib -n pcre.lib maketables.obj get.obj study.obj pcre.obj
+
+
+pcre.h:
+	patch -o pcre.h pcre.in patch.pcre.in
+	patch -o config.h config.in patch.config.in