nginx-0.0.3-2004-05-19-00:28:54 import

4 files changed, 64 insertions, 0 deletions

diff --git a/auto/configure b/auto/configure
index 9429373ca..c10ee6841 100755
--- a/auto/configure
+++ b/auto/configure
@@ -38,4 +38,11 @@ fi
 
 have=NGX_SMP . auto/have
 
+have=NGX_PREFIX value="\"$PREFIX/\"" . auto/define
+have=NGX_SBIN_PATH value="\"$SBIN_PATH\"" . auto/define
+have=NGX_CONF_PATH value="\"$CONF_PATH\"" . auto/define
+have=NGX_PID_PATH value="\"$PID_PATH\"" . auto/define
+have=NGX_ERROR_LOG_PATH value="\"$ERROR_LOG_PATH\"" . auto/define
+have=NGX_HTTP_LOG_PATH value="\"$HTTP_LOG_PATH\"" . auto/define
+
 . auto/summary
diff --git a/auto/define b/auto/define
new file mode 100644
index 000000000..d872fc3e1
--- /dev/null
+++ b/auto/define
@@ -0,0 +1,8 @@
+
+cat << END >> $NGX_AUTO_CONFIG_H
+
+#ifndef $have
+#define $have  $value
+#endif
+
+END
diff --git a/auto/options b/auto/options
index 178dfd275..8ef6dddbb 100644
--- a/auto/options
+++ b/auto/options
@@ -1,6 +1,13 @@
 
 help=no
 
+PREFIX=
+SBIN_PATH=
+CONF_PATH=
+HTTP_LOG_PATH=
+ERROR_LOG_PATH=
+PID_PATH=
+
 CC=gcc
 CPP=
 OBJS=objs
@@ -52,6 +59,13 @@ do
     case "$option" in
         --help)                          help=yes                   ;;
 
+        --prefix=*)                      PREFIX="$value"            ;;
+        --sbin-path=*)                   SBIN_PATH="$value"         ;;
+        --conf-path=*)                   CONF_PATH="$value"         ;;
+        --http-log-path=*)               HTTP_LOG_PATH="$value"     ;;
+        --error-log-path=*)              ERROR_LOG_PATH="$value"    ;;
+        --pid-path=*)                    PID_PATH="$value"          ;;
+
         --crossbuild=*)                  PLATFORM="$value"          ;;
 
         --builddir=*)                    OBJS="$value"              ;;
@@ -129,3 +143,28 @@ if [ ".$PLATFORM" = ".win32" -a $EVENT_POLL = YES ]; then
     EVENT_POLL=NO
     echo "$0: warning: --with-poll_module option is ignored for win32"
 fi
+
+
+if [ ".$PREFIX" = "." ]; then
+    PREFIX=/usr/local/nginx
+fi
+
+if [ ".$SBIN_PATH" = "." ]; then
+    SBIN_PATH=$PREFIX/sbin/nginx
+fi
+
+if [ ".$CONF_PATH" = "." ]; then
+    CONF_PATH=$PREFIX/conf/nginx.conf
+fi
+
+if [ ".$PID_PATH" = "." ]; then
+    PID_PATH=$PREFIX/logs/nginx.pid
+fi
+
+if [ ".$ERROR_LOG_PATH" = "." ]; then
+    ERROR_LOG_PATH=$PREFIX/logs/error.log
+fi
+
+if [ ".$HTTP_LOG_PATH" = "." ]; then
+    HTTP_LOG_PATH=$PREFIX/logs/access.log
+fi
diff --git a/auto/summary b/auto/summary
index 16e552da9..9769180b0 100644
--- a/auto/summary
+++ b/auto/summary
@@ -2,6 +2,7 @@
 echo
 echo "Configuration summary"
 
+
 if [ $USE_PCRE = DISABLED ]; then
     echo " + PCRE library is disabled"
 
@@ -55,3 +56,12 @@ if [ $HTTP_GZIP = YES ]; then
         exit 1
     fi
 fi
+
+
+echo " nginx path prefix: $PREFIX"
+echo " nginx binary file: $SBIN_PATH"
+echo " nginx configuration file: $CONF_PATH"
+echo " nginx pid file: $PID_PATH"
+echo " nginx error log file: $ERROR_LOG_PATH"
+echo " nginx http access log file: $HTTP_LOG_PATH"
+echo