… | |
… | |
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 |
… | |
… | |
464 | dnl# only check if we want xpm-background |
460 | dnl# only check if we want xpm-background |
465 | |
461 | |
466 | LIBAFTERIMAGE_CFLAGS= |
462 | LIBAFTERIMAGE_CFLAGS= |
467 | AFTERIMAGE_LIBS= |
463 | AFTERIMAGE_LIBS= |
468 | have_afterimage= |
464 | have_afterimage= |
|
|
465 | AFTERIMAGE_VERSION= |
469 | |
466 | |
470 | if test x$support_afterimage = xyes; then |
467 | if test x$support_afterimage = xyes; then |
471 | support_afterimage=no |
468 | support_afterimage=no |
472 | |
469 | |
473 | if test "x$afterimage_config" = "x" ; then |
470 | if test "x$afterimage_config" = "x" ; then |
474 | AC_PATH_PROG(afterimage_config, afterimage-config, no) |
471 | AC_PATH_PROG(afterimage_config, afterimage-config, no) |
475 | fi |
472 | fi |
476 | |
473 | AC_PROG_AWK |
477 | AC_MSG_CHECKING(for libAfterImage) |
474 | AC_MSG_CHECKING(for libAfterImage version >= 1.15 ) |
478 | if $afterimage_config --version >/dev/null 2>&1 ; then |
475 | AFTERIMAGE_VERSION=`$afterimage_config --version` |
|
|
476 | if test -n $AFTERIMAGE_VERSION ; then |
479 | LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` |
477 | LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` |
480 | AFTERIMAGE_LIBS=`$afterimage_config --libs` |
478 | AFTERIMAGE_LIBS=`$afterimage_config --libs` |
481 | 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 |
482 | support_afterimage=yes |
483 | support_afterimage=yes; |
|
|
484 | fi |
483 | fi |
485 | fi |
484 | fi |
486 | fi |
485 | |
487 | |
486 | if test "x$support_afterimage" = "xyes"; then |
488 | if test "x$support_afterimage" = "xyes"; then |
487 | AC_MSG_RESULT($AFTERIMAGE_LIBS) |
489 | AC_MSG_RESULT($AFTERIMAGE_LIBS) |
… | |
… | |
534 | AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, |
536 | AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, |
535 | [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])]) |
536 | if test x$rxvt_cv_xpointer = xyes; then |
538 | if test x$rxvt_cv_xpointer = xyes; then |
537 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
539 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
538 | fi |
540 | fi |
539 | LIBS=$ac_save_LIBS |
|
|
540 | CFLAGS=$ac_save_CFLAGS |
|
|
541 | |
541 | |
542 | AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, |
542 | AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, |
543 | [AC_COMPILE_IFELSE( |
543 | [AC_COMPILE_IFELSE( |
544 | [AC_LANG_PROGRAM([ |
544 | [AC_LANG_PROGRAM([ |
545 | #define XLIB_ILLEGAL_ACCESS |
545 | #define XLIB_ILLEGAL_ACCESS |
… | |
… | |
884 | PERL_O=rxvtperl.o |
884 | PERL_O=rxvtperl.o |
885 | PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" |
885 | PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" |
886 | PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" |
886 | PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" |
887 | PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" |
887 | PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" |
888 | else |
888 | else |
889 | AC_MSG_ERROR([no, unable to link]) |
889 | AC_MSG_RESULT([no, unable to link]) |
|
|
890 | rxvt_perl_link=no |
890 | fi |
891 | fi |
891 | else |
892 | else |
892 | 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 |
893 | fi |
895 | fi |
894 | fi |
896 | fi |
895 | AC_SUBST(PERLLIB) |
897 | AC_SUBST(PERLLIB) |
896 | AC_SUBST(PERLFLAGS) |
898 | AC_SUBST(PERLFLAGS) |
897 | AC_SUBST(PERLPRIVLIBEXP) |
899 | AC_SUBST(PERLPRIVLIBEXP) |