… | |
… | |
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 |
… | |
… | |
245 | [ --with-afterimage-config=DIR use libAfterImage config script in DIR], |
241 | [ --with-afterimage-config=DIR use libAfterImage config script in DIR], |
246 | [if test "x$withval" != x; then |
242 | [if test "x$withval" != x; then |
247 | afterimage_config=$withval/afterimage-config |
243 | afterimage_config=$withval/afterimage-config |
248 | fi]) |
244 | fi]) |
249 | |
245 | |
250 | AC_ARG_ENABLE(afterstep, |
246 | dnl AC_ARG_ENABLE(afterstep, |
251 | [ --enable-afterstep enable integration with AfterStep window manager], |
247 | dnl [ --enable-afterstep enable integration with AfterStep window manager], |
252 | [if test x$enableval = xyes -o x$enableval = xno; then |
248 | dnl [if test x$enableval = xyes -o x$enableval = xno; then |
253 | support_afterstep=$enableval |
249 | dnl support_afterstep=$enableval |
254 | fi]) |
250 | dnl fi]) |
255 | |
251 | |
256 | AC_ARG_ENABLE(transparency, |
252 | AC_ARG_ENABLE(transparency, |
257 | [ --enable-transparency enable transparent backgrounds], |
253 | [ --enable-transparency enable transparent backgrounds], |
258 | [if test x$enableval = xyes -o x$enableval = xno; then |
254 | [if test x$enableval = xyes -o x$enableval = xno; then |
259 | support_inheritpixmap=$enableval |
255 | support_inheritpixmap=$enableval |
… | |
… | |
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 | |
|
|
477 | AC_MSG_CHECKING(for libAfterImage) |
472 | AC_MSG_CHECKING(for libAfterImage version >= 1.15) |
478 | if $afterimage_config --version >/dev/null 2>&1 ; then |
473 | AFTERIMAGE_VERSION=`$afterimage_config --version` |
|
|
474 | if test -n "$AFTERIMAGE_VERSION" ; then |
479 | LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` |
475 | AFTERIMAGE_CFLAGS=`$afterimage_config --cflags` |
480 | AFTERIMAGE_LIBS=`$afterimage_config --libs` |
476 | AFTERIMAGE_LIBS=`$afterimage_config --libs` |
481 | if test "x$AFTERIMAGE_LIBS" != "x"; then |
477 | if test "x$AFTERIMAGE_LIBS" != "x"; then |
|
|
478 | libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .` |
|
|
479 | libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .` |
|
|
480 | if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then |
482 | support_afterimage=yes |
481 | support_afterimage=yes |
|
|
482 | fi |
483 | fi |
483 | fi |
484 | fi |
484 | fi |
485 | |
485 | |
486 | if test "x$support_afterimage" = "xyes"; then |
486 | if test "x$support_afterimage" = "xyes"; then |
487 | AC_MSG_RESULT($AFTERIMAGE_LIBS) |
487 | AC_MSG_RESULT($AFTERIMAGE_LIBS) |
… | |
… | |
534 | AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, |
534 | 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])]) |
535 | [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 |
536 | if test x$rxvt_cv_xpointer = xyes; then |
537 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
537 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
538 | fi |
538 | fi |
539 | LIBS=$ac_save_LIBS |
|
|
540 | CFLAGS=$ac_save_CFLAGS |
|
|
541 | |
539 | |
542 | AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, |
540 | AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, |
543 | [AC_COMPILE_IFELSE( |
541 | [AC_COMPILE_IFELSE( |
544 | [AC_LANG_PROGRAM([ |
542 | [AC_LANG_PROGRAM([ |
545 | #define XLIB_ILLEGAL_ACCESS |
543 | #define XLIB_ILLEGAL_ACCESS |
… | |
… | |
806 | |
804 | |
807 | if test x$support_afterimage = xyes; then |
805 | if test x$support_afterimage = xyes; then |
808 | AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) |
806 | AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) |
809 | fi |
807 | fi |
810 | |
808 | |
811 | if test x$support_afterstep = xyes; then |
809 | dnl if test x$support_afterstep = xyes; then |
812 | AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) |
810 | dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) |
813 | fi |
811 | dnl fi |
814 | |
812 | |
815 | if test x$support_scroll_rxvt = xyes; then |
813 | if test x$support_scroll_rxvt = xyes; then |
816 | AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) |
814 | AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) |
817 | scrolltypes="rxvt" |
815 | scrolltypes="rxvt" |
818 | fi |
816 | fi |
… | |
… | |
915 | dnl# Attack the libs |
913 | dnl# Attack the libs |
916 | AC_SUBST(LIBS) |
914 | AC_SUBST(LIBS) |
917 | AC_SUBST(X_LIBS) |
915 | AC_SUBST(X_LIBS) |
918 | AC_SUBST(X_EXTRA_LIBS) |
916 | AC_SUBST(X_EXTRA_LIBS) |
919 | |
917 | |
920 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |
918 | AC_SUBST(AFTERIMAGE_CFLAGS) |
921 | AC_SUBST(AFTERIMAGE_LIBS) |
919 | AC_SUBST(AFTERIMAGE_LIBS) |
922 | |
920 | |
923 | AC_ARG_PROGRAM |
921 | AC_ARG_PROGRAM |
924 | |
922 | |
925 | dnl# test for "sun" or "__sun__" before include sys_ioctl |
923 | dnl# test for "sun" or "__sun__" before include sys_ioctl |
… | |
… | |
969 | |
967 | |
970 | if test x$support_afterimage = xyes; then |
968 | if test x$support_afterimage = xyes; then |
971 | echo " AfterImage support: yes" |
969 | echo " AfterImage support: yes" |
972 | fi |
970 | fi |
973 | |
971 | |
974 | if test x$support_afterstep = xyes; then |
972 | dnl if test x$support_afterstep = xyes; then |
975 | echo " AfterStep integration: yes" |
973 | dnl echo " AfterStep integration: yes" |
976 | fi |
974 | dnl fi |
977 | |
975 | |
978 | if test x$term != x; then |
976 | if test x$term != x; then |
979 | echo " set TERM to: $term" |
977 | echo " set TERM to: $term" |
980 | fi |
978 | fi |
981 | if test x$terminfo != x; then |
979 | if test x$terminfo != x; then |