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.60 by ayin, Tue Jun 26 21:59:13 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= 464AFTERIMAGE_VERSION=
465 465
466if test x$support_afterimage = xyes; then 466if test x$support_afterimage = xyes; then
467 support_afterimage=no 467 support_afterimage=no
468 468
469 if test "x$afterimage_config" = "x" ; then 469 if test "x$afterimage_config" = "x" ; then
470 AC_PATH_PROG(afterimage_config, afterimage-config, no) 470 AC_PATH_PROG(afterimage_config, afterimage-config, no)
471 fi 471 fi
472 472 if test "x$afterimage_config" != "xno" ; then
473 AC_MSG_CHECKING(for libAfterImage) 473 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
474 if $afterimage_config --version >/dev/null 2>&1 ; then 474 xAFTERIMAGE_VERSION=`$afterimage_config --version`
475 if test -n "$xAFTERIMAGE_VERSION" ; then
475 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 476 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
476 AFTERIMAGE_LIBS=`$afterimage_config --libs` 477 xAFTERIMAGE_LIBS=`$afterimage_config --libs`
477 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
478 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
479 fi 488 fi
480 fi
481
482 if test "x$support_afterimage" = "xyes"; then 489 if test "x$support_afterimage" = "xyes"; then
483 AC_MSG_RESULT($AFTERIMAGE_LIBS) 490 AC_MSG_RESULT($AFTERIMAGE_LIBS)
484 else 491 else
485 AC_MSG_RESULT(no) 492 AC_MSG_RESULT(no)
493 fi
486 fi 494 fi
487fi 495fi
488 496
489if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then 497if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
490 VT_FIND_LIBXPM 498 VT_FIND_LIBXPM
… …
530AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 538AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
531[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])])
532if test x$rxvt_cv_xpointer = xyes; then 540if test x$rxvt_cv_xpointer = xyes; then
533 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 541 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
534fi 542fi
535LIBS=$ac_save_LIBS
536CFLAGS=$ac_save_CFLAGS
537 543
538AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 544AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
539[AC_COMPILE_IFELSE( 545[AC_COMPILE_IFELSE(
540 [AC_LANG_PROGRAM([ 546 [AC_LANG_PROGRAM([
541#define XLIB_ILLEGAL_ACCESS 547#define XLIB_ILLEGAL_ACCESS
… …
802 808
803if test x$support_afterimage = xyes; then 809if test x$support_afterimage = xyes; then
804 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)
805fi 811fi
806 812
807if test x$support_afterstep = xyes; then 813dnl if test x$support_afterstep = xyes; then
808 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)
809fi 815dnl fi
810 816
811if test x$support_scroll_rxvt = xyes; then 817if test x$support_scroll_rxvt = xyes; then
812 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) 818 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
813 scrolltypes="rxvt" 819 scrolltypes="rxvt"
814fi 820fi
… …
911dnl# Attack the libs 917dnl# Attack the libs
912AC_SUBST(LIBS) 918AC_SUBST(LIBS)
913AC_SUBST(X_LIBS) 919AC_SUBST(X_LIBS)
914AC_SUBST(X_EXTRA_LIBS) 920AC_SUBST(X_EXTRA_LIBS)
915 921
916AC_SUBST(LIBAFTERIMAGE_CFLAGS) 922AC_SUBST(AFTERIMAGE_CFLAGS)
917AC_SUBST(AFTERIMAGE_LIBS) 923AC_SUBST(AFTERIMAGE_LIBS)
918 924
919AC_ARG_PROGRAM 925AC_ARG_PROGRAM
920 926
921dnl# test for "sun" or "__sun__" before include sys_ioctl 927dnl# test for "sun" or "__sun__" before include sys_ioctl
… …
965 971
966if test x$support_afterimage = xyes; then 972if test x$support_afterimage = xyes; then
967 echo " AfterImage support: yes" 973 echo " AfterImage support: yes"
968fi 974fi
969 975
970if test x$support_afterstep = xyes; then 976dnl if test x$support_afterstep = xyes; then
971 echo " AfterStep integration: yes" 977dnl echo " AfterStep integration: yes"
972fi 978dnl fi
973 979
974if test x$term != x; then 980if test x$term != x; then
975 echo " set TERM to: $term" 981 echo " set TERM to: $term"
976fi 982fi
977if test x$terminfo != x; then 983if test x$terminfo != x; then
… …
982if test x$RESFALLBACK != x; then 988if test x$RESFALLBACK != x; then
983 echo " resource class fallback: $RESFALLBACK" 989 echo " resource class fallback: $RESFALLBACK"
984fi 990fi
985echo 991echo
986echo " embedded perl: $support_perl" 992echo " embedded perl: $support_perl"
993echo " libafterimage: $support_afterimage"
987echo 994echo
988if test x$support_xpm = xneedsmanualspecification; then 995if test x$support_xpm = xneedsmanualspecification; then
989 echo ".----------------------------------------------------------------." 996 echo ".----------------------------------------------------------------."
990 echo ". WARNING: --enable-xpm-background was specified however the ." 997 echo ". WARNING: --enable-xpm-background was specified however the ."
991 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