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.68 by ayin, Wed Aug 1 18:10:10 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
473 AC_MSG_CHECKING(for libAfterImage) 472 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
474 if $afterimage_config --version >/dev/null 2>&1 ; then 473 AFTERIMAGE_VERSION=`$afterimage_config --version`
474 if test -n "$AFTERIMAGE_VERSION" ; then
475 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 475 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
476 AFTERIMAGE_LIBS=`$afterimage_config --libs` 476 AFTERIMAGE_LIBS=`$afterimage_config --libs`
477 if test "x$AFTERIMAGE_LIBS" != "x"; then 477 if test "x$AFTERIMAGE_LIBS" != "x"; then
478 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
479 libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .`
480 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
478 support_afterimage=yes 481 support_afterimage=yes
482 fi
479 fi 483 fi
480 fi 484 fi
481 485
482 if test "x$support_afterimage" = "xyes"; then 486 if test "x$support_afterimage" = "xyes"; then
483 AC_MSG_RESULT($AFTERIMAGE_LIBS) 487 AC_MSG_RESULT($AFTERIMAGE_LIBS)
… …
530AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 534AC_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])]) 535[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 536if test x$rxvt_cv_xpointer = xyes; then
533 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 537 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
534fi 538fi
535LIBS=$ac_save_LIBS
536CFLAGS=$ac_save_CFLAGS
537 539
538AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 540AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
539[AC_COMPILE_IFELSE( 541[AC_COMPILE_IFELSE(
540 [AC_LANG_PROGRAM([ 542 [AC_LANG_PROGRAM([
541#define XLIB_ILLEGAL_ACCESS 543#define XLIB_ILLEGAL_ACCESS
… …
802 804
803if test x$support_afterimage = xyes; then 805if test x$support_afterimage = xyes; then
804 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 806 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
805fi 807fi
806 808
807if test x$support_afterstep = xyes; then 809dnl if test x$support_afterstep = xyes; then
808 AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) 810dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
809fi 811dnl fi
810 812
811if test x$support_scroll_rxvt = xyes; then 813if test x$support_scroll_rxvt = xyes; then
812 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) 814 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
813 scrolltypes="rxvt" 815 scrolltypes="rxvt"
814fi 816fi
… …
911dnl# Attack the libs 913dnl# Attack the libs
912AC_SUBST(LIBS) 914AC_SUBST(LIBS)
913AC_SUBST(X_LIBS) 915AC_SUBST(X_LIBS)
914AC_SUBST(X_EXTRA_LIBS) 916AC_SUBST(X_EXTRA_LIBS)
915 917
916AC_SUBST(LIBAFTERIMAGE_CFLAGS) 918AC_SUBST(AFTERIMAGE_CFLAGS)
917AC_SUBST(AFTERIMAGE_LIBS) 919AC_SUBST(AFTERIMAGE_LIBS)
918 920
919AC_ARG_PROGRAM 921AC_ARG_PROGRAM
920 922
921dnl# test for "sun" or "__sun__" before include sys_ioctl 923dnl# test for "sun" or "__sun__" before include sys_ioctl
… …
965 967
966if test x$support_afterimage = xyes; then 968if test x$support_afterimage = xyes; then
967 echo " AfterImage support: yes" 969 echo " AfterImage support: yes"
968fi 970fi
969 971
970if test x$support_afterstep = xyes; then 972dnl if test x$support_afterstep = xyes; then
971 echo " AfterStep integration: yes" 973dnl echo " AfterStep integration: yes"
972fi 974dnl fi
973 975
974if test x$term != x; then 976if test x$term != x; then
975 echo " set TERM to: $term" 977 echo " set TERM to: $term"
976fi 978fi
977if test x$terminfo != x; then 979if test x$terminfo != x; then

Diff Legend

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