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.42 by ayin, Sat Jun 9 11:19:36 2007 UTC vs.
Revision 1.50 by ayin, Wed Jun 13 11:30:42 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
… …
437 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 439 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
438 fi]) 440 fi])
439 441
440dnl# -------------------------------------------------------------------------- 442dnl# --------------------------------------------------------------------------
441 443
442AC_PATH_PROG(MV, mv, mv)
443AC_PATH_PROG(CP, cp, cp) 444AC_PATH_PROG(CP, cp, cp)
444AC_PATH_PROG(LN, ln, ln)
445AC_PATH_PROG(SED, sed, sed) 445AC_PATH_PROG(SED, sed, sed)
446AC_PATH_PROG(ECHO, echo, echo) 446AC_PATH_PROG(ECHO, echo, echo)
447AC_PATH_PROG(CMP, cmp, cmp)
448AC_PATH_PROG(TIC, tic) 447AC_PATH_PROG(TIC, tic)
449 448
450dnl# need a neat way to detect SVR4 or its features 449dnl# need a neat way to detect SVR4 or its features
451dnl# in src/command.c we use these functions: 450dnl# in src/command.c we use these functions:
452dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 451dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
… …
467 466
468LIBAFTERIMAGE_CFLAGS= 467LIBAFTERIMAGE_CFLAGS=
469AFTERIMAGE_LIBS= 468AFTERIMAGE_LIBS=
470have_afterimage= 469have_afterimage=
471 470
472if test x$support_afterimage == xyes; then 471if test x$support_afterimage = xyes; then
473 AC_MSG_CHECKING(installed libAfterImage)
474 support_afterimage=no 472 support_afterimage=no
473
475 if test "x$afterimage_config" = "x" ; then 474 if test "x$afterimage_config" = "x" ; then
476 if afterimage-config --version > /dev/null 2>&1 ; then
477 afterimage_config=afterimage-config 475 AC_PATH_PROG(afterimage_config, afterimage-config, no)
478 else
479 if test -x /usr/local/bin/afterimage-config; then
480 afterimage_config=/usr/local/bin/afterimage-config
481 fi
482 fi 476 fi
483 else 477
484 afterimage_config=$afterimage_config/afterimage-config 478 AC_MSG_CHECKING(for libAfterImage)
485 fi
486 if $afterimage_config --version > /dev/null 2>&1 ; then 479 if $afterimage_config --version >/dev/null 2>&1 ; then
487 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 480 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
488 AFTERIMAGE_LIBS=`$afterimage_config --libs` 481 AFTERIMAGE_LIBS=`$afterimage_config --libs`
489 if test "x$AFTERIMAGE_LIBS" != "x"; then 482 if test "x$AFTERIMAGE_LIBS" != "x"; then
490 support_afterimage=yes 483 support_afterimage=yes
491 fi 484 fi
492 fi 485 fi
493 486
494 if test "x$support_afterimage" = "xyes"; then 487 if test "x$support_afterimage" = "xyes"; then
495 AC_MSG_RESULT($AFTERIMAGE_LIBS) 488 AC_MSG_RESULT($AFTERIMAGE_LIBS)
496 else 489 else
497 AC_MSG_RESULT(afterimage-config not found in $afterimage_config - can't use libAfterImage for images.) 490 AC_MSG_RESULT(no)
498 fi 491 fi
499fi 492fi
500 493
501if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then 494if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
502 VT_FIND_LIBXPM 495 VT_FIND_LIBXPM
… …
961 954
962if test x$support_perl = xyes; then 955if test x$support_perl = xyes; then
963 support_frills=yes 956 support_frills=yes
964fi 957fi
965 958
966AC_SUBST(DEBUG)
967AC_SUBST(DINCLUDE)
968AC_SUBST(CFLAGS) 959AC_SUBST(CFLAGS)
969AC_SUBST(CPPFLAGS) 960AC_SUBST(CPPFLAGS)
970AC_SUBST(LDFLAGS) 961AC_SUBST(LDFLAGS)
971AC_SUBST(X_CFLAGS) 962AC_SUBST(X_CFLAGS)
972 963
973dnl# Attack the libs 964dnl# Attack the libs
974if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 965if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
975 DLIB=`echo $DLIB | sed "$R_TRANSLATE"`
976 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 966 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
977 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` 967 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
978 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` 968 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
979 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` 969 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
980fi 970fi
981AC_SUBST(DLIB)
982AC_SUBST(LIBS) 971AC_SUBST(LIBS)
983AC_SUBST(X_LIBS) 972AC_SUBST(X_LIBS)
984AC_SUBST(X_EXTRA_LIBS) 973AC_SUBST(X_EXTRA_LIBS)
985 974
986AC_SUBST(LIBAFTERIMAGE_CFLAGS) 975AC_SUBST(LIBAFTERIMAGE_CFLAGS)
… …
1032if test x$support_xpm = xyes; then 1021if test x$support_xpm = xyes; then
1033 echo " Xpm library: $XPM_LIBS" 1022 echo " Xpm library: $XPM_LIBS"
1034fi 1023fi
1035 1024
1036if test x$support_afterimage = xyes; then 1025if test x$support_afterimage = xyes; then
1037 echo " AfterImage library: $AFTERIMAGE_LIBS" 1026 echo " AfterImage support: yes"
1038fi 1027fi
1039 1028
1040if test x$support_afterstep = xyes; then 1029if test x$support_afterstep = xyes; then
1041 echo " With AfterStep integration" 1030 echo " AfterStep integration: yes"
1042fi 1031fi
1043 1032
1044if test x$term != x; then 1033if test x$term != x; then
1045 echo " set TERM to: $term" 1034 echo " set TERM to: $term"
1046fi 1035fi

Diff Legend

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