diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2003-11-25 20:44:56 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2003-11-25 20:44:56 +0000 |
| commit | a8fa0a6a37b6e90324e0dcbf4733324199623841 (patch) | |
| tree | 1a7edec9aa04946afc22299bf587823488fb492f /auto/lib | |
| parent | d9d0ca12688034d481e2f1f5cf13a098338ec31d (diff) | |
| download | nginx-a8fa0a6a37b6e90324e0dcbf4733324199623841.tar.gz nginx-a8fa0a6a37b6e90324e0dcbf4733324199623841.tar.bz2 | |
nginx-0.0.1-2003-11-25-23:44:56 import
Diffstat (limited to 'auto/lib')
| -rw-r--r-- | auto/lib/lib | 48 | ||||
| -rw-r--r-- | auto/lib/make | 26 | ||||
| -rw-r--r-- | auto/lib/md5/makefile.msvc | 4 | ||||
| -rw-r--r-- | auto/lib/pcre/makefile.msvc | 18 | ||||
| -rw-r--r-- | auto/lib/zlib/patch.zlib | 19 |
5 files changed, 115 insertions, 0 deletions
diff --git a/auto/lib/lib b/auto/lib/lib new file mode 100644 index 000000000..848567974 --- /dev/null +++ b/auto/lib/lib @@ -0,0 +1,48 @@ + +if [ $PCRE != NO ]; then + + CORE_INCS="$CORE_INCS -I $PCRE" + + if [ "$PLATFORM" = "win32" ]; then + CFLAGS="$CFLAGS -D PCRE_STATIC" + CORE_LIBS="$CORE_LIBS pcre.lib" + CORE_LINK="$CORE_LINK -libpath:$PCRE" + else + CORE_DEPS="$CORE_DEPS $PCRE/.libs/libpcre.a" + CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre" + fi +fi + + +if [ $MD5 != NO ]; then + + CFLAGS="$CFLAGS -D HAVE_OPENSSL_MD5" + CORE_INCS="$CORE_INCS -I $MD5" + + if [ "$PLATFORM" = "win32" ]; then + CORE_LIBS="$CORE_LIBS md5.lib" + CORE_LINK="$CORE_LINK -libpath:$MD5" + else + LINK_DEPS="$LINK_DEPS $MD5/libmd5.a" + CORE_LIBS="$CORE_LIBS -L $MD5 -lmd5" + fi + +elif [ $MD5_LIB != NO ]; then + CORE_LIBS="$CORE_LIBS $MD5_LIB" +fi + + +if [ $ZLIB != NO ]; then + CORE_INCS="$CORE_INCS -I $ZLIB" + + if [ "$PLATFORM" = "win32" ]; then + CORE_LIBS="$CORE_LIBS zlib.lib" + CORE_LINK="$CORE_LINK -libpath:$ZLIB" + else + LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" + CORE_LIBS="$CORE_LIBS -L $ZLIB -lz" + fi + +elif [ $ZLIB_LIB != NO ]; then + CORE_LIBS="$CORE_LIBS $ZLIB_LIB" +fi diff --git a/auto/lib/make b/auto/lib/make new file mode 100644 index 000000000..6055e3fd1 --- /dev/null +++ b/auto/lib/make @@ -0,0 +1,26 @@ + +if [ "$PLATFORM" != "win32" ]; then + + if [ $PCRE != NO ]; then + echo "$PCRE/.libs/libpcre.a:" >> $MAKEFILE + echo " cd $PCRE \\" >> $MAKEFILE + echo " && ./configure --disable-shared \\" >> $MAKEFILE + echo " && \$(MAKE)" >> $MAKEFILE + echo >> $MAKEFILE + fi + + + if [ $MD5 != NO ]; then + echo "$MD5/libmd5.a:" >> $MAKEFILE + echo " cd $MD5 && \$(MAKE) x86-elf" >> $MAKEFILE + echo >> $MAKEFILE + fi + + + if [ $ZLIB != NO ]; then + echo "$ZLIB/libz.a:" >> $MAKEFILE + echo " cd $ZLIB && ./configure && \$(MAKE)" >> $MAKEFILE + echo >> $MAKEFILE + fi + +fi diff --git a/auto/lib/md5/makefile.msvc b/auto/lib/md5/makefile.msvc new file mode 100644 index 000000000..f44831c56 --- /dev/null +++ b/auto/lib/md5/makefile.msvc @@ -0,0 +1,4 @@ + +all: + cl -nologo -c -MT -O2 -D MD5_ASM -D L_ENDIAN md5_dgst.c md5_one.c + link -lib -out:md5.lib md5_dgst.obj md5_one.obj asm/m-win32.obj diff --git a/auto/lib/pcre/makefile.msvc b/auto/lib/pcre/makefile.msvc new file mode 100644 index 000000000..e5c2aec29 --- /dev/null +++ b/auto/lib/pcre/makefile.msvc @@ -0,0 +1,18 @@ + +CC = cl +CFLAGS = -O2 -Ob1 -Oi -Gs -MT +LINK = link + +PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 + + +all: + $(CC) -Fedftables dftables.c + + dftables > chartables.c + + $(CC) -nologo -c $(CFLAGS) $(PCREFLAGS) \ + maketables.c get.c study.c pcre.c + + $(LINK) -lib -out:pcre.lib -verbose:lib \ + maketables.obj get.obj study.obj pcre.obj diff --git a/auto/lib/zlib/patch.zlib b/auto/lib/zlib/patch.zlib new file mode 100644 index 000000000..c74101162 --- /dev/null +++ b/auto/lib/zlib/patch.zlib @@ -0,0 +1,19 @@ +--- msdos/Makefile.w32 Sat Nov 15 13:01:29 2003 ++++ msdos/Makefile.w32 Sat Nov 15 13:02:06 2003 +@@ -10,7 +10,7 @@ + + # ------------- Microsoft Visual C++ 4.0 and later ------------- + MODEL= +-CFLAGS=-Ox -GA3s -nologo -W3 ++CFLAGS=-nologo -O2 -Ob1 -Oi -Gs -MT + CC=cl + LD=link + LDFLAGS= +@@ -79,7 +79,6 @@ + $(CC) -c $(CFLAGS) $*.c + + zlib.lib: $(OBJ1) $(OBJ2) +- if exist zlib.lib del zlib.lib + lib /OUT:zlib.lib $(OBJ1) $(OBJ2) + + example.exe: example.obj zlib.lib |
