| … | |
… | |
| 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) |
| … | |
… | |
| 534 | AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, |
535 | 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])]) |
536 | [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 |
537 | if test x$rxvt_cv_xpointer = xyes; then |
| 537 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
538 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
| 538 | fi |
539 | fi |
| 539 | LIBS=$ac_save_LIBS |
|
|
| 540 | CFLAGS=$ac_save_CFLAGS |
|
|
| 541 | |
540 | |
| 542 | AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, |
541 | AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, |
| 543 | [AC_COMPILE_IFELSE( |
542 | [AC_COMPILE_IFELSE( |
| 544 | [AC_LANG_PROGRAM([ |
543 | [AC_LANG_PROGRAM([ |
| 545 | #define XLIB_ILLEGAL_ACCESS |
544 | #define XLIB_ILLEGAL_ACCESS |
| … | |
… | |
| 915 | dnl# Attack the libs |
914 | dnl# Attack the libs |
| 916 | AC_SUBST(LIBS) |
915 | AC_SUBST(LIBS) |
| 917 | AC_SUBST(X_LIBS) |
916 | AC_SUBST(X_LIBS) |
| 918 | AC_SUBST(X_EXTRA_LIBS) |
917 | AC_SUBST(X_EXTRA_LIBS) |
| 919 | |
918 | |
| 920 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |
919 | AC_SUBST(AFTERIMAGE_CFLAGS) |
| 921 | AC_SUBST(AFTERIMAGE_LIBS) |
920 | AC_SUBST(AFTERIMAGE_LIBS) |
| 922 | |
921 | |
| 923 | AC_ARG_PROGRAM |
922 | AC_ARG_PROGRAM |
| 924 | |
923 | |
| 925 | dnl# test for "sun" or "__sun__" before include sys_ioctl |
924 | dnl# test for "sun" or "__sun__" before include sys_ioctl |
