… | |
… | |
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 |
… | |
… | |
78 | |
74 | |
79 | AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.) |
75 | AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.) |
80 | |
76 | |
81 | case $host in |
77 | case $host in |
82 | *-*-solaris* ) |
78 | *-*-solaris* ) |
83 | AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) |
79 | AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris) |
84 | AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris) |
|
|
85 | AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) |
|
|
86 | ;; |
80 | ;; |
87 | esac |
81 | esac |
88 | |
82 | |
89 | dnl if test x$GXX = xyes; then |
83 | dnl if test x$GXX = xyes; then |
90 | dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... |
84 | dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... |
… | |
… | |
443 | AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" |
437 | AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" |
444 | fi]) |
438 | fi]) |
445 | |
439 | |
446 | dnl# -------------------------------------------------------------------------- |
440 | dnl# -------------------------------------------------------------------------- |
447 | |
441 | |
448 | AC_PATH_PROG(CP, cp, cp) |
|
|
449 | AC_PATH_PROG(SED, sed, sed) |
|
|
450 | AC_PATH_PROG(ECHO, echo, echo) |
|
|
451 | AC_PATH_PROG(TIC, tic) |
442 | AC_PATH_PROG(TIC, tic) |
452 | |
443 | |
453 | dnl# need a neat way to detect SVR4 or its features |
444 | dnl# need a neat way to detect SVR4 or its features |
454 | dnl# in src/command.c we use these functions: |
445 | dnl# in src/command.c we use these functions: |
455 | dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> |
446 | dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> |
… | |
… | |
534 | #include <sys/ioctl.h> |
525 | #include <sys/ioctl.h> |
535 | #ifdef HAVE_TERMIOS_H |
526 | #ifdef HAVE_TERMIOS_H |
536 | #include <termios.h> |
527 | #include <termios.h> |
537 | #endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) |
528 | #endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) |
538 | |
529 | |
539 | dnl# ELF systems may want to store paths for dynamic libraries. |
|
|
540 | dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath" |
|
|
541 | dnl# At least one version of SunOS wants "-R path" but it's not checked yet. |
|
|
542 | if test -n "$GCC"; then |
|
|
543 | LDARG="-Wl," |
|
|
544 | else |
|
|
545 | LDARG="" |
|
|
546 | fi |
|
|
547 | changequote(, )dnl |
|
|
548 | R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-rpath '$LDARG'\1/g' |
|
|
549 | changequote([, ])dnl |
|
|
550 | |
|
|
551 | ac_save_CFLAGS=$CFLAGS |
|
|
552 | ac_save_LIBS=$LIBS |
|
|
553 | CFLAGS="$CFLAGS $X_CFLAGS" |
|
|
554 | LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` |
|
|
555 | AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, |
|
|
556 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
|
|
557 | #include <stdlib.h> |
|
|
558 | main() |
|
|
559 | { |
|
|
560 | exit(0); |
|
|
561 | (void) XOpenDisplay("foobar"); |
|
|
562 | }]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl |
|
|
563 | AC_MSG_WARN(You may need to check the LIBS line)])]) |
|
|
564 | if test x$rxvt_cv_rpath != xyes; then |
|
|
565 | changequote(, )dnl |
|
|
566 | R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' |
|
|
567 | changequote([, ])dnl |
|
|
568 | LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` |
|
|
569 | AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R, |
|
|
570 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
|
|
571 | #include <stdlib.h> |
|
|
572 | main() |
|
|
573 | { |
|
|
574 | exit(0); |
|
|
575 | (void) XOpenDisplay("foobar"); |
|
|
576 | }]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])]) |
|
|
577 | if test x$rxvt_cv_R != xyes; then |
|
|
578 | LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" |
|
|
579 | fi |
|
|
580 | fi |
|
|
581 | |
|
|
582 | AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, |
530 | AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, |
583 | [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) |
531 | [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) |
584 | if test x$rxvt_cv_xpointer = xyes; then |
532 | if test x$rxvt_cv_xpointer = xyes; then |
585 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
533 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
586 | fi |
534 | fi |
587 | LIBS=$ac_save_LIBS |
|
|
588 | CFLAGS=$ac_save_CFLAGS |
|
|
589 | |
535 | |
590 | AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, |
536 | AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, |
591 | [AC_COMPILE_IFELSE( |
537 | [AC_COMPILE_IFELSE( |
592 | [AC_LANG_PROGRAM([ |
538 | [AC_LANG_PROGRAM([ |
593 | #define XLIB_ILLEGAL_ACCESS |
539 | #define XLIB_ILLEGAL_ACCESS |
… | |
… | |
733 | dnl# this is a really hack test for some basic Xlocale stuff |
679 | dnl# this is a really hack test for some basic Xlocale stuff |
734 | ac_save_LIBS=$LIBS |
680 | ac_save_LIBS=$LIBS |
735 | ac_save_CFLAGS=$CFLAGS |
681 | ac_save_CFLAGS=$CFLAGS |
736 | CFLAGS="$CFLAGS $X_CFLAGS" |
682 | CFLAGS="$CFLAGS $X_CFLAGS" |
737 | LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" |
683 | LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" |
738 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
|
|
739 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
|
|
740 | fi |
|
|
741 | AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, |
684 | AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, |
742 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
685 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
743 | #include <stdlib.h> |
686 | #include <stdlib.h> |
744 | main() { |
687 | main() { |
745 | char *p; |
688 | char *p; |
746 | if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) |
689 | if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) |
747 | exit (XSupportsLocale() ? 0 : 1); |
690 | exit (XSupportsLocale() ? 0 : 1); |
748 | else |
691 | else |
749 | exit (1);}]])],[dnl |
692 | exit (1);}]])],[dnl |
750 | rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl |
693 | rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl |
751 | AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) |
694 | :])]) |
|
|
695 | if test x$support_xim = xyes; then |
752 | if test x$rxvt_cv_func_xlocale = xyes; then |
696 | if test x$rxvt_cv_func_xlocale = xyes; then |
753 | AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) |
697 | AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) |
|
|
698 | fi |
754 | fi |
699 | fi |
755 | |
700 | |
756 | AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, |
701 | AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, |
757 | [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 |
702 | [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 |
758 | #include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) |
703 | #include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) |
… | |
… | |
833 | fi |
778 | fi |
834 | if test x$support_tinting = xyes; then |
779 | if test x$support_tinting = xyes; then |
835 | AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) |
780 | AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) |
836 | fi |
781 | fi |
837 | if test x$support_inheritpixmap = xyes; then |
782 | if test x$support_inheritpixmap = xyes; then |
838 | AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) |
783 | AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) |
839 | fi |
784 | fi |
840 | if test x$support_keepscrolling = xno; then |
785 | if test x$support_keepscrolling = xno; then |
841 | AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) |
786 | AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) |
842 | fi |
787 | fi |
843 | if test x$support_selectionscrolling = xyes; then |
788 | if test x$support_selectionscrolling = xyes; then |
844 | AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) |
789 | AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) |
845 | fi |
790 | fi |
846 | if test x$support_frills = xyes; then |
|
|
847 | AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) |
|
|
848 | fi |
|
|
849 | if test x$support_mousewheel = xyes; then |
791 | if test x$support_mousewheel = xyes; then |
850 | AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) |
792 | AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) |
851 | fi |
793 | fi |
852 | if test x$support_mouseslipwheel = xyes; then |
794 | if test x$support_mouseslipwheel = xyes; then |
853 | AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) |
795 | AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) |
854 | fi |
|
|
855 | if test x$support_xim = xyes -o x$multichar_set = xyes; then |
|
|
856 | if test x$rxvt_cv_func_xlocale = xyes; then |
|
|
857 | AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) |
|
|
858 | fi |
|
|
859 | fi |
796 | fi |
860 | if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then |
797 | if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then |
861 | AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage) |
798 | AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage) |
862 | fi |
799 | fi |
863 | |
800 | |
… | |
… | |
958 | |
895 | |
959 | if test x$support_perl = xyes; then |
896 | if test x$support_perl = xyes; then |
960 | support_frills=yes |
897 | support_frills=yes |
961 | fi |
898 | fi |
962 | |
899 | |
|
|
900 | if test x$support_frills = xyes; then |
|
|
901 | AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) |
|
|
902 | fi |
|
|
903 | |
963 | AC_SUBST(CFLAGS) |
904 | AC_SUBST(CFLAGS) |
964 | AC_SUBST(CPPFLAGS) |
905 | AC_SUBST(CPPFLAGS) |
965 | AC_SUBST(LDFLAGS) |
906 | AC_SUBST(LDFLAGS) |
966 | AC_SUBST(X_CFLAGS) |
907 | AC_SUBST(X_CFLAGS) |
967 | |
908 | |
968 | dnl# Attack the libs |
909 | dnl# Attack the libs |
969 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
|
|
970 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
|
|
971 | X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` |
|
|
972 | X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` |
|
|
973 | XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` |
|
|
974 | fi |
|
|
975 | AC_SUBST(LIBS) |
910 | AC_SUBST(LIBS) |
976 | AC_SUBST(X_LIBS) |
911 | AC_SUBST(X_LIBS) |
977 | AC_SUBST(X_EXTRA_LIBS) |
912 | AC_SUBST(X_EXTRA_LIBS) |
978 | |
913 | |
979 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |
914 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |