diff --git a/configure.in b/configure.in
index 4fe4310a..3e8f90a7 100644
--- a/configure.in
+++ b/configure.in
@@ -9,9 +9,12 @@
 # Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
 # der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
 #
-# $Id: configure.in,v 1.15 2002/01/02 02:52:09 alex Exp $
+# $Id: configure.in,v 1.16 2002/01/02 13:41:36 alex Exp $
 #
 # $Log: configure.in,v $
+# Revision 1.16  2002/01/02 13:41:36  alex
+# - CFLAGS wird nur noch gesetzt, wenn der GCC verwendet wird.
+#
 # Revision 1.15  2002/01/02 02:52:09  alex
 # - Copyright-Texte angepasst ;-)
 #
@@ -67,8 +70,6 @@ AM_CONFIG_HEADER(src/config.h)
 
 # -- Variablen --
 
-CFLAGS="-Wall -g $CFLAGS"
-
 # -- C Compiler --
 
 AC_PROG_CC
@@ -166,24 +167,30 @@ AC_ARG_ENABLE(strict-rfc,
 	fi
 )
 
-AC_ARG_ENABLE(debug,
-	[  --enable-debug          show additional debug output],
-	if test "$enableval" = "yes"; then
-		AC_DEFINE(DEBUG, 1)
-		AC_MSG_RESULT([enabling additional debug output])
-	fi
-)
-
 AC_ARG_ENABLE(sniffer,
 	[  --enable-sniffer        enable network traffic monitor (enables debug mode!)],
 	if test "$enableval" = "yes"; then
-		AC_DEFINE(DEBUG, 1)
-		AC_MSG_RESULT([enabling additional debug output])
 		AC_DEFINE(SNIFFER, 1)
 		AC_MSG_RESULT([enabling network traffic monitor])
+		x_debug_on=yes
 	fi
 )
 
+AC_ARG_ENABLE(debug,
+	[  --enable-debug          show additional debug output],
+	if test "$enableval" = "yes"; then x_debug_on=yes; fi
+)
+if test "$x_debug_on" = "yes"; then
+	AC_DEFINE(DEBUG, 1)
+	AC_MSG_RESULT([enabling additional debug output])
+fi
+
+# -- Variablen II --
+
+if test "$GCC" = "yes"; then
+	CFLAGS="-Wall $CFLAGS"
+fi
+
 # -- Ausgabe --
 
 AC_OUTPUT([ \