ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/configure.ac
(Generate patch)

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.44 by ayin, Sat Jun 9 11:27:43 2007 UTC vs.
Revision 1.51 by ayin, Wed Jun 13 12:34:32 2007 UTC

… …
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"
59fi 62fi
60AC_SUBST(LINKER,[$LINKER]) 63AC_SUBST(LINKER,[$LINKER])
64AC_SUBST(CXXLIB)
61 65
62dnl# -------------------------------------------------------------------------- 66dnl# --------------------------------------------------------------------------
63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 67dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
64dnl# 68dnl#
65if test -z "$orig_CXXFLAGS"; then 69if test -z "$orig_CXXFLAGS"; then
… …
239 support_afterimage=$enableval 243 support_afterimage=$enableval
240 fi]) 244 fi])
241 245
242AC_ARG_WITH(afterimage_config, 246AC_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
246AC_ARG_ENABLE(afterstep, 252AC_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
440dnl# -------------------------------------------------------------------------- 446dnl# --------------------------------------------------------------------------
441 447
442AC_PATH_PROG(MV, mv, mv)
443AC_PATH_PROG(CP, cp, cp) 448AC_PATH_PROG(CP, cp, cp)
444AC_PATH_PROG(LN, ln, ln)
445AC_PATH_PROG(SED, sed, sed) 449AC_PATH_PROG(SED, sed, sed)
446AC_PATH_PROG(ECHO, echo, echo) 450AC_PATH_PROG(ECHO, echo, echo)
447AC_PATH_PROG(CMP, cmp, cmp)
448AC_PATH_PROG(TIC, tic) 451AC_PATH_PROG(TIC, tic)
449 452
450dnl# need a neat way to detect SVR4 or its features 453dnl# need a neat way to detect SVR4 or its features
451dnl# in src/command.c we use these functions: 454dnl# in src/command.c we use these functions:
452dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 455dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
… …
468LIBAFTERIMAGE_CFLAGS= 471LIBAFTERIMAGE_CFLAGS=
469AFTERIMAGE_LIBS= 472AFTERIMAGE_LIBS=
470have_afterimage= 473have_afterimage=
471 474
472if test x$support_afterimage = xyes; then 475if test x$support_afterimage = xyes; then
473 AC_MSG_CHECKING(installed libAfterImage)
474 support_afterimage=no 476 support_afterimage=no
477
475 if test "x$afterimage_config" = "x" ; then 478 if test "x$afterimage_config" = "x" ; then
476 AC_PATH_PROG(afterimage_config, afterimage-config, no) 479 AC_PATH_PROG(afterimage_config, afterimage-config, no)
477 else
478 afterimage_config=$afterimage_config/afterimage-config
479 fi 480 fi
481
482 AC_MSG_CHECKING(for libAfterImage)
480 if $afterimage_config --version > /dev/null 2>&1 ; then 483 if $afterimage_config --version >/dev/null 2>&1 ; then
481 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 484 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
482 AFTERIMAGE_LIBS=`$afterimage_config --libs` 485 AFTERIMAGE_LIBS=`$afterimage_config --libs`
483 if test "x$AFTERIMAGE_LIBS" != "x"; then 486 if test "x$AFTERIMAGE_LIBS" != "x"; then
484 support_afterimage=yes 487 support_afterimage=yes
485 fi 488 fi
486 fi 489 fi
487 490
488 if test "x$support_afterimage" = "xyes"; then 491 if test "x$support_afterimage" = "xyes"; then
489 AC_MSG_RESULT($AFTERIMAGE_LIBS) 492 AC_MSG_RESULT($AFTERIMAGE_LIBS)
490 else 493 else
491 AC_MSG_RESULT(afterimage-config not found - can't use libAfterImage for images.) 494 AC_MSG_RESULT(no)
492 fi 495 fi
493fi 496fi
494 497
495if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then 498if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
496 VT_FIND_LIBXPM 499 VT_FIND_LIBXPM
… …
955 958
956if test x$support_perl = xyes; then 959if test x$support_perl = xyes; then
957 support_frills=yes 960 support_frills=yes
958fi 961fi
959 962
960AC_SUBST(DEBUG)
961AC_SUBST(DINCLUDE)
962AC_SUBST(CFLAGS) 963AC_SUBST(CFLAGS)
963AC_SUBST(CPPFLAGS) 964AC_SUBST(CPPFLAGS)
964AC_SUBST(LDFLAGS) 965AC_SUBST(LDFLAGS)
965AC_SUBST(X_CFLAGS) 966AC_SUBST(X_CFLAGS)
966 967
967dnl# Attack the libs 968dnl# Attack the libs
968if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 969if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
969 DLIB=`echo $DLIB | sed "$R_TRANSLATE"`
970 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 970 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
971 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` 971 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
972 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` 972 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
973 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` 973 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
974fi 974fi
975AC_SUBST(DLIB)
976AC_SUBST(LIBS) 975AC_SUBST(LIBS)
977AC_SUBST(X_LIBS) 976AC_SUBST(X_LIBS)
978AC_SUBST(X_EXTRA_LIBS) 977AC_SUBST(X_EXTRA_LIBS)
979 978
980AC_SUBST(LIBAFTERIMAGE_CFLAGS) 979AC_SUBST(LIBAFTERIMAGE_CFLAGS)
… …
1026if test x$support_xpm = xyes; then 1025if test x$support_xpm = xyes; then
1027 echo " Xpm library: $XPM_LIBS" 1026 echo " Xpm library: $XPM_LIBS"
1028fi 1027fi
1029 1028
1030if test x$support_afterimage = xyes; then 1029if test x$support_afterimage = xyes; then
1031 echo " AfterImage library: $AFTERIMAGE_LIBS" 1030 echo " AfterImage support: yes"
1032fi 1031fi
1033 1032
1034if test x$support_afterstep = xyes; then 1033if test x$support_afterstep = xyes; then
1035 echo " With AfterStep integration" 1034 echo " AfterStep integration: yes"
1036fi 1035fi
1037 1036
1038if test x$term != x; then 1037if test x$term != x; then
1039 echo " set TERM to: $term" 1038 echo " set TERM to: $term"
1040fi 1039fi

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines