… | |
… | |
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 | [ |
51 | [AC_MSG_RESULT(ok)], |
52 | AC_MSG_RESULT(ok) |
|
|
53 | CXXLIB="-lsupc++" |
|
|
54 | ], |
52 | [ |
55 | [ |
53 | AC_MSG_RESULT([no, making everything bigger and slower]) |
56 | AC_MSG_RESULT([no, making everything bigger and slower]) |
54 | LIBS="$save_LIBS" |
57 | LIBS="$save_LIBS" |
55 | LINKER="$save_CXX" |
58 | LINKER="$save_CXX" |
56 | ] |
59 | ] |
57 | ) |
60 | ) |
58 | CXX="$save_CXX" |
61 | CXX="$save_CXX" |
59 | fi |
62 | fi |
60 | AC_SUBST(LINKER,[$LINKER]) |
63 | AC_SUBST(LINKER,[$LINKER]) |
|
|
64 | AC_SUBST(CXXLIB) |
61 | |
65 | |
62 | dnl# -------------------------------------------------------------------------- |
66 | dnl# -------------------------------------------------------------------------- |
63 | dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' |
67 | dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' |
64 | dnl# |
68 | dnl# |
65 | if test -z "$orig_CXXFLAGS"; then |
69 | if test -z "$orig_CXXFLAGS"; then |
… | |
… | |
239 | support_afterimage=$enableval |
243 | support_afterimage=$enableval |
240 | fi]) |
244 | fi]) |
241 | |
245 | |
242 | AC_ARG_WITH(afterimage_config, |
246 | AC_ARG_WITH(afterimage_config, |
243 | [ --with-afterimage-config=DIR use libAfterImage config script in DIR], |
247 | [ --with-afterimage-config=DIR use libAfterImage config script in DIR], |
244 | [afterimage_config="$withval"]) |
248 | [if test "x$withval" != x; then |
|
|
249 | afterimage_config=$withval/afterimage-config |
|
|
250 | fi]) |
245 | |
251 | |
246 | AC_ARG_ENABLE(afterstep, |
252 | AC_ARG_ENABLE(afterstep, |
247 | [ --enable-afterstep enable integration with AfterStep window manager], |
253 | [ --enable-afterstep enable integration with AfterStep window manager], |
248 | [if test x$enableval = xyes -o x$enableval = xno; then |
254 | [if test x$enableval = xyes -o x$enableval = xno; then |
249 | support_afterstep=$enableval |
255 | support_afterstep=$enableval |
… | |
… | |
437 | AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" |
443 | AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" |
438 | fi]) |
444 | fi]) |
439 | |
445 | |
440 | dnl# -------------------------------------------------------------------------- |
446 | dnl# -------------------------------------------------------------------------- |
441 | |
447 | |
442 | AC_PATH_PROG(MV, mv, mv) |
|
|
443 | AC_PATH_PROG(CP, cp, cp) |
|
|
444 | AC_PATH_PROG(LN, ln, ln) |
|
|
445 | AC_PATH_PROG(SED, sed, sed) |
|
|
446 | AC_PATH_PROG(ECHO, echo, echo) |
|
|
447 | AC_PATH_PROG(CMP, cmp, cmp) |
|
|
448 | AC_PATH_PROG(TIC, tic) |
448 | AC_PATH_PROG(TIC, tic) |
449 | |
449 | |
450 | dnl# need a neat way to detect SVR4 or its features |
450 | dnl# need a neat way to detect SVR4 or its features |
451 | dnl# in src/command.c we use these functions: |
451 | dnl# in src/command.c we use these functions: |
452 | dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> |
452 | dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> |
… | |
… | |
467 | |
467 | |
468 | LIBAFTERIMAGE_CFLAGS= |
468 | LIBAFTERIMAGE_CFLAGS= |
469 | AFTERIMAGE_LIBS= |
469 | AFTERIMAGE_LIBS= |
470 | have_afterimage= |
470 | have_afterimage= |
471 | |
471 | |
472 | if test x$support_afterimage == xyes; then |
472 | if test x$support_afterimage = xyes; then |
473 | AC_MSG_CHECKING(installed libAfterImage) |
|
|
474 | support_afterimage=no |
473 | support_afterimage=no |
|
|
474 | |
475 | if test "x$afterimage_config" = "x" ; then |
475 | if test "x$afterimage_config" = "x" ; then |
476 | if afterimage-config --version > /dev/null 2>&1 ; then |
476 | AC_PATH_PROG(afterimage_config, afterimage-config, no) |
477 | afterimage_config=afterimage-config |
477 | fi |
478 | else |
478 | |
479 | if test -x /usr/local/bin/afterimage-config; then |
479 | AC_MSG_CHECKING(for libAfterImage) |
480 | afterimage_config=/usr/local/bin/afterimage-config |
|
|
481 | fi |
|
|
482 | fi |
|
|
483 | else |
|
|
484 | afterimage_config=$afterimage_config/afterimage-config |
|
|
485 | fi |
|
|
486 | if $afterimage_config --version > /dev/null 2>&1 ; then |
480 | if $afterimage_config --version >/dev/null 2>&1 ; then |
487 | LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` |
481 | LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` |
488 | AFTERIMAGE_LIBS=`$afterimage_config --libs` |
482 | AFTERIMAGE_LIBS=`$afterimage_config --libs` |
489 | if test "x$AFTERIMAGE_LIBS" != "x"; then |
483 | if test "x$AFTERIMAGE_LIBS" != "x"; then |
490 | support_afterimage=yes |
484 | support_afterimage=yes |
491 | fi |
485 | fi |
492 | fi |
486 | fi |
493 | |
487 | |
494 | if test "x$support_afterimage" = "xyes"; then |
488 | if test "x$support_afterimage" = "xyes"; then |
495 | AC_MSG_RESULT($AFTERIMAGE_LIBS) |
489 | AC_MSG_RESULT($AFTERIMAGE_LIBS) |
496 | else |
490 | else |
497 | AC_MSG_RESULT(afterimage-config not found in $afterimage_config - can't use libAfterImage for images.) |
491 | AC_MSG_RESULT(no) |
498 | fi |
492 | fi |
499 | fi |
493 | fi |
500 | |
494 | |
501 | if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then |
495 | if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then |
502 | VT_FIND_LIBXPM |
496 | VT_FIND_LIBXPM |
503 | if test x$no_xpm = xyes; then |
497 | if test x$no_xpm = xyes; then |
… | |
… | |
961 | |
955 | |
962 | if test x$support_perl = xyes; then |
956 | if test x$support_perl = xyes; then |
963 | support_frills=yes |
957 | support_frills=yes |
964 | fi |
958 | fi |
965 | |
959 | |
966 | AC_SUBST(DEBUG) |
|
|
967 | AC_SUBST(DINCLUDE) |
|
|
968 | AC_SUBST(CFLAGS) |
960 | AC_SUBST(CFLAGS) |
969 | AC_SUBST(CPPFLAGS) |
961 | AC_SUBST(CPPFLAGS) |
970 | AC_SUBST(LDFLAGS) |
962 | AC_SUBST(LDFLAGS) |
971 | AC_SUBST(X_CFLAGS) |
963 | AC_SUBST(X_CFLAGS) |
972 | |
964 | |
973 | dnl# Attack the libs |
965 | dnl# Attack the libs |
974 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
966 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
975 | DLIB=`echo $DLIB | sed "$R_TRANSLATE"` |
|
|
976 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
967 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
977 | X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` |
968 | X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` |
978 | X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` |
969 | X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` |
979 | XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` |
970 | XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` |
980 | fi |
971 | fi |
981 | AC_SUBST(DLIB) |
|
|
982 | AC_SUBST(LIBS) |
972 | AC_SUBST(LIBS) |
983 | AC_SUBST(X_LIBS) |
973 | AC_SUBST(X_LIBS) |
984 | AC_SUBST(X_EXTRA_LIBS) |
974 | AC_SUBST(X_EXTRA_LIBS) |
985 | |
975 | |
986 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |
976 | AC_SUBST(LIBAFTERIMAGE_CFLAGS) |
… | |
… | |
1032 | if test x$support_xpm = xyes; then |
1022 | if test x$support_xpm = xyes; then |
1033 | echo " Xpm library: $XPM_LIBS" |
1023 | echo " Xpm library: $XPM_LIBS" |
1034 | fi |
1024 | fi |
1035 | |
1025 | |
1036 | if test x$support_afterimage = xyes; then |
1026 | if test x$support_afterimage = xyes; then |
1037 | echo " AfterImage library: $AFTERIMAGE_LIBS" |
1027 | echo " AfterImage support: yes" |
1038 | fi |
1028 | fi |
1039 | |
1029 | |
1040 | if test x$support_afterstep = xyes; then |
1030 | if test x$support_afterstep = xyes; then |
1041 | echo " With AfterStep integration" |
1031 | echo " AfterStep integration: yes" |
1042 | fi |
1032 | fi |
1043 | |
1033 | |
1044 | if test x$term != x; then |
1034 | if test x$term != x; then |
1045 | echo " set TERM to: $term" |
1035 | echo " set TERM to: $term" |
1046 | fi |
1036 | fi |