nginx-0.0.2-2004-03-12-00:34:52 import

5 files changed, 17 insertions, 37 deletions

diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 6d4b53806..17df99f19 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -10,7 +10,6 @@ if [ $PCRE != NONE ]; then
             have=HAVE_PCRE . auto/have
             have=PCRE_STATIC . auto/have
             CORE_DEPS="$CORE_DEPS $PCRE/pcre.lib"
-            #CORE_DEPS="$PCRE/pcre.lib $CORE_DEPS"
             CORE_LIBS="$CORE_LIBS pcre.lib"
             CORE_LINK="$CORE_LINK -libpath:$PCRE"
         ;;
@@ -24,7 +23,8 @@ if [ $PCRE != NONE ]; then
 
         *)
             have=HAVE_PCRE . auto/have
-            CORE_DEPS="$CORE_DEPS $PCRE/.libs/libpcre.a"
+            CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
+            LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
             CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre"
         ;;
 
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index c903687fe..cfb4da778 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -15,36 +15,27 @@ esac
 case $PLATFORM in
 
     win32)
-        echo "$PCRE/pcre.lib:"                                    >> $MAKEFILE
-    ;;
-
-    *)
-        echo "$PCRE/.libs/libpcre.a:"                             >> $MAKEFILE
-    ;;
-
-esac
-
-
-case $PLATFORM in
-
-    win32)
         cp auto/lib/pcre/patch.pcre.in $PCRE
         cp auto/lib/pcre/patch.config.in $PCRE
         cp auto/lib/pcre/$makefile $PCRE
+
+        echo "$PCRE/pcre.lib:"                                    >> $MAKEFILE
         echo "	cd $PCRE"                                         >> $MAKEFILE
-        echo "	\$(MAKE) -f $makefile CPU_OPT=$CPU_OPT"           >> $MAKEFILE
+        echo "	\$(MAKE) -f $makefile CPU_OPT=$CPU_OPT LIBC=$LIBC">> $MAKEFILE
         echo "	cd ..\\..\\.."                                    >> $MAKEFILE
     ;;
 
     *)
-        # the patch allows to run the parallel make jobs
-        cp auto/lib/pcre/patch.Makefile.in $PCRE
+        PCRE_OPT="CFLAGS=\"$PCRE_OPT\""
 
+        echo "$PCRE/pcre.h:"                                      >> $MAKEFILE
         echo "	cd $PCRE \\"                                      >> $MAKEFILE
-        echo "	&& patch < patch.Makefile.in \\"                  >> $MAKEFILE
         echo "	&& CC=$CC $PCRE_OPT \\"                           >> $MAKEFILE
-        echo "	./configure --disable-shared \\"                  >> $MAKEFILE
-        echo "	&& \$(MAKE)"                                      >> $MAKEFILE
+        echo "	./configure --disable-shared"                     >> $MAKEFILE
+        echo                                                      >> $MAKEFILE
+        echo "$PCRE/.libs/libpcre.a:	$PCRE/pcre.h"             >> $MAKEFILE
+        echo "	cd $PCRE \\"                                      >> $MAKEFILE
+        echo "	&& \$(MAKE) libpcre.la"                           >> $MAKEFILE
     ;;
 
 esac
diff --git a/auto/lib/pcre/makefile.msvc b/auto/lib/pcre/makefile.msvc
index 778607c2b..55a9a94e3 100644
--- a/auto/lib/pcre/makefile.msvc
+++ b/auto/lib/pcre/makefile.msvc
@@ -1,11 +1,11 @@
 
-CFLAGS =	-O2 -Ob1 -Oi -Gs -MT $(CPU_OPT)
+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
-	patch -o config.h config.in patch.config
+	patch -o pcre.h pcre.in patch.pcre.in
+	patch -o config.h config.in patch.config.in
 
 	cl -Fedftables dftables.c
 
diff --git a/auto/lib/pcre/makefile.owc b/auto/lib/pcre/makefile.owc
index 706621547..07ef5ac5c 100644
--- a/auto/lib/pcre/makefile.owc
+++ b/auto/lib/pcre/makefile.owc
@@ -4,8 +4,8 @@ PCREFLAGS =	-DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
 
 
 pcre.lib:
-	patch -o pcre.h pcre.in patch.pcre
-	patch -o config.h config.in patch.config
+	patch -o pcre.h pcre.in patch.pcre.in
+	patch -o config.h config.in patch.config.in
 
 	wcl386 -zq -bt=nt -l=nt -fe=dftables dftables.c
 	dftables > chartables.c
diff --git a/auto/lib/pcre/patch.Makefile.in b/auto/lib/pcre/patch.Makefile.in
deleted file mode 100644
index 1b088ad0c..000000000
--- a/auto/lib/pcre/patch.Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in	Thu Mar 11 16:19:09 2004
-+++ Makefile.in	Thu Mar 11 16:21:16 2004
-@@ -96,7 +96,7 @@
- OBJ = maketables.@OBJEXT@ get.@OBJEXT@ study.@OBJEXT@ pcre.@OBJEXT@ @POSIX_OBJ@
- LOBJ = maketables.lo get.lo study.lo pcre.lo @POSIX_LOBJ@
- 
--all:            libpcre.la @POSIX_LIB@ pcretest@EXEEXT@ pcregrep@EXEEXT@ @ON_WINDOWS@ winshared
-+all:            libpcre.la
- 
- pcregrep@EXEEXT@: libpcre.la pcregrep.@OBJEXT@ @ON_WINDOWS@ winshared
- 		$(LINK) -o pcregrep@EXEEXT@ pcregrep.@OBJEXT@ libpcre.la