From 72ec70454ea929869de686d3b6db1a9b0edb1d61 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Tue, 18 Apr 2006 08:18:03 +0000
Subject: [PATCH]   * Workaround for broken AC_PATH_X autoconf macros.

---
 configure.ac | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5d99bf8..8a8b683 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,13 +12,13 @@ AM_CONFIG_HEADER(config.h)
 AM_PROG_CC_C_O
 AC_PROG_CPP
 AC_PROG_CXX
+AC_PROG_CXXCPP
 AM_PROG_AS
 
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX
 
-
 AC_C_CONST
 AC_C_INLINE
 AC_TYPE_SIGNAL
@@ -29,14 +29,6 @@ dnl PKG_PROG_PKG_CONFIG which needs to be called first.
 AC_EGREP_CPP(yes, foo)
 PKG_PROG_PKG_CONFIG()
 
-dnl Check the C++ compiler and preprocessor.
-AC_PROG_CXX
-AC_PROG_CXXCPP
-
-dnl Set the test language as C++
-AC_LANG([C++])
-
-
 dnl output driver features
 AC_ARG_ENABLE(slang,
   [  --enable-slang          slang graphics support (autodetected)])
@@ -55,6 +47,7 @@ AC_ARG_ENABLE(network,
 AC_ARG_ENABLE(vga,
   [  --enable-vga            VGA support (default disabled)])
 
+dnl language bindings
 AC_ARG_ENABLE(cpp,
   [  --enable-cpp            C++ bindings (autodetected)])
 
@@ -160,7 +153,7 @@ if test "${enable_x11}" != "no"; then
     CACA_LIBS="${CACA_LIBS} ${X_LIBS}"
     CACA_DRIVERS="${CACA_DRIVERS} x11"],
    [ac_cv_my_have_x11="no"],
-   [[-lXt -L${x_libraries}]])
+   [[-lXt `if test -n "${x_libraries}"; then echo -L${x_libraries}; fi`]])
   AC_CHECK_HEADERS(X11/XKBlib.h)
   if test "${ac_cv_my_have_x11}" != "yes" -a "${enable_x11}" = "yes"; then
     AC_MSG_ERROR([cannot find X11 development files])
@@ -244,14 +237,9 @@ else
   AC_MSG_RESULT([${CACA_DRIVERS}])
 fi
 
-
-
-
-
 AC_SUBST(MATH_LIBS)
 AC_SUBST(CACA_LIBS)
 AC_SUBST(CUCUL_LIBS)
-AC_SUBST(CUCUL++_LIBS)
 
 # Optimizations
 CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"