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.63 by root, Thu Jul 26 11:57:18 2007 UTC vs.
Revision 1.69 by root, Wed Aug 1 18:38:15 2007 UTC

… …
241 [ --with-afterimage-config=DIR use libAfterImage config script in DIR], 241 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
242 [if test "x$withval" != x; then 242 [if test "x$withval" != x; then
243 afterimage_config=$withval/afterimage-config 243 afterimage_config=$withval/afterimage-config
244 fi]) 244 fi])
245 245
246AC_ARG_ENABLE(afterstep, 246dnl AC_ARG_ENABLE(afterstep,
247 [ --enable-afterstep enable integration with AfterStep window manager], 247dnl [ --enable-afterstep enable integration with AfterStep window manager],
248 [if test x$enableval = xyes -o x$enableval = xno; then 248dnl [if test x$enableval = xyes -o x$enableval = xno; then
249 support_afterstep=$enableval 249dnl support_afterstep=$enableval
250 fi]) 250dnl fi])
251 251
252AC_ARG_ENABLE(transparency, 252AC_ARG_ENABLE(transparency,
253 [ --enable-transparency enable transparent backgrounds], 253 [ --enable-transparency enable transparent backgrounds],
254 [if test x$enableval = xyes -o x$enableval = xno; then 254 [if test x$enableval = xyes -o x$enableval = xno; then
255 support_inheritpixmap=$enableval 255 support_inheritpixmap=$enableval
… …
457AC_PATH_XTRA 457AC_PATH_XTRA
458 458
459dnl# the only reasonable way to find libXpm is do-it-yourself 459dnl# the only reasonable way to find libXpm is do-it-yourself
460dnl# only check if we want xpm-background 460dnl# only check if we want xpm-background
461 461
462LIBAFTERIMAGE_CFLAGS= 462AFTERIMAGE_CFLAGS=
463AFTERIMAGE_LIBS= 463AFTERIMAGE_LIBS=
464have_afterimage=
465AFTERIMAGE_VERSION= 464AFTERIMAGE_VERSION=
466 465
467if test x$support_afterimage = xyes; then 466if test x$support_afterimage = xyes; then
468 support_afterimage=no 467 support_afterimage=no
469 468
470 if test "x$afterimage_config" = "x" ; then 469 if test "x$afterimage_config" = "x" ; then
471 AC_PATH_PROG(afterimage_config, afterimage-config, no) 470 AC_PATH_PROG(afterimage_config, afterimage-config, no)
472 fi 471 fi
473 AC_PROG_AWK 472 if test "x$afterimage_config" != "xno" ; then
474 AC_MSG_CHECKING(for libAfterImage version >= 1.15 ) 473 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
475 AFTERIMAGE_VERSION=`$afterimage_config --version` 474 xAFTERIMAGE_VERSION=`$afterimage_config --version`
476 if test -n $AFTERIMAGE_VERSION ; then 475 if test -n "$xAFTERIMAGE_VERSION" ; then
477 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 476 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
478 AFTERIMAGE_LIBS=`$afterimage_config --libs` 477 xAFTERIMAGE_LIBS=`$afterimage_config --libs`
479 if test "x$AFTERIMAGE_LIBS" != "x"; then 478 if test "x$xAFTERIMAGE_LIBS" != "x"; then
480 libai_ver_major=`echo $AFTERIMAGE_VERSION | $AWK -F . '{print $1}'` 479 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .`
481 libai_ver_minor=`echo $AFTERIMAGE_VERSION | $AWK -F . '{print $2}'` 480 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .`
482 if test "$libai_ver_major -gt 1 -o ($libai_ver_major -eq 1 -a $libai_ver_minor -ge 15)"; then 481 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
483 support_afterimage=yes; 482 support_afterimage=yes
483 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
484 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
485 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
486 fi
484 fi 487 fi
485 fi 488 fi
486 fi
487
488 if test "x$support_afterimage" = "xyes"; then 489 if test "x$support_afterimage" = "xyes"; then
489 AC_MSG_RESULT($AFTERIMAGE_LIBS) 490 AC_MSG_RESULT($AFTERIMAGE_LIBS)
490 else 491 else
491 AC_MSG_RESULT(no) 492 AC_MSG_RESULT(no)
493 fi
492 fi 494 fi
493fi 495fi
494 496
495if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then 497if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
496 VT_FIND_LIBXPM 498 VT_FIND_LIBXPM
… …
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