Changeset 801 for libcacaTweet

Timestamp:

Apr 18, 2006, 10:18:03 AM (15 years ago)

Author:

Sam Hocevar

Message:

• Workaround for broken AC_PATH_X autoconf macros.

File:

• libcaca/trunk/configure.ac (modified) (6 diffs)

libcaca/trunk/configure.ac

@@ -13 +13 @@
 AC_PROG_CPP
 AC_PROG_CXX
+AC_PROG_CXXCPP
 AM_PROG_AS
 
@@ -18 +19 @@
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX
-
 
 AC_C_CONST
@@ -29 +29 @@
 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
@@ -56 +48 @@
   [  --enable-vga            VGA support (default disabled)])
 
+dnl language bindings
 AC_ARG_ENABLE(cpp,
   [  --enable-cpp            C++ bindings (autodetected)])
@@ -161 +154 @@
     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
@@ -245 +238 @@
 fi
 
-
-
-
-
 AC_SUBST(MATH_LIBS)
 AC_SUBST(CACA_LIBS)
 AC_SUBST(CUCUL_LIBS)
-AC_SUBST(CUCUL++_LIBS)
 
 # Optimizations