summaryrefslogtreecommitdiffhomepage
path: root/auto
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2004-03-30 06:27:36 +0000
committerIgor Sysoev <igor@sysoev.ru>2004-03-30 06:27:36 +0000
commit6881bfb99063e3d42abaa313641b311c6fc3522d (patch)
tree1df669d89a2f58b450947901b1f41eb407dbf540 /auto
parent11dbe97ca401221313dc233aa2d6f67dfcaef1a7 (diff)
downloadnginx-6881bfb99063e3d42abaa313641b311c6fc3522d.tar.gz
nginx-6881bfb99063e3d42abaa313641b311c6fc3522d.tar.bz2
nginx-0.0.3-2004-03-30-10:27:36 import
Diffstat (limited to 'auto')
-rw-r--r--auto/cc4
-rw-r--r--auto/modules6
-rw-r--r--auto/nohave8
-rw-r--r--auto/os/freebsd7
-rw-r--r--auto/os/linux9
5 files changed, 24 insertions, 10 deletions
diff --git a/auto/cc b/auto/cc
index 67f364d4e..16684b0c8 100644
--- a/auto/cc
+++ b/auto/cc
@@ -62,8 +62,8 @@ case $CC in
# debug
CFLAGS="$CFLAGS -g"
- # DragonFly's gcc3 generate DWARF
- CFLAGS="$CFLAGS -g -gstabs"
+ # DragonFly's gcc3 generates DWARF
+ #CFLAGS="$CFLAGS -g -gstabs"
have=HAVE_GCC_VARIADIC_MACROS . auto/have
diff --git a/auto/modules b/auto/modules
index e2c909280..8fcaf8a22 100644
--- a/auto/modules
+++ b/auto/modules
@@ -1,10 +1,4 @@
-if [ $EVENT_RTSIG = YES ]; then
- have=HAVE_RTSIG . auto/have
- EVENT_MODULES="$EVENT_MODULES $RTSIG_MODULE"
- CORE_SRCS="$CORE_SRCS $RTSIG_SRCS"
-fi
-
if [ $EVENT_SELECT = NO -a $EVENT_FOUND = NO ]; then
EVENT_SELECT=YES
fi
diff --git a/auto/nohave b/auto/nohave
new file mode 100644
index 000000000..49bb7ceb8
--- /dev/null
+++ b/auto/nohave
@@ -0,0 +1,8 @@
+
+cat << END >> $NGX_AUTO_CONFIG_H
+
+#ifndef $have
+#define $have 0
+#endif
+
+END
diff --git a/auto/os/freebsd b/auto/os/freebsd
index 82e442c56..5fa8e33e3 100644
--- a/auto/os/freebsd
+++ b/auto/os/freebsd
@@ -42,8 +42,8 @@ then
have=HAVE_KQUEUE . auto/have
have=HAVE_CLEAR_EVENT . auto/have
- CORE_SRCS="$CORE_SRCS $KQUEUE_SRCS"
EVENT_MODULES="$EVENT_MODULES $KQUEUE_MODULE"
+ CORE_SRCS="$CORE_SRCS $KQUEUE_SRCS"
EVENT_FOUND=YES
fi
@@ -60,6 +60,9 @@ fi
if [ $EVENT_AIO = YES ]; then
- CORE_SRCS="$CORE_SRCS $AIO_SRCS"
+ have=HAVE_AIO . auto/have
EVENT_MODULES="$EVENT_MODULES $AIO_MODULE"
+ CORE_SRCS="$CORE_SRCS $AIO_SRCS"
+else
+ have=HAVE_AIO . auto/nohave
fi
diff --git a/auto/os/linux b/auto/os/linux
index 78ab3d14b..4a9823dd9 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -30,6 +30,15 @@ if [ $ngx_found = yes ]; then
fi
+# rtsig
+
+if [ $EVENT_RTSIG = YES ]; then
+ have=HAVE_RTSIG . auto/have
+ EVENT_MODULES="$EVENT_MODULES $RTSIG_MODULE"
+ CORE_SRCS="$CORE_SRCS $RTSIG_SRCS"
+fi
+
+
# sendfile()
CC_TEST_FLAGS="-D_GNU_SOURCE"