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.62 by sasha, Wed Jul 25 22:41:45 2007 UTC vs.
Revision 1.66 by ayin, Fri Jul 27 10:06:43 2007 UTC

… …
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
474 AC_MSG_CHECKING(for libAfterImage version >= 1.15 ) 472 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
475 AFTERIMAGE_VERSION=`$afterimage_config --version` 473 AFTERIMAGE_VERSION=`$afterimage_config --version`
476 if test -n $AFTERIMAGE_VERSION ; then 474 if test -n $AFTERIMAGE_VERSION ; then
477 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 475 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
478 AFTERIMAGE_LIBS=`$afterimage_config --libs` 476 AFTERIMAGE_LIBS=`$afterimage_config --libs`
479 if test "x$AFTERIMAGE_LIBS" != "x"; then 477 if test "x$AFTERIMAGE_LIBS" != "x"; then
480 libai_ver_major=`echo $AFTERIMAGE_VERSION | $AWK -F . '{print $1}'` 478 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
481 libai_ver_minor=`echo $AFTERIMAGE_VERSION | $AWK -F . '{print $2}'` 479 libai_ver_minor=`echo $AFTERIMAGE_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 480 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
483 support_afterimage=yes; 481 support_afterimage=yes
484 fi 482 fi
485 fi 483 fi
486 fi 484 fi
487 485
488 if test "x$support_afterimage" = "xyes"; then 486 if test "x$support_afterimage" = "xyes"; then
… …
884 PERL_O=rxvtperl.o 882 PERL_O=rxvtperl.o
885 PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" 883 PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`"
886 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" 884 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
887 PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" 885 PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
888 else 886 else
889 AC_MSG_RESULT([no, unable to link]) 887 AC_MSG_ERROR([no, unable to link])
890 rxvt_perl_link=no
891 fi 888 fi
892 else 889 else
893 AC_MSG_RESULT([no working perl found, or perl not version >= 5.8]) 890 AC_MSG_ERROR([no working perl found, or perl not version >= 5.8])
894 support_perl=no
895 fi 891 fi
896fi 892fi
897AC_SUBST(PERLLIB) 893AC_SUBST(PERLLIB)
898AC_SUBST(PERLFLAGS) 894AC_SUBST(PERLFLAGS)
899AC_SUBST(PERLPRIVLIBEXP) 895AC_SUBST(PERLPRIVLIBEXP)
… …
917dnl# Attack the libs 913dnl# Attack the libs
918AC_SUBST(LIBS) 914AC_SUBST(LIBS)
919AC_SUBST(X_LIBS) 915AC_SUBST(X_LIBS)
920AC_SUBST(X_EXTRA_LIBS) 916AC_SUBST(X_EXTRA_LIBS)
921 917
922AC_SUBST(LIBAFTERIMAGE_CFLAGS) 918AC_SUBST(AFTERIMAGE_CFLAGS)
923AC_SUBST(AFTERIMAGE_LIBS) 919AC_SUBST(AFTERIMAGE_LIBS)
924 920
925AC_ARG_PROGRAM 921AC_ARG_PROGRAM
926 922
927dnl# test for "sun" or "__sun__" before include sys_ioctl 923dnl# test for "sun" or "__sun__" before include sys_ioctl

Diff Legend

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