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.41 by ayin, Sat Jun 9 11:15:38 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
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 if afterimage-config --version > /dev/null 2>&1 ; then
475 afterimage_config=afterimage-config 477 afterimage_config=afterimage-config
476 else 478 else
477 if test -x /usr/local/bin/afterimage-config; then 479 if test -x /usr/local/bin/afterimage-config; then
478 afterimage_config=/usr/local/bin/afterimage-config 480 afterimage_config=/usr/local/bin/afterimage-config
479 fi 481 fi
480 fi 482 fi
481 else 483 else
482 afterimage_config=$afterimage_config/afterimage-config 484 afterimage_config=$afterimage_config/afterimage-config
483 fi 485 fi
484 if $afterimage_config --version > /dev/null 2>&1 ; then 486 if $afterimage_config --version > /dev/null 2>&1 ; then
485 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 487 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
486 AFTERIMAGE_LIBS=`$afterimage_config --libs` 488 AFTERIMAGE_LIBS=`$afterimage_config --libs`
487 if test "x$AFTERIMAGE_LIBS" != "x"; then 489 if test "x$AFTERIMAGE_LIBS" != "x"; then
488 support_afterimage=yes 490 support_afterimage=yes
489 fi 491 fi
490 fi 492 fi
491 493
492 if test "x$support_afterimage" = "xyes"; then 494 if test "x$support_afterimage" = "xyes"; then
493 AC_MSG_RESULT($AFTERIMAGE_LIBS) 495 AC_MSG_RESULT($AFTERIMAGE_LIBS)
494 else 496 else
495 AC_MSG_RESULT(afterimage-config not found in $afterimage_config - can't use libAfterImage for images.) 497 AC_MSG_RESULT(afterimage-config not found in $afterimage_config - can't use libAfterImage for images.)
558#include <stdlib.h> 560#include <stdlib.h>
559main() 561main()
560{ 562{
561 exit(0); 563 exit(0);
562 (void) XOpenDisplay("foobar"); 564 (void) XOpenDisplay("foobar");
563}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl 565}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
564 AC_MSG_WARN(You may need to check the LIBS line)])]) 566 AC_MSG_WARN(You may need to check the LIBS line)])])
565if test x$rxvt_cv_rpath != xyes; then 567if test x$rxvt_cv_rpath != xyes; then
566 changequote(, )dnl 568 changequote(, )dnl
567 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 569 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
568 changequote([, ])dnl 570 changequote([, ])dnl
569 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 571 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
572#include <stdlib.h> 574#include <stdlib.h>
573main() 575main()
574{ 576{
575 exit(0); 577 exit(0);
576 (void) XOpenDisplay("foobar"); 578 (void) XOpenDisplay("foobar");
577}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])]) 579}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
578 if test x$rxvt_cv_R != xyes; then 580 if test x$rxvt_cv_R != xyes; then
579 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 581 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
580 fi 582 fi
581fi 583fi
582 584
716dnl# find ttys/ttytab 718dnl# find ttys/ttytab
717AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab, 719AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab,
718[for ttys_file in dnl 720[for ttys_file in dnl
719 /etc/ttys /etc/ttytab; 721 /etc/ttys /etc/ttytab;
720do 722do
721 if test -f "$ttys_file" ; then 723 if test -f "$ttys_file" ; then
722 rxvt_cv_path_ttytab=$ttys_file 724 rxvt_cv_path_ttytab=$ttys_file
723 break 725 break
724 fi 726 fi
725done 727done
726]) 728])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines