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.43 by ayin, Sat Jun 9 11:22:10 2007 UTC vs.
Revision 1.49 by ayin, Wed Jun 13 11:19:41 2007 UTC

… …
239 support_afterimage=$enableval 239 support_afterimage=$enableval
240 fi]) 240 fi])
241 241
242AC_ARG_WITH(afterimage_config, 242AC_ARG_WITH(afterimage_config,
243 [ --with-afterimage-config=DIR use libAfterImage config script in DIR], 243 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
244 [afterimage_config="$withval"]) 244 [if test "x$withval" != x; then
245 afterimage_config=$withval/afterimage-config
246 fi])
245 247
246AC_ARG_ENABLE(afterstep, 248AC_ARG_ENABLE(afterstep,
247 [ --enable-afterstep enable integration with AfterStep window manager], 249 [ --enable-afterstep enable integration with AfterStep window manager],
248 [if test x$enableval = xyes -o x$enableval = xno; then 250 [if test x$enableval = xyes -o x$enableval = xno; then
249 support_afterstep=$enableval 251 support_afterstep=$enableval
… …
467 469
468LIBAFTERIMAGE_CFLAGS= 470LIBAFTERIMAGE_CFLAGS=
469AFTERIMAGE_LIBS= 471AFTERIMAGE_LIBS=
470have_afterimage= 472have_afterimage=
471 473
472if test x$support_afterimage == xyes; then 474if test x$support_afterimage = xyes; then
473 AC_MSG_CHECKING(installed libAfterImage)
474 support_afterimage=no 475 support_afterimage=no
476
475 if test "x$afterimage_config" = "x" ; then 477 if test "x$afterimage_config" = "x" ; then
476 AC_PATH_PROG(afterimage_config, afterimage-config, no) 478 AC_PATH_PROG(afterimage_config, afterimage-config, no)
477 else
478 afterimage_config=$afterimage_config/afterimage-config
479 fi 479 fi
480
481 AC_MSG_CHECKING(for libAfterImage)
480 if $afterimage_config --version > /dev/null 2>&1 ; then 482 if $afterimage_config --version >/dev/null 2>&1 ; then
481 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 483 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
482 AFTERIMAGE_LIBS=`$afterimage_config --libs` 484 AFTERIMAGE_LIBS=`$afterimage_config --libs`
483 if test "x$AFTERIMAGE_LIBS" != "x"; then 485 if test "x$AFTERIMAGE_LIBS" != "x"; then
484 support_afterimage=yes 486 support_afterimage=yes
485 fi 487 fi
486 fi 488 fi
487 489
488 if test "x$support_afterimage" = "xyes"; then 490 if test "x$support_afterimage" = "xyes"; then
489 AC_MSG_RESULT($AFTERIMAGE_LIBS) 491 AC_MSG_RESULT($AFTERIMAGE_LIBS)
490 else 492 else
491 AC_MSG_RESULT(afterimage-config not found in $afterimage_config - can't use libAfterImage for images.) 493 AC_MSG_RESULT(no)
492 fi 494 fi
493fi 495fi
494 496
495if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then 497if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
496 VT_FIND_LIBXPM 498 VT_FIND_LIBXPM
… …
955 957
956if test x$support_perl = xyes; then 958if test x$support_perl = xyes; then
957 support_frills=yes 959 support_frills=yes
958fi 960fi
959 961
960AC_SUBST(DEBUG)
961AC_SUBST(DINCLUDE)
962AC_SUBST(CFLAGS) 962AC_SUBST(CFLAGS)
963AC_SUBST(CPPFLAGS) 963AC_SUBST(CPPFLAGS)
964AC_SUBST(LDFLAGS) 964AC_SUBST(LDFLAGS)
965AC_SUBST(X_CFLAGS) 965AC_SUBST(X_CFLAGS)
966 966
967dnl# Attack the libs 967dnl# Attack the libs
968if 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
969 DLIB=`echo $DLIB | sed "$R_TRANSLATE"`
970 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 969 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
971 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` 970 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
972 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` 971 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
973 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` 972 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
974fi 973fi
975AC_SUBST(DLIB)
976AC_SUBST(LIBS) 974AC_SUBST(LIBS)
977AC_SUBST(X_LIBS) 975AC_SUBST(X_LIBS)
978AC_SUBST(X_EXTRA_LIBS) 976AC_SUBST(X_EXTRA_LIBS)
979 977
980AC_SUBST(LIBAFTERIMAGE_CFLAGS) 978AC_SUBST(LIBAFTERIMAGE_CFLAGS)
… …
1026if test x$support_xpm = xyes; then 1024if test x$support_xpm = xyes; then
1027 echo " Xpm library: $XPM_LIBS" 1025 echo " Xpm library: $XPM_LIBS"
1028fi 1026fi
1029 1027
1030if test x$support_afterimage = xyes; then 1028if test x$support_afterimage = xyes; then
1031 echo " AfterImage library: $AFTERIMAGE_LIBS" 1029 echo " AfterImage support: yes"
1032fi 1030fi
1033 1031
1034if test x$support_afterstep = xyes; then 1032if test x$support_afterstep = xyes; then
1035 echo " With AfterStep integration" 1033 echo " AfterStep integration: yes"
1036fi 1034fi
1037 1035
1038if test x$term != x; then 1036if test x$term != x; then
1039 echo " set TERM to: $term" 1037 echo " set TERM to: $term"
1040fi 1038fi

Diff Legend

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