[sawfish/sawfish-1.3] fix the last incomplete AC_DEFINE

[Christopher Bratusek <chrisb src gnome org>]

commit 36b7b47c3c5d21967133c2a7dfcdf218071a085b
Author: chrisb <zanghar freenet de>
Date:   Mon May 4 18:41:10 2009 +0200

    fix the last incomplete AC_DEFINE
    make X11R6 the default X11 detection method
---
 ChangeLog     |    4 ++++
 configure.in  |    4 ++--
 man/news.texi |    4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index be85c3f..1889e3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-04  Christopher Bratusek <zanghar freenet de>
+	* configure.in: - fix the last incomplete AC_DEFINE
+			- make X11R6 the default detection method
+
 2009-05-03  Christopher Bratusek <zanghar freenet de>
 	* Makedefs.in
 	* configure
diff --git a/configure.in b/configure.in
index d5edf3a..668c2c1 100644
--- a/configure.in
+++ b/configure.in
@@ -65,7 +65,7 @@ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
 
 AC_ARG_WITH(xorg-x11r7,
 	    [  --with-xorg-x11r7	  Use X.Org X11R7
-	     --without-xorg-x11r7	  Use X.Org/XFree86 X11R6 instead], [], [with_xorg_x11r7=yes])
+	     --without-xorg-x11r7	  Use X.Org/XFree86 X11R6 instead], [], [with_xorg_x11r7=no])
 
 if test "$with_xorg_x11r7" != "no"; then
 
@@ -154,7 +154,7 @@ PKG_CHECK_MODULES(XFT, xft >= 1.0,
 
 dnl is X available?
 if test "${no_x}" != "yes"; then
-  AC_DEFINE(HAVE_X11)
+  AC_DEFINE(HAVE_X11, 1, [Have X11])
   X_LIBS="${X_LIBS} -lXext -lXrender -lSM -lICE"
   X_EXTRA_LIBS=""
 else
diff --git a/man/news.texi b/man/news.texi
index f44b367..08dc76f 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -18,6 +18,8 @@ they occurred between. For more detailed information see the
 @item don't ignore datarootdir setting [Christopher Bratusek]
 
 @item new configure.in and build-info from upstream svn [Christopher Bratusek]
+
+ item fix the last incomplete AC_DEFINE [Christopher Bratusek]
 @end itemize
 
 @item Other Changes:
@@ -28,6 +30,8 @@ they occurred between. For more detailed information see the
 @item dropped libgnome|gnomeui|gnomecanvas related widgets, use pure-gtk instead [Christopher Bratusek]
 
 @item added sawfish.ebuild.in and sawfish.pc from upstream svn [Christopher Bratusek]
+
+ item make X11R6 the default X11 detection method [Christopher Bratusek]
 @end itemize
 @end itemize