… | |
… | |
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 |
… | |
… | |
74 | |
78 | |
75 | AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.) |
79 | AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.) |
76 | |
80 | |
77 | case $host in |
81 | case $host in |
78 | *-*-solaris* ) |
82 | *-*-solaris* ) |
79 | AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) |
83 | AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris) |
80 | AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris) |
|
|
81 | AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) |
|
|
82 | ;; |
84 | ;; |
83 | esac |
85 | esac |
84 | |
86 | |
85 | dnl if test x$GXX = xyes; then |
87 | dnl if test x$GXX = xyes; then |
86 | dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... |
88 | dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... |
… | |
… | |
237 | [ --enable-afterimage enable integration with libAfterImage for background images], |
239 | [ --enable-afterimage enable integration with libAfterImage for background images], |
238 | [if test x$enableval = xyes -o x$enableval = xno; then |
240 | [if test x$enableval = xyes -o x$enableval = xno; then |
239 | support_afterimage=$enableval |
241 | support_afterimage=$enableval |
240 | fi]) |
242 | fi]) |
241 | |
243 | |
242 | AC_ARG_WITH(afterimage_config, [ --with-afterimage-config=DIR use libAfterImage config script in DIR], afterimage_config="$withval",afterimage_config=NO) |
244 | AC_ARG_WITH(afterimage_config, |
|
|
245 | [ --with-afterimage-config=DIR use libAfterImage config script in DIR], |
|
|
246 | [if test "x$withval" != x; then |
|
|
247 | afterimage_config=$withval/afterimage-config |
|
|
248 | fi]) |
243 | |
249 | |
244 | AC_ARG_ENABLE(afterstep, |
250 | AC_ARG_ENABLE(afterstep, |
245 | [ --enable-afterstep enable integration with AfterStep window manager], |
251 | [ --enable-afterstep enable integration with AfterStep window manager], |
246 | [if test x$enableval = xyes -o x$enableval = xno; then |
252 | [if test x$enableval = xyes -o x$enableval = xno; then |
247 | support_afterstep=$enableval |
253 | support_afterstep=$enableval |
… | |
… | |
435 | AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" |
441 | AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" |
436 | fi]) |
442 | fi]) |
437 | |
443 | |
438 | dnl# -------------------------------------------------------------------------- |
444 | dnl# -------------------------------------------------------------------------- |
439 | |
445 | |
440 | AC_PATH_PROG(MV, mv, mv) |
|
|
441 | AC_PATH_PROG(CP, cp, cp) |
|
|
442 | AC_PATH_PROG(LN, ln, ln) |
|
|
443 | AC_PATH_PROG(SED, sed, sed) |
|
|
444 | AC_PATH_PROG(ECHO, echo, echo) |
|
|
445 | AC_PATH_PROG(CMP, cmp, cmp) |
|
|
446 | AC_PATH_PROG(TIC, tic) |
446 | AC_PATH_PROG(TIC, tic) |
447 | |
447 | |
448 | dnl# need a neat way to detect SVR4 or its features |
448 | dnl# need a neat way to detect SVR4 or its features |
449 | dnl# in src/command.c we use these functions: |
449 | dnl# in src/command.c we use these functions: |
450 | dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> |
450 | dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> |
… | |
… | |
465 | |
465 | |
466 | LIBAFTERIMAGE_CFLAGS= |
466 | LIBAFTERIMAGE_CFLAGS= |
467 | AFTERIMAGE_LIBS= |
467 | AFTERIMAGE_LIBS= |
468 | have_afterimage= |
468 | have_afterimage= |
469 | |
469 | |
470 | if test x$support_afterimage == xyes; then |
470 | if test x$support_afterimage = xyes; then |
471 | AC_MSG_CHECKING(installed libAfterImage) |
|
|
472 | support_afterimage=no |
471 | support_afterimage=no |
|
|
472 | |
473 | if test "$afterimage_config" = "NO" ; then |
473 | if test "x$afterimage_config" = "x" ; then |
474 | if afterimage-config --version > /dev/null 2>&1 ; then |
474 | AC_PATH_PROG(afterimage_config, afterimage-config, no) |
475 | afterimage_config=afterimage-config |
475 | fi |
476 | else |
476 | |
477 | if test -x /usr/local/bin/afterimage-config; then |
477 | AC_MSG_CHECKING(for libAfterImage) |
478 | afterimage_config=/usr/local/bin/afterimage-config |
|
|
479 | fi |
|
|
480 | fi |
|
|
481 | else |
|
|
482 | afterimage_config=$afterimage_config/afterimage-config |
|
|
483 | fi |
|
|
484 | if $afterimage_config --version > /dev/null 2>&1 ; then |
478 | if $afterimage_config --version >/dev/null 2>&1 ; then |
485 | LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` |
479 | LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` |
486 | AFTERIMAGE_LIBS=`$afterimage_config --libs` |
480 | AFTERIMAGE_LIBS=`$afterimage_config --libs` |
487 | if test "x$AFTERIMAGE_LIBS" != "x"; then |
481 | if test "x$AFTERIMAGE_LIBS" != "x"; then |
488 | support_afterimage=yes |
482 | support_afterimage=yes |
489 | fi |
483 | fi |
490 | fi |
484 | fi |
491 | |
485 | |
492 | if test "x$support_afterimage" = "xyes"; then |
486 | if test "x$support_afterimage" = "xyes"; then |
493 | AC_MSG_RESULT($AFTERIMAGE_LIBS) |
487 | AC_MSG_RESULT($AFTERIMAGE_LIBS) |
494 | else |
488 | else |
495 | AC_MSG_RESULT(afterimage-config not found in $afterimage_config - can't use libAfterImage for images.) |
489 | AC_MSG_RESULT(no) |
496 | fi |
490 | fi |
497 | fi |
491 | fi |
498 | |
492 | |
499 | if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then |
493 | if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then |
500 | VT_FIND_LIBXPM |
494 | VT_FIND_LIBXPM |
501 | if test x$no_xpm = xyes; then |
495 | if test x$no_xpm = xyes; then |
… | |
… | |
747 | if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) |
741 | if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) |
748 | exit (XSupportsLocale() ? 0 : 1); |
742 | exit (XSupportsLocale() ? 0 : 1); |
749 | else |
743 | else |
750 | exit (1);}]])],[dnl |
744 | exit (1);}]])],[dnl |
751 | rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl |
745 | rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl |
752 | AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) |
746 | :])]) |
|
|
747 | if test x$support_xim = xyes; then |
753 | if test x$rxvt_cv_func_xlocale = xyes; then |
748 | if test x$rxvt_cv_func_xlocale = xyes; then |
754 | AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) |
749 | AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) |
|
|
750 | fi |
755 | fi |
751 | fi |
756 | |
752 | |
757 | AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, |
753 | AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, |
758 | [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 |
754 | [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 |
759 | #include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) |
755 | #include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) |
… | |
… | |
834 | fi |
830 | fi |
835 | if test x$support_tinting = xyes; then |
831 | if test x$support_tinting = xyes; then |
836 | AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) |
832 | AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) |
837 | fi |
833 | fi |
838 | if test x$support_inheritpixmap = xyes; then |
834 | if test x$support_inheritpixmap = xyes; then |
839 | AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) |
835 | AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) |
840 | fi |
836 | fi |
841 | if test x$support_keepscrolling = xno; then |
837 | if test x$support_keepscrolling = xno; then |
842 | AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) |
838 | AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) |
843 | fi |
839 | fi |
844 | if test x$support_selectionscrolling = xyes; then |
840 | if test x$support_selectionscrolling = xyes; then |
845 | AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) |
841 | AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) |
846 | fi |
842 | fi |
847 | if test x$support_frills = xyes; then |
|
|
848 | AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) |
|
|
849 | fi |
|
|
850 | if test x$support_mousewheel = xyes; then |
843 | if test x$support_mousewheel = xyes; then |
851 | AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) |
844 | AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) |
852 | fi |
845 | fi |
853 | if test x$support_mouseslipwheel = xyes; then |
846 | if test x$support_mouseslipwheel = xyes; then |
854 | AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) |
847 | AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) |
855 | fi |
|
|
856 | if test x$support_xim = xyes -o x$multichar_set = xyes; then |
|
|
857 | if test x$rxvt_cv_func_xlocale = xyes; then |
|
|
858 | AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) |
|
|
859 | fi |
|
|
860 | fi |
848 | fi |
861 | if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then |
849 | if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then |
862 | AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage) |
850 | AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage) |
863 | fi |
851 | fi |
864 | |
852 | |
… | |
… | |
959 | |
947 | |
960 | if test x$support_perl = xyes; then |
948 | if test x$support_perl = xyes; then |
961 | support_frills=yes |
949 | support_frills=yes |
962 | fi |
950 | fi |
963 | |
951 | |
964 | AC_SUBST(DEBUG) |
952 | if test x$support_frills = xyes; then |
965 | AC_SUBST(DINCLUDE) |
953 | AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) |
|
|
954 | fi |
|
|
955 | |
966 | AC_SUBST(CFLAGS) |
956 | AC_SUBST(CFLAGS) |
967 | AC_SUBST(CPPFLAGS) |
957 | AC_SUBST(CPPFLAGS) |
968 | AC_SUBST(LDFLAGS) |
958 | AC_SUBST(LDFLAGS) |
969 | AC_SUBST(X_CFLAGS) |
959 | AC_SUBST(X_CFLAGS) |
970 | |
960 | |
971 | dnl# Attack the libs |
961 | dnl# Attack the libs |
972 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
962 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
973 | DLIB=`echo $DLIB | sed "$R_TRANSLATE"` |
|
|
974 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
963 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
975 | X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` |
964 | X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` |
976 | X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` |
965 | X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` |
977 | XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` |
966 | XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` |
978 | fi |
967 | fi |
979 | AC_SUBST(DLIB) |
|
|
980 | AC_SUBST(LIBS) |
968 | AC_SUBST(LIBS) |
981 | AC_SUBST(X_LIBS) |
969 | AC_SUBST(X_LIBS) |
982 | AC_SUBST(X_EXTRA_LIBS) |
970 | AC_SUBST(X_EXTRA_LIBS) |
983 | |
971 | |
984 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |
972 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |
… | |
… | |
1030 | if test x$support_xpm = xyes; then |
1018 | if test x$support_xpm = xyes; then |
1031 | echo " Xpm library: $XPM_LIBS" |
1019 | echo " Xpm library: $XPM_LIBS" |
1032 | fi |
1020 | fi |
1033 | |
1021 | |
1034 | if test x$support_afterimage = xyes; then |
1022 | if test x$support_afterimage = xyes; then |
1035 | echo " AfterImage library: $AFTERIMAGE_LIBS" |
1023 | echo " AfterImage support: yes" |
1036 | fi |
1024 | fi |
1037 | |
1025 | |
1038 | if test x$support_afterstep = xyes; then |
1026 | if test x$support_afterstep = xyes; then |
1039 | echo " With AfterStep integration" |
1027 | echo " AfterStep integration: yes" |
1040 | fi |
1028 | fi |
1041 | |
1029 | |
1042 | if test x$term != x; then |
1030 | if test x$term != x; then |
1043 | echo " set TERM to: $term" |
1031 | echo " set TERM to: $term" |
1044 | fi |
1032 | fi |