nginx-0.0.2-2004-02-09-23:47:18 import

7 files changed, 108 insertions, 47 deletions

diff --git a/auto/configure b/auto/configure
index a145a9ee7..162a69746 100755
--- a/auto/configure
+++ b/auto/configure
@@ -3,7 +3,7 @@
 . auto/init
 . auto/sources
 
-test $OBJ || mkdir $OBJ
+test -d $OBJ || mkdir $OBJ
 echo > $NGX_AUTO_CONFIG_H
 
 if [ "$PLATFORM" != win32 ]; then
diff --git a/auto/lib/conf b/auto/lib/conf
index 0739a72d4..60a824f9e 100644
--- a/auto/lib/conf
+++ b/auto/lib/conf
@@ -1,19 +1,6 @@
 
-if [ $PCRE != NO ]; then
-
-    CORE_INCS="$CORE_INCS -I $PCRE"
-    CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
-    CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
-
-    if [ "$PLATFORM" = "win32" ]; then
-        CFLAGS="$CFLAGS -D PCRE_STATIC -D HAVE_PCRE=1"
-        CORE_LIBS="$CORE_LIBS pcre.lib"
-        CORE_LINK="$CORE_LINK -libpath:$PCRE"
-    else 
-        CFLAGS="$CFLAGS -D HAVE_PCRE=1"
-        CORE_DEPS="$CORE_DEPS $PCRE/.libs/libpcre.a"
-        CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre"
-    fi
+if [ $USE_PCRE = YES ]; then
+    . auto/lib/pcre/conf
 fi
 
 
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
new file mode 100644
index 000000000..1fc315359
--- /dev/null
+++ b/auto/lib/pcre/conf
@@ -0,0 +1,38 @@
+
+if [ $PCRE != NONE ]; then
+    CORE_INCS="$CORE_INCS -I $PCRE"
+    CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
+    CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
+
+    if [ "$PLATFORM" = "win32" ]; then
+        #CFLAGS="$CFLAGS -D PCRE_STATIC -D HAVE_PCRE=1"
+        have=HAVE_PCRE . auto/have
+        have=PCRE_STATIC . auto/have
+
+        CORE_LIBS="$CORE_LIBS pcre.lib"
+        CORE_LINK="$CORE_LINK -libpath:$PCRE"
+    else
+        #CFLAGS="$CFLAGS -D HAVE_PCRE=1"
+        have=HAVE_PCRE . auto/have
+        CORE_DEPS="$CORE_DEPS $PCRE/.libs/libpcre.a"
+        CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre"
+    fi
+
+else
+
+    ngx_lib_inc="#include <pcre.h>"
+
+    ngx_lib="PCRE"
+    ngx_lib_test="pcre *re; pcre_compile(re, 0, NULL, 0, NULL)"
+    ngx_libs=-lpcre
+    . auto/lib/test
+
+
+    if [ $ngx_found = yes ]; then
+        CORE_LIBS="$CORE_LIBS $ngx_libs"
+        PCRE=YES
+    else
+        PCRE=NO
+    fi
+
+fi
diff --git a/auto/modules b/auto/modules
index b254e3493..dc3d1d3ce 100644
--- a/auto/modules
+++ b/auto/modules
@@ -1,4 +1,43 @@
 
+if [ $EVENT_SELECT = NO -a $EVENT_FOUND = NO ]; then
+    EVENT_SELECT=YES
+fi
+
+if [ $EVENT_SELECT = YES ]; then
+    CORE_SRCS="$CORE_SRCS $SELECT_SRCS"
+    EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE"
+fi
+
+
+if [ $EVENT_POLL = NO -a $EVENT_FOUND = NO ]; then
+    EVENT_POLL=YES
+fi
+
+if [ $EVENT_POLL = YES ]; then
+    CORE_SRCS="$CORE_SRCS $POLL_SRCS"
+    EVENT_MODULES="$EVENT_MODULES $POLL_MODULE"
+fi
+
+
+if [ $TEST_BUILD_DEVPOLL = YES ]; then
+    CFLAGS="$CFLAGS -D HAVE_DEVPOLL=1 -D TEST_BUILD_DEVPOLL=1"
+    EVENT_MODULES="$EVENT_MODULES $DEVPOLL_MODULE"
+    CORE_SRCS="$CORE_SRCS $DEVPOLL_SRCS"
+fi
+
+if [ $TEST_BUILD_EPOLL = YES ]; then
+    CFLAGS="$CFLAGS -D HAVE_EPOLL=1 -D TEST_BUILD_EPOLL=1"
+    EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE"
+    CORE_SRCS="$CORE_SRCS $EPOLL_SRCS"
+fi
+
+if [ $TEST_BUILD_SIGIO = YES ]; then
+    CFLAGS="$CFLAGS -D HAVE_SIGIO=1 -D TEST_BUILD_SIGIO=1"
+    EVENT_MODULES="$EVENT_MODULES $SIGIO_MODULE"
+    CORE_SRCS="$CORE_SRCS $SIGIO_SRCS"
+fi
+
+
 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES \
                      $HTTP_CHUNKED_FILTER_MODULE \
                      $HTTP_RANGE_FILTER_MODULE \
diff --git a/auto/options b/auto/options
index 08d0468c9..76f0e367a 100644
--- a/auto/options
+++ b/auto/options
@@ -19,6 +19,7 @@ HTTP_GZIP=YES
 HTTP_SSI=YES
 HTTP_PROXY=YES
 
+USE_PCRE=NO
 PCRE=NO
 
 USE_MD5=NO
@@ -43,7 +44,9 @@ do
         --builddir=*)                    OBJS="$value"              ;;
 
         --with-select_module)            EVENT_SELECT=YES           ;;
+        --without-select_module)         EVENT_SELECT=NONE          ;;
         --with-poll_module)              EVENT_POLL=YES             ;;
+        --without-poll_module)           EVENT_POLL=NONE            ;;
         --with-aio_module)               EVENT_AIO=YES              ;;
 
         --without-http_rewrite_module)   HTTP_REWRITE=NO            ;;
@@ -53,6 +56,7 @@ do
 
         --with-cc=*)                     CC="$value"                ;;
 
+        --without-pcre)                  PCRE=NONE                  ;;
         --with-pcre=*)                   PCRE="$value"              ;;
         --with-md5=*)                    MD5="$value"               ;;
         --with-zlib=*)                   ZLIB="$value"              ;;
diff --git a/auto/os/conf b/auto/os/conf
index 99de323e1..837e6d304 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -41,34 +41,3 @@ case $PLATFORM in
     ;;
 
 esac
-
-
-if [ $EVENT_SELECT = YES -o $EVENT_FOUND = NO ]; then
-    CORE_SRCS="$CORE_SRCS $SELECT_SRCS"
-    EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE"
-fi
-
-
-if [ $EVENT_POLL = YES -o $EVENT_FOUND = NO ]; then
-    CORE_SRCS="$CORE_SRCS $POLL_SRCS"
-    EVENT_MODULES="$EVENT_MODULES $POLL_MODULE"
-fi
-
-
-if [ $TEST_BUILD_DEVPOLL = YES ]; then
-    CFLAGS="$CFLAGS -D HAVE_DEVPOLL=1 -D TEST_BUILD_DEVPOLL=1"
-    EVENT_MODULES="$EVENT_MODULES $DEVPOLL_MODULE"
-    CORE_SRCS="$CORE_SRCS $DEVPOLL_SRCS"
-fi
-
-if [ $TEST_BUILD_EPOLL = YES ]; then
-    CFLAGS="$CFLAGS -D HAVE_EPOLL=1 -D TEST_BUILD_EPOLL=1"
-    EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE"
-    CORE_SRCS="$CORE_SRCS $EPOLL_SRCS"
-fi
-
-if [ $TEST_BUILD_SIGIO = YES ]; then
-    CFLAGS="$CFLAGS -D HAVE_SIGIO=1 -D TEST_BUILD_SIGIO=1"
-    EVENT_MODULES="$EVENT_MODULES $SIGIO_MODULE"
-    CORE_SRCS="$CORE_SRCS $SIGIO_SRCS"
-fi
diff --git a/auto/summary b/auto/summary
index 6546067e6..75ae60903 100644
--- a/auto/summary
+++ b/auto/summary
@@ -24,3 +24,27 @@ case $ZLIB in
 esac
 
 echo
+
+
+if [ $HTTP_REWRITE = YES ]; then
+    if [ $PCRE = NONE -o $PCRE = NO ]; then
+        echo "$0: error: HTTP rewrite module requires PCRE library."
+        echo $ngx_n "You can disable the module by using" $ngx_c
+        echo "--without-http_rewrite_module option"
+        echo "or you have to enable PCRE support"
+        echo
+        exit 1
+    fi
+fi
+
+
+if [ $HTTP_GZIP = YES ]; then
+    if [ $ZLIB = NONE -o $ZLIB = NO ]; then
+        echo "$0: error: HTTP gzip module requires zlib library."
+        echo $ngx_n "You can disable the module by using" $ngx_c
+        echo "--without-http_gzip_module option"
+        echo "or you have to enable zlib support"
+        echo
+        exit 1
+    fi
+fi