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.59 by ayin, Tue Jun 26 20:53:07 2007 UTC vs.
Revision 1.69 by root, Wed Aug 1 18:38:15 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 [
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"
62fi 59fi
63AC_SUBST(LINKER,[$LINKER]) 60AC_SUBST(LINKER,[$LINKER])
64AC_SUBST(CXXLIB)
65 61
66dnl# -------------------------------------------------------------------------- 62dnl# --------------------------------------------------------------------------
67dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
68dnl# 64dnl#
69if test -z "$orig_CXXFLAGS"; then 65if 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
250AC_ARG_ENABLE(afterstep, 246dnl AC_ARG_ENABLE(afterstep,
251 [ --enable-afterstep enable integration with AfterStep window manager], 247dnl [ --enable-afterstep enable integration with AfterStep window manager],
252 [if test x$enableval = xyes -o x$enableval = xno; then 248dnl [if test x$enableval = xyes -o x$enableval = xno; then
253 support_afterstep=$enableval 249dnl support_afterstep=$enableval
254 fi]) 250dnl fi])
255 251
256AC_ARG_ENABLE(transparency, 252AC_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
… …
461AC_PATH_XTRA 457AC_PATH_XTRA
462 458
463dnl# the only reasonable way to find libXpm is do-it-yourself 459dnl# the only reasonable way to find libXpm is do-it-yourself
464dnl# only check if we want xpm-background 460dnl# only check if we want xpm-background
465 461
466LIBAFTERIMAGE_CFLAGS= 462AFTERIMAGE_CFLAGS=
467AFTERIMAGE_LIBS= 463AFTERIMAGE_LIBS=
468have_afterimage= 464AFTERIMAGE_VERSION=
469 465
470if test x$support_afterimage = xyes; then 466if 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 if test "x$afterimage_config" != "xno" ; then
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 xAFTERIMAGE_VERSION=`$afterimage_config --version`
475 if test -n "$xAFTERIMAGE_VERSION" ; then
479 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 476 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
480 AFTERIMAGE_LIBS=`$afterimage_config --libs` 477 xAFTERIMAGE_LIBS=`$afterimage_config --libs`
481 if test "x$AFTERIMAGE_LIBS" != "x"; then 478 if test "x$xAFTERIMAGE_LIBS" != "x"; then
479 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .`
480 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .`
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 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
484 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
485 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
486 fi
487 fi
483 fi 488 fi
484 fi
485
486 if test "x$support_afterimage" = "xyes"; then 489 if test "x$support_afterimage" = "xyes"; then
487 AC_MSG_RESULT($AFTERIMAGE_LIBS) 490 AC_MSG_RESULT($AFTERIMAGE_LIBS)
488 else 491 else
489 AC_MSG_RESULT(no) 492 AC_MSG_RESULT(no)
493 fi
490 fi 494 fi
491fi 495fi
492 496
493if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then 497if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
494 VT_FIND_LIBXPM 498 VT_FIND_LIBXPM
… …
534AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 538AC_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])]) 539[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
536if test x$rxvt_cv_xpointer = xyes; then 540if test x$rxvt_cv_xpointer = xyes; then
537 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 541 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
538fi 542fi
539LIBS=$ac_save_LIBS
540CFLAGS=$ac_save_CFLAGS
541 543
542AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 544AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
543[AC_COMPILE_IFELSE( 545[AC_COMPILE_IFELSE(
544 [AC_LANG_PROGRAM([ 546 [AC_LANG_PROGRAM([
545#define XLIB_ILLEGAL_ACCESS 547#define XLIB_ILLEGAL_ACCESS
… …
806 808
807if test x$support_afterimage = xyes; then 809if test x$support_afterimage = xyes; then
808 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 810 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
809fi 811fi
810 812
811if test x$support_afterstep = xyes; then 813dnl if test x$support_afterstep = xyes; then
812 AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) 814dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
813fi 815dnl fi
814 816
815if test x$support_scroll_rxvt = xyes; then 817if test x$support_scroll_rxvt = xyes; then
816 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) 818 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
817 scrolltypes="rxvt" 819 scrolltypes="rxvt"
818fi 820fi
… …
915dnl# Attack the libs 917dnl# Attack the libs
916AC_SUBST(LIBS) 918AC_SUBST(LIBS)
917AC_SUBST(X_LIBS) 919AC_SUBST(X_LIBS)
918AC_SUBST(X_EXTRA_LIBS) 920AC_SUBST(X_EXTRA_LIBS)
919 921
920AC_SUBST(LIBAFTERIMAGE_CFLAGS) 922AC_SUBST(AFTERIMAGE_CFLAGS)
921AC_SUBST(AFTERIMAGE_LIBS) 923AC_SUBST(AFTERIMAGE_LIBS)
922 924
923AC_ARG_PROGRAM 925AC_ARG_PROGRAM
924 926
925dnl# test for "sun" or "__sun__" before include sys_ioctl 927dnl# test for "sun" or "__sun__" before include sys_ioctl
… …
969 971
970if test x$support_afterimage = xyes; then 972if test x$support_afterimage = xyes; then
971 echo " AfterImage support: yes" 973 echo " AfterImage support: yes"
972fi 974fi
973 975
974if test x$support_afterstep = xyes; then 976dnl if test x$support_afterstep = xyes; then
975 echo " AfterStep integration: yes" 977dnl echo " AfterStep integration: yes"
976fi 978dnl fi
977 979
978if test x$term != x; then 980if test x$term != x; then
979 echo " set TERM to: $term" 981 echo " set TERM to: $term"
980fi 982fi
981if test x$terminfo != x; then 983if test x$terminfo != x; then
… …
986if test x$RESFALLBACK != x; then 988if test x$RESFALLBACK != x; then
987 echo " resource class fallback: $RESFALLBACK" 989 echo " resource class fallback: $RESFALLBACK"
988fi 990fi
989echo 991echo
990echo " embedded perl: $support_perl" 992echo " embedded perl: $support_perl"
993echo " libafterimage: $support_afterimage"
991echo 994echo
992if test x$support_xpm = xneedsmanualspecification; then 995if test x$support_xpm = xneedsmanualspecification; then
993 echo ".----------------------------------------------------------------." 996 echo ".----------------------------------------------------------------."
994 echo ". WARNING: --enable-xpm-background was specified however the ." 997 echo ". WARNING: --enable-xpm-background was specified however the ."
995 echo ". XPM includes files and libraries could not be found. ." 998 echo ". XPM includes files and libraries could not be found. ."

Diff Legend

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