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.39 by sasha, Fri Jun 8 20:04:10 2007 UTC vs.
Revision 1.44 by ayin, Sat Jun 9 11:27:43 2007 UTC

… …
13changequote(, )dnl 13changequote(, )dnl
14VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 14VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
15DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 15DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
16dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 16dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
17changequote([, ])dnl 17changequote([, ])dnl
18AC_SUBST(VERSION)dnl 18AC_SUBST(VERSION)dnl
19AC_SUBST(DATE)dnl 19AC_SUBST(DATE)dnl
20AC_SUBST(LSMDATE)dnl 20AC_SUBST(LSMDATE)dnl
21AC_SUBST(LIBVERSION)dnl 21AC_SUBST(LIBVERSION)dnl
22echo "" 22echo ""
23echo "configuring for rxvt $VERSION" 23echo "configuring for rxvt $VERSION"
24echo "" 24echo ""
25 25
26orig_CXXFLAGS="$CXXFLAGS" 26orig_CXXFLAGS="$CXXFLAGS"
… …
237 [ --enable-afterimage enable integration with libAfterImage for background images], 237 [ --enable-afterimage enable integration with libAfterImage for background images],
238 [if test x$enableval = xyes -o x$enableval = xno; then 238 [if test x$enableval = xyes -o x$enableval = xno; then
239 support_afterimage=$enableval 239 support_afterimage=$enableval
240 fi]) 240 fi])
241 241
242AC_ARG_WITH(afterimage_config, [ --with-afterimage-config=DIR use libAfterImage config script in DIR], afterimage_config="$withval",afterimage_config=NO) 242AC_ARG_WITH(afterimage_config,
243 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
244 [afterimage_config="$withval"])
243 245
244AC_ARG_ENABLE(afterstep, 246AC_ARG_ENABLE(afterstep,
245 [ --enable-afterstep enable integration with AfterStep window manager], 247 [ --enable-afterstep enable integration with AfterStep window manager],
246 [if test x$enableval = xyes -o x$enableval = xno; then 248 [if test x$enableval = xyes -o x$enableval = xno; then
247 support_afterstep=$enableval 249 support_afterstep=$enableval
… …
465 467
466LIBAFTERIMAGE_CFLAGS= 468LIBAFTERIMAGE_CFLAGS=
467AFTERIMAGE_LIBS= 469AFTERIMAGE_LIBS=
468have_afterimage= 470have_afterimage=
469 471
470if test x$support_afterimage == xyes; then 472if test x$support_afterimage = xyes; then
471 AC_MSG_CHECKING(installed libAfterImage) 473 AC_MSG_CHECKING(installed libAfterImage)
472 support_afterimage=no 474 support_afterimage=no
473 if test "$afterimage_config" = "NO" ; then 475 if test "x$afterimage_config" = "x" ; then
474 if afterimage-config --version > /dev/null 2>&1 ; then 476 AC_PATH_PROG(afterimage_config, afterimage-config, no)
475 afterimage_config=afterimage-config 477 else
476 else
477 if test -x /usr/local/bin/afterimage-config; then
478 afterimage_config=/usr/local/bin/afterimage-config
479 fi
480 fi
481 else
482 afterimage_config=$afterimage_config/afterimage-config 478 afterimage_config=$afterimage_config/afterimage-config
483 fi 479 fi
484 if $afterimage_config --version > /dev/null 2>&1 ; then 480 if $afterimage_config --version > /dev/null 2>&1 ; then
485 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 481 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
486 AFTERIMAGE_LIBS=`$afterimage_config --libs` 482 AFTERIMAGE_LIBS=`$afterimage_config --libs`
487 if test "x$AFTERIMAGE_LIBS" != "x"; then 483 if test "x$AFTERIMAGE_LIBS" != "x"; then
488 support_afterimage=yes 484 support_afterimage=yes
489 fi 485 fi
490 fi 486 fi
491 487
492 if test "x$support_afterimage" = "xyes"; then 488 if test "x$support_afterimage" = "xyes"; then
493 AC_MSG_RESULT($AFTERIMAGE_LIBS) 489 AC_MSG_RESULT($AFTERIMAGE_LIBS)
494 else 490 else
495 AC_MSG_RESULT(afterimage-config not found in $afterimage_config - can't use libAfterImage for images.) 491 AC_MSG_RESULT(afterimage-config not found - can't use libAfterImage for images.)
496 fi 492 fi
497fi 493fi
498 494
499if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then 495if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
500 VT_FIND_LIBXPM 496 VT_FIND_LIBXPM
501 if test x$no_xpm = xyes; then 497 if test x$no_xpm = xyes; then
… …
558#include <stdlib.h> 554#include <stdlib.h>
559main() 555main()
560{ 556{
561 exit(0); 557 exit(0);
562 (void) XOpenDisplay("foobar"); 558 (void) XOpenDisplay("foobar");
563}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl 559}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
564 AC_MSG_WARN(You may need to check the LIBS line)])]) 560 AC_MSG_WARN(You may need to check the LIBS line)])])
565if test x$rxvt_cv_rpath != xyes; then 561if test x$rxvt_cv_rpath != xyes; then
566 changequote(, )dnl 562 changequote(, )dnl
567 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 563 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
568 changequote([, ])dnl 564 changequote([, ])dnl
569 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 565 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
… …
572#include <stdlib.h> 568#include <stdlib.h>
573main() 569main()
574{ 570{
575 exit(0); 571 exit(0);
576 (void) XOpenDisplay("foobar"); 572 (void) XOpenDisplay("foobar");
577}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])]) 573}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
578 if test x$rxvt_cv_R != xyes; then 574 if test x$rxvt_cv_R != xyes; then
579 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 575 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
580 fi 576 fi
581fi 577fi
582 578
… …
716dnl# find ttys/ttytab 712dnl# find ttys/ttytab
717AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab, 713AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab,
718[for ttys_file in dnl 714[for ttys_file in dnl
719 /etc/ttys /etc/ttytab; 715 /etc/ttys /etc/ttytab;
720do 716do
721 if test -f "$ttys_file" ; then 717 if test -f "$ttys_file" ; then
722 rxvt_cv_path_ttytab=$ttys_file 718 rxvt_cv_path_ttytab=$ttys_file
723 break 719 break
724 fi 720 fi
725done 721done
726]) 722])

Diff Legend

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