[Xcb-commit] 2 commits - configure.ac

[Vincent Torri]

 configure.ac |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

New commits:
diff-tree 4c8777f87a28ff5bf45cbdddce509163dbcf8137 (from parents)
Merge: e624cca7df4c2c5bc5e44af1e851e5a0d17c88bd f486075fa093846c3f32b3e4b9624c039ea26ba4
Author: TORRI Vincent <torri at doursse.(none)>
Date:   Tue Nov 28 20:15:27 2006 +0100

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb/libxcb

diff --cc configure.ac
index eef3fa0,cd682ff..d73e51f
@@@ -31,10 -31,9 +31,10 @@@
  
  # Checks for pkg-config packages
  PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.0)
- NEEDED="xau pthread-stubs"
+ NEEDED="pthread-stubs xau >= 0.99.2"
  PKG_CHECK_MODULES(NEEDED, $NEEDED)
  
 +have_xdmcp="no"
  PKG_CHECK_MODULES(XDMCP, xdmcp,
  	AC_CHECK_LIB(Xdmcp, XdmcpWrap,
  		[
diff-tree e624cca7df4c2c5bc5e44af1e851e5a0d17c88bd (from 818811a7ac660e46d0dca1cbf9e53ad0475af330)
Author: TORRI Vincent <torri at doursse.(none)>
Date:   Tue Nov 28 20:14:16 2006 +0100

    add some output informations to configure script

diff --git a/configure.ac b/configure.ac
index b400f03..eef3fa0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,8 @@ AC_INIT([libxcb],
 AC_CONFIG_SRCDIR([xcb.pc.in])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
-PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=true], [HAVE_CHECK=false])
-AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xtrue)
+PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
+AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes)
 
 AC_CONFIG_HEADERS([src/config.h])
 
@@ -22,7 +22,7 @@ if test "$XSLTPROC" = "no"; then
 fi
 
 HTML_CHECK_RESULT=false
-if test x"$HAVE_CHECK" = xtrue; then
+if test x"$HAVE_CHECK" = xyes; then
 	if test x"$XSLTPROC" != xno; then
 		HTML_CHECK_RESULT=true
 	fi
@@ -34,11 +34,13 @@ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >=
 NEEDED="xau pthread-stubs"
 PKG_CHECK_MODULES(NEEDED, $NEEDED)
 
+have_xdmcp="no"
 PKG_CHECK_MODULES(XDMCP, xdmcp,
 	AC_CHECK_LIB(Xdmcp, XdmcpWrap,
 		[
 		AC_DEFINE(HASXDMAUTH,1,[Has Wraphelp.c needed for XDM AUTH protocols])
 		NEEDED="$NEEDED xdmcp"
+		have_xdmcp="yes"
 		],
 		[
 		XDMCP_CFLAGS=
@@ -87,3 +89,21 @@ AC_CONFIG_FILES([xcb.pc xcb-xlib.pc xcb-
 AC_CONFIG_FILES([doc/xcb.doxygen])
 
 AC_OUTPUT
+
+dnl Configuration output
+
+echo ""
+echo "  Package: ${PACKAGE_NAME} ${PACKAGE_VERSION}"
+echo ""
+echo "  Configuration"
+echo "    XDM support.........: ${have_xdmcp}"
+echo "    Build unit tests....: ${HAVE_CHECK}"
+echo ""
+echo "  Used CFLAGS:"
+echo "    CPPFLAGS............: ${CPPFLAGS}"
+echo "    CFLAGS..............: ${CFLAGS}"
+echo "    Warning CFLAGS......: ${CWARNFLAGS}"
+echo ""
+echo "  Installation:"
+echo "    Prefix..............: ${prefix}"
+echo ""