… | |
… | |
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... |
… | |
… | |
466 | dnl# only check if we want xpm-background |
460 | dnl# only check if we want xpm-background |
467 | |
461 | |
468 | LIBAFTERIMAGE_CFLAGS= |
462 | LIBAFTERIMAGE_CFLAGS= |
469 | AFTERIMAGE_LIBS= |
463 | AFTERIMAGE_LIBS= |
470 | have_afterimage= |
464 | have_afterimage= |
|
|
465 | AFTERIMAGE_VERSION= |
471 | |
466 | |
472 | if test x$support_afterimage = xyes; then |
467 | if test x$support_afterimage = xyes; then |
473 | support_afterimage=no |
468 | support_afterimage=no |
474 | |
469 | |
475 | if test "x$afterimage_config" = "x" ; then |
470 | if test "x$afterimage_config" = "x" ; then |
476 | AC_PATH_PROG(afterimage_config, afterimage-config, no) |
471 | AC_PATH_PROG(afterimage_config, afterimage-config, no) |
477 | fi |
472 | fi |
478 | |
473 | AC_PROG_AWK |
479 | AC_MSG_CHECKING(for libAfterImage) |
474 | AC_MSG_CHECKING(for libAfterImage version >= 1.15 ) |
480 | if $afterimage_config --version >/dev/null 2>&1 ; then |
475 | AFTERIMAGE_VERSION=`$afterimage_config --version` |
|
|
476 | if test -n $AFTERIMAGE_VERSION ; then |
481 | LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` |
477 | LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` |
482 | AFTERIMAGE_LIBS=`$afterimage_config --libs` |
478 | AFTERIMAGE_LIBS=`$afterimage_config --libs` |
483 | if test "x$AFTERIMAGE_LIBS" != "x"; then |
479 | if test "x$AFTERIMAGE_LIBS" != "x"; then |
|
|
480 | libai_ver_major=`echo $AFTERIMAGE_VERSION | $AWK -F . '{print $1}'` |
|
|
481 | libai_ver_minor=`echo $AFTERIMAGE_VERSION | $AWK -F . '{print $2}'` |
|
|
482 | if test "$libai_ver_major -gt 1 -o ($libai_ver_major -eq 1 -a $libai_ver_minor -ge 15)"; then |
484 | support_afterimage=yes |
483 | support_afterimage=yes; |
|
|
484 | fi |
485 | fi |
485 | fi |
486 | fi |
486 | fi |
487 | |
487 | |
488 | if test "x$support_afterimage" = "xyes"; then |
488 | if test "x$support_afterimage" = "xyes"; then |
489 | AC_MSG_RESULT($AFTERIMAGE_LIBS) |
489 | AC_MSG_RESULT($AFTERIMAGE_LIBS) |
… | |
… | |
531 | #include <sys/ioctl.h> |
531 | #include <sys/ioctl.h> |
532 | #ifdef HAVE_TERMIOS_H |
532 | #ifdef HAVE_TERMIOS_H |
533 | #include <termios.h> |
533 | #include <termios.h> |
534 | #endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) |
534 | #endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) |
535 | |
535 | |
536 | dnl# ELF systems may want to store paths for dynamic libraries. |
|
|
537 | dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath" |
|
|
538 | dnl# At least one version of SunOS wants "-R path" but it's not checked yet. |
|
|
539 | if test -n "$GCC"; then |
|
|
540 | LDARG="-Wl," |
|
|
541 | else |
|
|
542 | LDARG="" |
|
|
543 | fi |
|
|
544 | changequote(, )dnl |
|
|
545 | R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-rpath '$LDARG'\1/g' |
|
|
546 | changequote([, ])dnl |
|
|
547 | |
|
|
548 | ac_save_CFLAGS=$CFLAGS |
|
|
549 | ac_save_LIBS=$LIBS |
|
|
550 | CFLAGS="$CFLAGS $X_CFLAGS" |
|
|
551 | LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` |
|
|
552 | AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, |
|
|
553 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
|
|
554 | #include <stdlib.h> |
|
|
555 | main() |
|
|
556 | { |
|
|
557 | exit(0); |
|
|
558 | (void) XOpenDisplay("foobar"); |
|
|
559 | }]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl |
|
|
560 | AC_MSG_WARN(You may need to check the LIBS line)])]) |
|
|
561 | if test x$rxvt_cv_rpath != xyes; then |
|
|
562 | changequote(, )dnl |
|
|
563 | R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' |
|
|
564 | changequote([, ])dnl |
|
|
565 | LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` |
|
|
566 | AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R, |
|
|
567 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
|
|
568 | #include <stdlib.h> |
|
|
569 | main() |
|
|
570 | { |
|
|
571 | exit(0); |
|
|
572 | (void) XOpenDisplay("foobar"); |
|
|
573 | }]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])]) |
|
|
574 | if test x$rxvt_cv_R != xyes; then |
|
|
575 | LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" |
|
|
576 | fi |
|
|
577 | fi |
|
|
578 | |
|
|
579 | AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, |
536 | AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, |
580 | [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) |
537 | [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) |
581 | if test x$rxvt_cv_xpointer = xyes; then |
538 | if test x$rxvt_cv_xpointer = xyes; then |
582 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
539 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
583 | fi |
540 | fi |
584 | LIBS=$ac_save_LIBS |
|
|
585 | CFLAGS=$ac_save_CFLAGS |
|
|
586 | |
541 | |
587 | AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, |
542 | AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, |
588 | [AC_COMPILE_IFELSE( |
543 | [AC_COMPILE_IFELSE( |
589 | [AC_LANG_PROGRAM([ |
544 | [AC_LANG_PROGRAM([ |
590 | #define XLIB_ILLEGAL_ACCESS |
545 | #define XLIB_ILLEGAL_ACCESS |
… | |
… | |
730 | dnl# this is a really hack test for some basic Xlocale stuff |
685 | dnl# this is a really hack test for some basic Xlocale stuff |
731 | ac_save_LIBS=$LIBS |
686 | ac_save_LIBS=$LIBS |
732 | ac_save_CFLAGS=$CFLAGS |
687 | ac_save_CFLAGS=$CFLAGS |
733 | CFLAGS="$CFLAGS $X_CFLAGS" |
688 | CFLAGS="$CFLAGS $X_CFLAGS" |
734 | LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" |
689 | LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" |
735 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
|
|
736 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
|
|
737 | fi |
|
|
738 | AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, |
690 | AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, |
739 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
691 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
740 | #include <stdlib.h> |
692 | #include <stdlib.h> |
741 | main() { |
693 | main() { |
742 | char *p; |
694 | char *p; |
… | |
… | |
744 | exit (XSupportsLocale() ? 0 : 1); |
696 | exit (XSupportsLocale() ? 0 : 1); |
745 | else |
697 | else |
746 | exit (1);}]])],[dnl |
698 | exit (1);}]])],[dnl |
747 | rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl |
699 | rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl |
748 | :])]) |
700 | :])]) |
|
|
701 | if test x$support_xim = xyes; then |
|
|
702 | if test x$rxvt_cv_func_xlocale = xyes; then |
|
|
703 | AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) |
|
|
704 | fi |
|
|
705 | fi |
749 | |
706 | |
750 | AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, |
707 | AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, |
751 | [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 |
708 | [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 |
752 | #include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) |
709 | #include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) |
753 | if test x$rxvt_cv_func_xsetlocale = xyes; then |
710 | if test x$rxvt_cv_func_xsetlocale = xyes; then |
… | |
… | |
827 | fi |
784 | fi |
828 | if test x$support_tinting = xyes; then |
785 | if test x$support_tinting = xyes; then |
829 | AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) |
786 | AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) |
830 | fi |
787 | fi |
831 | if test x$support_inheritpixmap = xyes; then |
788 | if test x$support_inheritpixmap = xyes; then |
832 | AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) |
789 | AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) |
833 | fi |
790 | fi |
834 | if test x$support_keepscrolling = xno; then |
791 | if test x$support_keepscrolling = xno; then |
835 | AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) |
792 | AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) |
836 | fi |
793 | fi |
837 | if test x$support_selectionscrolling = xyes; then |
794 | if test x$support_selectionscrolling = xyes; then |
838 | AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) |
795 | AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) |
839 | fi |
796 | fi |
840 | if test x$support_frills = xyes; then |
|
|
841 | AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) |
|
|
842 | fi |
|
|
843 | if test x$support_mousewheel = xyes; then |
797 | if test x$support_mousewheel = xyes; then |
844 | AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) |
798 | AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) |
845 | fi |
799 | fi |
846 | if test x$support_mouseslipwheel = xyes; then |
800 | if test x$support_mouseslipwheel = xyes; then |
847 | AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) |
801 | AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) |
848 | fi |
|
|
849 | if test x$support_xim = xyes -o x$multichar_set = xyes; then |
|
|
850 | if test x$rxvt_cv_func_xlocale = xyes; then |
|
|
851 | AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) |
|
|
852 | fi |
|
|
853 | fi |
802 | fi |
854 | if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then |
803 | if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then |
855 | AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage) |
804 | AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage) |
856 | fi |
805 | fi |
857 | |
806 | |
… | |
… | |
935 | PERL_O=rxvtperl.o |
884 | PERL_O=rxvtperl.o |
936 | PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" |
885 | PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" |
937 | PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" |
886 | PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" |
938 | PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" |
887 | PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" |
939 | else |
888 | else |
940 | AC_MSG_ERROR([no, unable to link]) |
889 | AC_MSG_RESULT([no, unable to link]) |
|
|
890 | rxvt_perl_link=no |
941 | fi |
891 | fi |
942 | else |
892 | else |
943 | AC_MSG_ERROR([no working perl found, or perl not version >= 5.8]) |
893 | AC_MSG_RESULT([no working perl found, or perl not version >= 5.8]) |
|
|
894 | support_perl=no |
944 | fi |
895 | fi |
945 | fi |
896 | fi |
946 | AC_SUBST(PERLLIB) |
897 | AC_SUBST(PERLLIB) |
947 | AC_SUBST(PERLFLAGS) |
898 | AC_SUBST(PERLFLAGS) |
948 | AC_SUBST(PERLPRIVLIBEXP) |
899 | AC_SUBST(PERLPRIVLIBEXP) |
… | |
… | |
952 | |
903 | |
953 | if test x$support_perl = xyes; then |
904 | if test x$support_perl = xyes; then |
954 | support_frills=yes |
905 | support_frills=yes |
955 | fi |
906 | fi |
956 | |
907 | |
|
|
908 | if test x$support_frills = xyes; then |
|
|
909 | AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) |
|
|
910 | fi |
|
|
911 | |
957 | AC_SUBST(CFLAGS) |
912 | AC_SUBST(CFLAGS) |
958 | AC_SUBST(CPPFLAGS) |
913 | AC_SUBST(CPPFLAGS) |
959 | AC_SUBST(LDFLAGS) |
914 | AC_SUBST(LDFLAGS) |
960 | AC_SUBST(X_CFLAGS) |
915 | AC_SUBST(X_CFLAGS) |
961 | |
916 | |
962 | dnl# Attack the libs |
917 | dnl# Attack the libs |
963 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
|
|
964 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
|
|
965 | X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` |
|
|
966 | X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` |
|
|
967 | XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` |
|
|
968 | fi |
|
|
969 | AC_SUBST(LIBS) |
918 | AC_SUBST(LIBS) |
970 | AC_SUBST(X_LIBS) |
919 | AC_SUBST(X_LIBS) |
971 | AC_SUBST(X_EXTRA_LIBS) |
920 | AC_SUBST(X_EXTRA_LIBS) |
972 | |
921 | |
973 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |
922 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |