… | |
… | |
46 | CXX="$CC" |
46 | CXX="$CC" |
47 | LIBS="$LIBS -lsupc++" |
47 | LIBS="$LIBS -lsupc++" |
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 | [ |
|
|
52 | AC_MSG_RESULT(ok) |
51 | [AC_MSG_RESULT(ok)], |
53 | CXXLIB="-lsupc++" |
|
|
54 | ], |
|
|
55 | [ |
52 | [ |
56 | AC_MSG_RESULT([no, making everything bigger and slower]) |
53 | AC_MSG_RESULT([no, making everything bigger and slower]) |
57 | LIBS="$save_LIBS" |
54 | LIBS="$save_LIBS" |
58 | LINKER="$save_CXX" |
55 | LINKER="$save_CXX" |
59 | ] |
56 | ] |
60 | ) |
57 | ) |
61 | CXX="$save_CXX" |
58 | CXX="$save_CXX" |
62 | fi |
59 | fi |
63 | AC_SUBST(LINKER,[$LINKER]) |
60 | AC_SUBST(LINKER,[$LINKER]) |
64 | AC_SUBST(CXXLIB) |
|
|
65 | |
61 | |
66 | dnl# -------------------------------------------------------------------------- |
62 | dnl# -------------------------------------------------------------------------- |
67 | dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' |
63 | dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' |
68 | dnl# |
64 | dnl# |
69 | if test -z "$orig_CXXFLAGS"; then |
65 | if test -z "$orig_CXXFLAGS"; then |
… | |
… | |
685 | dnl# this is a really hack test for some basic Xlocale stuff |
681 | dnl# this is a really hack test for some basic Xlocale stuff |
686 | ac_save_LIBS=$LIBS |
682 | ac_save_LIBS=$LIBS |
687 | ac_save_CFLAGS=$CFLAGS |
683 | ac_save_CFLAGS=$CFLAGS |
688 | CFLAGS="$CFLAGS $X_CFLAGS" |
684 | CFLAGS="$CFLAGS $X_CFLAGS" |
689 | LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" |
685 | LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" |
690 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
|
|
691 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
|
|
692 | fi |
|
|
693 | AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, |
686 | AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, |
694 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
687 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
695 | #include <stdlib.h> |
688 | #include <stdlib.h> |
696 | main() { |
689 | main() { |
697 | char *p; |
690 | char *p; |
… | |
… | |
914 | AC_SUBST(CPPFLAGS) |
907 | AC_SUBST(CPPFLAGS) |
915 | AC_SUBST(LDFLAGS) |
908 | AC_SUBST(LDFLAGS) |
916 | AC_SUBST(X_CFLAGS) |
909 | AC_SUBST(X_CFLAGS) |
917 | |
910 | |
918 | dnl# Attack the libs |
911 | dnl# Attack the libs |
919 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
|
|
920 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
|
|
921 | X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` |
|
|
922 | X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` |
|
|
923 | XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` |
|
|
924 | fi |
|
|
925 | AC_SUBST(LIBS) |
912 | AC_SUBST(LIBS) |
926 | AC_SUBST(X_LIBS) |
913 | AC_SUBST(X_LIBS) |
927 | AC_SUBST(X_EXTRA_LIBS) |
914 | AC_SUBST(X_EXTRA_LIBS) |
928 | |
915 | |
929 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |
916 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |