… | |
… | |
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 | [ |
51 | [AC_MSG_RESULT(ok)], |
52 | AC_MSG_RESULT(ok) |
|
|
53 | CXXLIB="-lsupc++" |
|
|
54 | ], |
52 | [ |
55 | [ |
53 | AC_MSG_RESULT([no, making everything bigger and slower]) |
56 | AC_MSG_RESULT([no, making everything bigger and slower]) |
54 | LIBS="$save_LIBS" |
57 | LIBS="$save_LIBS" |
55 | LINKER="$save_CXX" |
58 | LINKER="$save_CXX" |
56 | ] |
59 | ] |
57 | ) |
60 | ) |
58 | CXX="$save_CXX" |
61 | CXX="$save_CXX" |
59 | fi |
62 | fi |
60 | AC_SUBST(LINKER,[$LINKER]) |
63 | AC_SUBST(LINKER,[$LINKER]) |
|
|
64 | AC_SUBST(CXXLIB) |
61 | |
65 | |
62 | dnl# -------------------------------------------------------------------------- |
66 | dnl# -------------------------------------------------------------------------- |
63 | dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' |
67 | dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' |
64 | dnl# |
68 | dnl# |
65 | if test -z "$orig_CXXFLAGS"; then |
69 | if test -z "$orig_CXXFLAGS"; then |
… | |
… | |
439 | AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" |
443 | AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" |
440 | fi]) |
444 | fi]) |
441 | |
445 | |
442 | dnl# -------------------------------------------------------------------------- |
446 | dnl# -------------------------------------------------------------------------- |
443 | |
447 | |
444 | AC_PATH_PROG(MV, mv, mv) |
|
|
445 | AC_PATH_PROG(CP, cp, cp) |
|
|
446 | AC_PATH_PROG(LN, ln, ln) |
|
|
447 | AC_PATH_PROG(SED, sed, sed) |
|
|
448 | AC_PATH_PROG(ECHO, echo, echo) |
|
|
449 | AC_PATH_PROG(CMP, cmp, cmp) |
|
|
450 | AC_PATH_PROG(TIC, tic) |
448 | AC_PATH_PROG(TIC, tic) |
451 | |
449 | |
452 | dnl# need a neat way to detect SVR4 or its features |
450 | dnl# need a neat way to detect SVR4 or its features |
453 | dnl# in src/command.c we use these functions: |
451 | dnl# in src/command.c we use these functions: |
454 | dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> |
452 | dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> |
… | |
… | |
745 | if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) |
743 | if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) |
746 | exit (XSupportsLocale() ? 0 : 1); |
744 | exit (XSupportsLocale() ? 0 : 1); |
747 | else |
745 | else |
748 | exit (1);}]])],[dnl |
746 | exit (1);}]])],[dnl |
749 | rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl |
747 | rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl |
750 | AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) |
748 | :])]) |
751 | if test x$rxvt_cv_func_xlocale = xyes; then |
|
|
752 | AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) |
|
|
753 | fi |
|
|
754 | |
749 | |
755 | AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, |
750 | AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, |
756 | [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 |
751 | [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 |
757 | #include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) |
752 | #include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) |
758 | if test x$rxvt_cv_func_xsetlocale = xyes; then |
753 | if test x$rxvt_cv_func_xsetlocale = xyes; then |
… | |
… | |
957 | |
952 | |
958 | if test x$support_perl = xyes; then |
953 | if test x$support_perl = xyes; then |
959 | support_frills=yes |
954 | support_frills=yes |
960 | fi |
955 | fi |
961 | |
956 | |
962 | AC_SUBST(DEBUG) |
|
|
963 | AC_SUBST(DINCLUDE) |
|
|
964 | AC_SUBST(CFLAGS) |
957 | AC_SUBST(CFLAGS) |
965 | AC_SUBST(CPPFLAGS) |
958 | AC_SUBST(CPPFLAGS) |
966 | AC_SUBST(LDFLAGS) |
959 | AC_SUBST(LDFLAGS) |
967 | AC_SUBST(X_CFLAGS) |
960 | AC_SUBST(X_CFLAGS) |
968 | |
961 | |
969 | dnl# Attack the libs |
962 | dnl# Attack the libs |
970 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
963 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
971 | DLIB=`echo $DLIB | sed "$R_TRANSLATE"` |
|
|
972 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
964 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
973 | X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` |
965 | X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` |
974 | X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` |
966 | X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` |
975 | XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` |
967 | XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` |
976 | fi |
968 | fi |
977 | AC_SUBST(DLIB) |
|
|
978 | AC_SUBST(LIBS) |
969 | AC_SUBST(LIBS) |
979 | AC_SUBST(X_LIBS) |
970 | AC_SUBST(X_LIBS) |
980 | AC_SUBST(X_EXTRA_LIBS) |
971 | AC_SUBST(X_EXTRA_LIBS) |
981 | |
972 | |
982 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |
973 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |