merges from upstream/release

  ulim 2007-12-04 Follow rename of jabber_chat_by_jid from upstrem
    ulim 2007-12-04 Merged in current devel
    Wilmer van der Gaast 2007-12-02 Imported setuid() patch from Simo Leone <simo@archlinux...> with some
    Wilmer van der Gaast 2007-12-02 Forgot to return something in jabber_chat_join_failed().
    Wilmer van der Gaast 2007-12-02 Merging a change I should've pulled before committing three other changes.
    Wilmer van der Gaast 2007-12-02 Added charset checks on incoming msgs (from the IRC side) to prevent possible
    Wilmer van der Gaast 2007-12-02 Handling of presence-error packets (only useful for groupchats now), moved
    Wilmer van der Gaast 2007-12-02 Defining DEBUG via CFLAGS so that it'll always be there, even when a file
    ulim 2007-12-04 Jabber file transfer now also with sending! You can't use a proxy yet when
    Wilmer van der Gaast 2007-12-02 Removed retarded printf() (ARGH) and moved the event handling handling of
    Wilmer van der Gaast 2007-11-29 printf() in daemons considered harmful.
    Wilmer van der Gaast 2007-11-28 Fixed the epoll+ForkDaemon combination. The libevent event handling

1 files changed, 1 insertions, 1 deletions

diff --git a/configure b/configure
index b84f3947..15e22623 100755
--- a/configure
+++ b/configure
@@ -134,7 +134,7 @@ EOF
 if [ "$debug" = "1" ]; then
 	[ -z "$CFLAGS" ] && CFLAGS=-g
 	echo 'DEBUG=1' >> Makefile.settings
-	echo '#define DEBUG' >> config.h
+	CFLAGS="$CFLAGS -DDEBUG"
 else
 	[ -z "$CFLAGS" ] && CFLAGS="-O2 -fno-strict-aliasing"
 fi