… | |
… | |
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 |
… | |
… | |
461 | AC_PATH_XTRA |
457 | AC_PATH_XTRA |
462 | |
458 | |
463 | dnl# the only reasonable way to find libXpm is do-it-yourself |
459 | dnl# the only reasonable way to find libXpm is do-it-yourself |
464 | dnl# only check if we want xpm-background |
460 | dnl# only check if we want xpm-background |
465 | |
461 | |
466 | LIBAFTERIMAGE_CFLAGS= |
462 | AFTERIMAGE_CFLAGS= |
467 | AFTERIMAGE_LIBS= |
463 | AFTERIMAGE_LIBS= |
468 | have_afterimage= |
464 | AFTERIMAGE_VERSION= |
469 | |
465 | |
470 | if test x$support_afterimage = xyes; then |
466 | if test x$support_afterimage = xyes; then |
471 | support_afterimage=no |
467 | support_afterimage=no |
472 | |
468 | |
473 | if test "x$afterimage_config" = "x" ; then |
469 | if test "x$afterimage_config" = "x" ; then |
474 | AC_PATH_PROG(afterimage_config, afterimage-config, no) |
470 | AC_PATH_PROG(afterimage_config, afterimage-config, no) |
475 | fi |
471 | fi |
476 | |
472 | AC_PROG_AWK |
477 | AC_MSG_CHECKING(for libAfterImage) |
473 | AC_MSG_CHECKING(for libAfterImage version >= 1.15) |
478 | if $afterimage_config --version >/dev/null 2>&1 ; then |
474 | AFTERIMAGE_VERSION=`$afterimage_config --version` |
|
|
475 | if test -n $AFTERIMAGE_VERSION ; then |
479 | LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` |
476 | AFTERIMAGE_CFLAGS=`$afterimage_config --cflags` |
480 | AFTERIMAGE_LIBS=`$afterimage_config --libs` |
477 | AFTERIMAGE_LIBS=`$afterimage_config --libs` |
481 | if test "x$AFTERIMAGE_LIBS" != "x"; then |
478 | if test "x$AFTERIMAGE_LIBS" != "x"; then |
|
|
479 | libai_ver_major=`echo $AFTERIMAGE_VERSION | $AWK -F . '{print $1}'` |
|
|
480 | libai_ver_minor=`echo $AFTERIMAGE_VERSION | $AWK -F . '{print $2}'` |
|
|
481 | if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then |
482 | support_afterimage=yes |
482 | support_afterimage=yes |
|
|
483 | fi |
483 | fi |
484 | fi |
484 | fi |
485 | fi |
485 | |
486 | |
486 | if test "x$support_afterimage" = "xyes"; then |
487 | if test "x$support_afterimage" = "xyes"; then |
487 | AC_MSG_RESULT($AFTERIMAGE_LIBS) |
488 | AC_MSG_RESULT($AFTERIMAGE_LIBS) |
… | |
… | |
529 | #include <sys/ioctl.h> |
530 | #include <sys/ioctl.h> |
530 | #ifdef HAVE_TERMIOS_H |
531 | #ifdef HAVE_TERMIOS_H |
531 | #include <termios.h> |
532 | #include <termios.h> |
532 | #endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) |
533 | #endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) |
533 | |
534 | |
534 | dnl# ELF systems may want to store paths for dynamic libraries. |
|
|
535 | dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath" |
|
|
536 | dnl# At least one version of SunOS wants "-R path" but it's not checked yet. |
|
|
537 | if test -n "$GCC"; then |
|
|
538 | LDARG="-Wl," |
|
|
539 | else |
|
|
540 | LDARG="" |
|
|
541 | fi |
|
|
542 | changequote(, )dnl |
|
|
543 | R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-rpath '$LDARG'\1/g' |
|
|
544 | changequote([, ])dnl |
|
|
545 | |
|
|
546 | ac_save_CFLAGS=$CFLAGS |
|
|
547 | ac_save_LIBS=$LIBS |
|
|
548 | CFLAGS="$CFLAGS $X_CFLAGS" |
|
|
549 | LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` |
|
|
550 | AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, |
|
|
551 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
|
|
552 | #include <stdlib.h> |
|
|
553 | main() |
|
|
554 | { |
|
|
555 | exit(0); |
|
|
556 | (void) XOpenDisplay("foobar"); |
|
|
557 | }]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl |
|
|
558 | AC_MSG_WARN(You may need to check the LIBS line)])]) |
|
|
559 | if test x$rxvt_cv_rpath != xyes; then |
|
|
560 | changequote(, )dnl |
|
|
561 | R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' |
|
|
562 | changequote([, ])dnl |
|
|
563 | LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` |
|
|
564 | AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R, |
|
|
565 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
|
|
566 | #include <stdlib.h> |
|
|
567 | main() |
|
|
568 | { |
|
|
569 | exit(0); |
|
|
570 | (void) XOpenDisplay("foobar"); |
|
|
571 | }]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])]) |
|
|
572 | if test x$rxvt_cv_R != xyes; then |
|
|
573 | LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" |
|
|
574 | fi |
|
|
575 | fi |
|
|
576 | |
|
|
577 | AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, |
535 | AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, |
578 | [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) |
536 | [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) |
579 | if test x$rxvt_cv_xpointer = xyes; then |
537 | if test x$rxvt_cv_xpointer = xyes; then |
580 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
538 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
581 | fi |
539 | fi |
582 | LIBS=$ac_save_LIBS |
|
|
583 | CFLAGS=$ac_save_CFLAGS |
|
|
584 | |
540 | |
585 | AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, |
541 | AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, |
586 | [AC_COMPILE_IFELSE( |
542 | [AC_COMPILE_IFELSE( |
587 | [AC_LANG_PROGRAM([ |
543 | [AC_LANG_PROGRAM([ |
588 | #define XLIB_ILLEGAL_ACCESS |
544 | #define XLIB_ILLEGAL_ACCESS |
… | |
… | |
728 | dnl# this is a really hack test for some basic Xlocale stuff |
684 | dnl# this is a really hack test for some basic Xlocale stuff |
729 | ac_save_LIBS=$LIBS |
685 | ac_save_LIBS=$LIBS |
730 | ac_save_CFLAGS=$CFLAGS |
686 | ac_save_CFLAGS=$CFLAGS |
731 | CFLAGS="$CFLAGS $X_CFLAGS" |
687 | CFLAGS="$CFLAGS $X_CFLAGS" |
732 | LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" |
688 | LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" |
733 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
|
|
734 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
|
|
735 | fi |
|
|
736 | AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, |
689 | AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, |
737 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
690 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
738 | #include <stdlib.h> |
691 | #include <stdlib.h> |
739 | main() { |
692 | main() { |
740 | char *p; |
693 | char *p; |
… | |
… | |
838 | AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) |
791 | AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) |
839 | fi |
792 | fi |
840 | if test x$support_selectionscrolling = xyes; then |
793 | if test x$support_selectionscrolling = xyes; then |
841 | AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) |
794 | AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) |
842 | fi |
795 | fi |
843 | if test x$support_frills = xyes; then |
|
|
844 | AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) |
|
|
845 | fi |
|
|
846 | if test x$support_mousewheel = xyes; then |
796 | if test x$support_mousewheel = xyes; then |
847 | AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) |
797 | AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) |
848 | fi |
798 | fi |
849 | if test x$support_mouseslipwheel = xyes; then |
799 | if test x$support_mouseslipwheel = xyes; then |
850 | AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) |
800 | AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) |
… | |
… | |
950 | |
900 | |
951 | if test x$support_perl = xyes; then |
901 | if test x$support_perl = xyes; then |
952 | support_frills=yes |
902 | support_frills=yes |
953 | fi |
903 | fi |
954 | |
904 | |
|
|
905 | if test x$support_frills = xyes; then |
|
|
906 | AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) |
|
|
907 | fi |
|
|
908 | |
955 | AC_SUBST(CFLAGS) |
909 | AC_SUBST(CFLAGS) |
956 | AC_SUBST(CPPFLAGS) |
910 | AC_SUBST(CPPFLAGS) |
957 | AC_SUBST(LDFLAGS) |
911 | AC_SUBST(LDFLAGS) |
958 | AC_SUBST(X_CFLAGS) |
912 | AC_SUBST(X_CFLAGS) |
959 | |
913 | |
960 | dnl# Attack the libs |
914 | dnl# Attack the libs |
961 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
|
|
962 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
|
|
963 | X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` |
|
|
964 | X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` |
|
|
965 | XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` |
|
|
966 | fi |
|
|
967 | AC_SUBST(LIBS) |
915 | AC_SUBST(LIBS) |
968 | AC_SUBST(X_LIBS) |
916 | AC_SUBST(X_LIBS) |
969 | AC_SUBST(X_EXTRA_LIBS) |
917 | AC_SUBST(X_EXTRA_LIBS) |
970 | |
918 | |
971 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |
919 | AC_SUBST(AFTERIMAGE_CFLAGS) |
972 | AC_SUBST(AFTERIMAGE_LIBS) |
920 | AC_SUBST(AFTERIMAGE_LIBS) |
973 | |
921 | |
974 | AC_ARG_PROGRAM |
922 | AC_ARG_PROGRAM |
975 | |
923 | |
976 | dnl# test for "sun" or "__sun__" before include sys_ioctl |
924 | dnl# test for "sun" or "__sun__" before include sys_ioctl |