repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: bb8fd1486c747f2b27481d43fb65fa468cb7be84:
path_to: 
revision_to: 

commit bb8fd1486c747f2b27481d43fb65fa468cb7be84
Author: Emanuele Giaquinta 
Date:   Sat Nov 8 13:00:55 2014 +0000

    Fix autoconf xim tests.

    The xim tests fail on systems where there is no X11 directory in the
    default include path, such as FreeBSD, because X_CFLAGS is added to
    CFLAGS and CFLAGS is not honored in C++. Fix the tests by adding
    X_CFLAGS to CXXFLAGS.

diff --git a/configure.ac b/configure.ac

--- a/configure.ac
+++ b/configure.ac
@@ -527,8 +527,8 @@ dnl# --------------------------------------------------------------------------

 dnl# this is a really hack test for some basic Xlocale stuff
 save_LIBS=$LIBS
-save_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS $X_CFLAGS"
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $X_CFLAGS"
 LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
 if test x$support_xim = xyes; then
   AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
@@ -570,7 +570,7 @@ if test x$rxvt_cv_func_xsetlocale = xyes; then
   AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
 fi
 LIBS=$save_LIBS
-CFLAGS=$save_CFLAGS
+CXXFLAGS=$save_CXXFLAGS

 AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])

-----END OF PAGE-----