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.49 by ayin, Wed Jun 13 11:19:41 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 [if test "x$withval" != x; then
245 afterimage_config=$withval/afterimage-config
246 fi])
243 247
244AC_ARG_ENABLE(afterstep, 248AC_ARG_ENABLE(afterstep,
245 [ --enable-afterstep enable integration with AfterStep window manager], 249 [ --enable-afterstep enable integration with AfterStep window manager],
246 [if test x$enableval = xyes -o x$enableval = xno; then 250 [if test x$enableval = xyes -o x$enableval = xno; then
247 support_afterstep=$enableval 251 support_afterstep=$enableval
… …
465 469
466LIBAFTERIMAGE_CFLAGS= 470LIBAFTERIMAGE_CFLAGS=
467AFTERIMAGE_LIBS= 471AFTERIMAGE_LIBS=
468have_afterimage= 472have_afterimage=
469 473
470if test x$support_afterimage == xyes; then 474if test x$support_afterimage = xyes; then
471 AC_MSG_CHECKING(installed libAfterImage)
472 support_afterimage=no 475 support_afterimage=no
476
473 if test "$afterimage_config" = "NO" ; then 477 if test "x$afterimage_config" = "x" ; then
474 if afterimage-config --version > /dev/null 2>&1 ; then 478 AC_PATH_PROG(afterimage_config, afterimage-config, no)
475 afterimage_config=afterimage-config 479 fi
476 else 480
477 if test -x /usr/local/bin/afterimage-config; then 481 AC_MSG_CHECKING(for libAfterImage)
478 afterimage_config=/usr/local/bin/afterimage-config
479 fi
480 fi
481 else
482 afterimage_config=$afterimage_config/afterimage-config
483 fi
484 if $afterimage_config --version > /dev/null 2>&1 ; then 482 if $afterimage_config --version >/dev/null 2>&1 ; then
485 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 483 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
486 AFTERIMAGE_LIBS=`$afterimage_config --libs` 484 AFTERIMAGE_LIBS=`$afterimage_config --libs`
487 if test "x$AFTERIMAGE_LIBS" != "x"; then 485 if test "x$AFTERIMAGE_LIBS" != "x"; then
488 support_afterimage=yes 486 support_afterimage=yes
489 fi 487 fi
490 fi 488 fi
491 489
492 if test "x$support_afterimage" = "xyes"; then 490 if test "x$support_afterimage" = "xyes"; then
493 AC_MSG_RESULT($AFTERIMAGE_LIBS) 491 AC_MSG_RESULT($AFTERIMAGE_LIBS)
494 else 492 else
495 AC_MSG_RESULT(afterimage-config not found in $afterimage_config - can't use libAfterImage for images.) 493 AC_MSG_RESULT(no)
496 fi 494 fi
497fi 495fi
498 496
499if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then 497if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
500 VT_FIND_LIBXPM 498 VT_FIND_LIBXPM
501 if test x$no_xpm = xyes; then 499 if test x$no_xpm = xyes; then
… …
558#include <stdlib.h> 556#include <stdlib.h>
559main() 557main()
560{ 558{
561 exit(0); 559 exit(0);
562 (void) XOpenDisplay("foobar"); 560 (void) XOpenDisplay("foobar");
563}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl 561}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
564 AC_MSG_WARN(You may need to check the LIBS line)])]) 562 AC_MSG_WARN(You may need to check the LIBS line)])])
565if test x$rxvt_cv_rpath != xyes; then 563if test x$rxvt_cv_rpath != xyes; then
566 changequote(, )dnl 564 changequote(, )dnl
567 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 565 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
568 changequote([, ])dnl 566 changequote([, ])dnl
569 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 567 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
… …
572#include <stdlib.h> 570#include <stdlib.h>
573main() 571main()
574{ 572{
575 exit(0); 573 exit(0);
576 (void) XOpenDisplay("foobar"); 574 (void) XOpenDisplay("foobar");
577}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])]) 575}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
578 if test x$rxvt_cv_R != xyes; then 576 if test x$rxvt_cv_R != xyes; then
579 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 577 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
580 fi 578 fi
581fi 579fi
582 580
… …
716dnl# find ttys/ttytab 714dnl# find ttys/ttytab
717AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab, 715AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab,
718[for ttys_file in dnl 716[for ttys_file in dnl
719 /etc/ttys /etc/ttytab; 717 /etc/ttys /etc/ttytab;
720do 718do
721 if test -f "$ttys_file" ; then 719 if test -f "$ttys_file" ; then
722 rxvt_cv_path_ttytab=$ttys_file 720 rxvt_cv_path_ttytab=$ttys_file
723 break 721 break
724 fi 722 fi
725done 723done
726]) 724])
… …
959 957
960if test x$support_perl = xyes; then 958if test x$support_perl = xyes; then
961 support_frills=yes 959 support_frills=yes
962fi 960fi
963 961
964AC_SUBST(DEBUG)
965AC_SUBST(DINCLUDE)
966AC_SUBST(CFLAGS) 962AC_SUBST(CFLAGS)
967AC_SUBST(CPPFLAGS) 963AC_SUBST(CPPFLAGS)
968AC_SUBST(LDFLAGS) 964AC_SUBST(LDFLAGS)
969AC_SUBST(X_CFLAGS) 965AC_SUBST(X_CFLAGS)
970 966
971dnl# Attack the libs 967dnl# Attack the libs
972if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 968if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
973 DLIB=`echo $DLIB | sed "$R_TRANSLATE"`
974 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 969 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
975 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` 970 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
976 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` 971 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
977 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` 972 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
978fi 973fi
979AC_SUBST(DLIB)
980AC_SUBST(LIBS) 974AC_SUBST(LIBS)
981AC_SUBST(X_LIBS) 975AC_SUBST(X_LIBS)
982AC_SUBST(X_EXTRA_LIBS) 976AC_SUBST(X_EXTRA_LIBS)
983 977
984AC_SUBST(LIBAFTERIMAGE_CFLAGS) 978AC_SUBST(LIBAFTERIMAGE_CFLAGS)
… …
1030if test x$support_xpm = xyes; then 1024if test x$support_xpm = xyes; then
1031 echo " Xpm library: $XPM_LIBS" 1025 echo " Xpm library: $XPM_LIBS"
1032fi 1026fi
1033 1027
1034if test x$support_afterimage = xyes; then 1028if test x$support_afterimage = xyes; then
1035 echo " AfterImage library: $AFTERIMAGE_LIBS" 1029 echo " AfterImage support: yes"
1036fi 1030fi
1037 1031
1038if test x$support_afterstep = xyes; then 1032if test x$support_afterstep = xyes; then
1039 echo " With AfterStep integration" 1033 echo " AfterStep integration: yes"
1040fi 1034fi
1041 1035
1042if test x$term != x; then 1036if test x$term != x; then
1043 echo " set TERM to: $term" 1037 echo " set TERM to: $term"
1044fi 1038fi

Diff Legend

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