Ignore:
Timestamp:
Apr 18, 2006, 10:18:03 AM (14 years ago)
Author:
Sam Hocevar
Message:
  • Workaround for broken AC_PATH_X autoconf macros.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/configure.ac

    r799 r801  
    1313AC_PROG_CPP
    1414AC_PROG_CXX
     15AC_PROG_CXXCPP
    1516AM_PROG_AS
    1617
     
    1819AM_PROG_LIBTOOL
    1920AC_LIBTOOL_CXX
    20 
    2121
    2222AC_C_CONST
     
    2929AC_EGREP_CPP(yes, foo)
    3030PKG_PROG_PKG_CONFIG()
    31 
    32 dnl Check the C++ compiler and preprocessor.
    33 AC_PROG_CXX
    34 AC_PROG_CXXCPP
    35 
    36 dnl Set the test language as C++
    37 AC_LANG([C++])
    38 
    3931
    4032dnl output driver features
     
    5648  [  --enable-vga            VGA support (default disabled)])
    5749
     50dnl language bindings
    5851AC_ARG_ENABLE(cpp,
    5952  [  --enable-cpp            C++ bindings (autodetected)])
     
    161154    CACA_DRIVERS="${CACA_DRIVERS} x11"],
    162155   [ac_cv_my_have_x11="no"],
    163    [[-lXt -L${x_libraries}]])
     156   [[-lXt `if test -n "${x_libraries}"; then echo -L${x_libraries}; fi`]])
    164157  AC_CHECK_HEADERS(X11/XKBlib.h)
    165158  if test "${ac_cv_my_have_x11}" != "yes" -a "${enable_x11}" = "yes"; then
     
    245238fi
    246239
    247 
    248 
    249 
    250 
    251240AC_SUBST(MATH_LIBS)
    252241AC_SUBST(CACA_LIBS)
    253242AC_SUBST(CUCUL_LIBS)
    254 AC_SUBST(CUCUL++_LIBS)
    255243
    256244# Optimizations
Note: See TracChangeset for help on using the changeset viewer.