Removed "USE_" prefixes of configuration #defines.

[ngircd-alex.git] / configure.in

diff --git a/configure.in b/configure.in
index 94ff78d8402bc13ee2220131ad8ac760f341351b..43d5734302ee76745e1697154c930061df97f7b6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: configure.in,v 1.93 2003/05/05 00:33:32 alex Exp $
+# $Id: configure.in,v 1.97 2003/12/26 15:55:07 alex Exp $
 #
 
 # -- Initialisierung --
@@ -26,9 +26,9 @@ AH_TEMPLATE([DEBUG], [Define if debug-mode should be enabled])
 AH_TEMPLATE([HAVE_socklen_t], [Define if socklen_t exists])
 AH_TEMPLATE([SNIFFER], [Define if IRC sniffer should be enabled])
 AH_TEMPLATE([STRICT_RFC], [Define if ngIRCd should behave strict RFC compliant])
-AH_TEMPLATE([USE_SYSLOG], [Define if syslog should be used for logging])
-AH_TEMPLATE([USE_ZLIB], [Define if zlib compression should be enabled])
-AH_TEMPLATE([USE_TCPWRAP], [Define if TCP wrappers should be used])
+AH_TEMPLATE([SYSLOG], [Define if syslog should be used for logging])
+AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled])
+AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used])
 AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used])
 AH_TEMPLATE([RENDEZVOUS], [Define if Rendezvous support should be included])
 
@@ -162,7 +162,7 @@ AC_ARG_WITH(syslog,
        ]
 )
 if test "$x_syslog_on" = "yes"; then
-       AC_DEFINE(USE_SYSLOG, 1)
+       AC_DEFINE(SYSLOG, 1)
        AC_CHECK_HEADERS(syslog.h)
 fi
 
@@ -181,7 +181,7 @@ AC_ARG_WITH(zlib,
        ]
 )
 if test "$x_zlib_on" = "yes"; then
-       AC_DEFINE(USE_ZLIB, 1)
+       AC_DEFINE(ZLIB, 1)
        AC_CHECK_HEADERS(zlib.h)
 fi
 
@@ -198,7 +198,7 @@ AC_ARG_WITH(tcp-wrappers,
                                ptr = hosts_access;
                                ],[
                                AC_MSG_RESULT(yes)
-                               AC_DEFINE(USE_TCPWRAP, 1)
+                               AC_DEFINE(TCPWRAP, 1)
                                x_tcpwrap_on=yes
                                ],[
                                AC_MSG_RESULT(no)
@@ -271,7 +271,7 @@ if test "$GCC" = "yes"; then
        ansi=" -ansi"
        pedantic=" -pedantic"
 
-       $CC --version | grep 20020420 > /dev/null 2>&1
+       $CC --version | grep 20020420 >/dev/null 2>&1
        if test $? -eq 0; then
                # Mac OS X (and Darwin?) ship with a slightly broken
                # prerelease of GCC 3.1 which don't like -pedantic:
@@ -279,7 +279,16 @@ if test "$GCC" = "yes"; then
                pedantic=""
        fi
 
-       uname | grep "CYGWIN" > /dev/null 2>&1
+       $CC --version | grep 20030304 >/dev/null 2>&1
+       if test $? -eq 0; then
+               # Mac OS X 10.3 (and Darwin 7.0?) have a strange gcc (or
+               # system header files?) which produces lots of errors when
+               # using -ansi; so we don't =:-)
+               AC_MSG_RESULT([detected broken GNU C compiler, disabling "-ansi"])
+               ansi=""
+       fi
+
+       uname | grep "CYGWIN" >/dev/null 2>&1
        if test $? -eq 0; then
                # The include files of Cygwin don't like -ansi,
                # so we disable it:
@@ -287,7 +296,7 @@ if test "$GCC" = "yes"; then
                ansi=""
        fi
 
-       add_CFLAGS="-Wall -W${ansi}${pedantic} $CFLAGS $CFLAGS_ADD"
+       add_CFLAGS="-pipe -Wall -W${ansi}${pedantic} $CFLAGS $CFLAGS_ADD"
 else
        the_CFLAGS="$CFLAGS"
        add_CFLAGS="$CFLAGS_ADD"
@@ -309,6 +318,7 @@ AC_OUTPUT([ \
        src/testsuite/Makefile \
        man/Makefile \
        contrib/Makefile \
+       debian/Makefile \
 ])
 
 # -- Result --