… | |
… | |
48 | LINKER="$CC" |
48 | LINKER="$CC" |
49 | AC_LINK_IFELSE( |
49 | AC_LINK_IFELSE( |
50 | [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }])], |
50 | [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }])], |
51 | [AC_MSG_RESULT(ok)], |
51 | [AC_MSG_RESULT(ok)], |
52 | [ |
52 | [ |
53 | AC_MSG_RESULT([no, make everything bigger and slower]) |
53 | AC_MSG_RESULT([no, making everything bigger and slower]) |
54 | CXX="$save_CXX" |
|
|
55 | LIBS="$save_LIBS" |
54 | LIBS="$save_LIBS" |
56 | LINKER="$CXX" |
55 | LINKER="$save_CXX" |
57 | ] |
56 | ] |
58 | ) |
57 | ) |
|
|
58 | CXX="$save_CXX" |
59 | fi |
59 | fi |
60 | AC_SUBST(LINKER,[$LINKER]) |
60 | AC_SUBST(LINKER,[$LINKER]) |
61 | |
61 | |
62 | AC_LANG(C++) |
62 | AC_LANG(C++) |
63 | dnl# -------------------------------------------------------------------------- |
63 | dnl# -------------------------------------------------------------------------- |
… | |
… | |
840 | |
840 | |
841 | dnl# -------------------------------------------------------------------------- |
841 | dnl# -------------------------------------------------------------------------- |
842 | dnl# now add and remove other stuff |
842 | dnl# now add and remove other stuff |
843 | dnl# -------------------------------------------------------------------------- |
843 | dnl# -------------------------------------------------------------------------- |
844 | if test x$support_xft = xyes; then |
844 | if test x$support_xft = xyes; then |
845 | LIBS="$LIBS `pkg-config xft --libs`" |
845 | AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
|
|
846 | AC_PATH_PROG(XFT_CONFIG, xft-config, no) |
|
|
847 | if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then |
|
|
848 | LIBS="$LIBS `$PKG_CONFIG xft --libs`" |
846 | CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`" |
849 | CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" |
|
|
850 | else |
|
|
851 | if test $XFT_CONFIG != no; then |
|
|
852 | LIBS="$LIBS `$XFT_CONFIG --libs`" |
|
|
853 | CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" |
|
|
854 | fi |
|
|
855 | fi |
847 | |
856 | |
848 | AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) |
857 | AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) |
849 | AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) |
858 | AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) |
850 | |
859 | |
851 | if test x$support_xft = xyes; then |
860 | if test x$support_xft = xyes; then |