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.53 by ayin, Mon Jun 25 13:50:40 2007 UTC

… …
46 CXX="$CC" 46 CXX="$CC"
47 LIBS="$LIBS -lsupc++" 47 LIBS="$LIBS -lsupc++"
48 LINKER="$CC" 48 LINKER="$CC"
49 AC_LINK_IFELSE( 49 AC_LINK_IFELSE(
50 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])], 50 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
51 [
51 [AC_MSG_RESULT(ok)], 52 AC_MSG_RESULT(ok)
53 CXXLIB="-lsupc++"
54 ],
52 [ 55 [
53 AC_MSG_RESULT([no, making everything bigger and slower]) 56 AC_MSG_RESULT([no, making everything bigger and slower])
54 LIBS="$save_LIBS" 57 LIBS="$save_LIBS"
55 LINKER="$save_CXX" 58 LINKER="$save_CXX"
56 ] 59 ]
57 ) 60 )
58 CXX="$save_CXX" 61 CXX="$save_CXX"
59fi 62fi
60AC_SUBST(LINKER,[$LINKER]) 63AC_SUBST(LINKER,[$LINKER])
64AC_SUBST(CXXLIB)
61 65
62dnl# -------------------------------------------------------------------------- 66dnl# --------------------------------------------------------------------------
63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 67dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
64dnl# 68dnl#
65if test -z "$orig_CXXFLAGS"; then 69if test -z "$orig_CXXFLAGS"; then
… …
239 support_afterimage=$enableval 243 support_afterimage=$enableval
240 fi]) 244 fi])
241 245
242AC_ARG_WITH(afterimage_config, 246AC_ARG_WITH(afterimage_config,
243 [ --with-afterimage-config=DIR use libAfterImage config script in DIR], 247 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
244 [afterimage_config="$withval"]) 248 [if test "x$withval" != x; then
249 afterimage_config=$withval/afterimage-config
250 fi])
245 251
246AC_ARG_ENABLE(afterstep, 252AC_ARG_ENABLE(afterstep,
247 [ --enable-afterstep enable integration with AfterStep window manager], 253 [ --enable-afterstep enable integration with AfterStep window manager],
248 [if test x$enableval = xyes -o x$enableval = xno; then 254 [if test x$enableval = xyes -o x$enableval = xno; then
249 support_afterstep=$enableval 255 support_afterstep=$enableval
… …
437 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 443 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
438 fi]) 444 fi])
439 445
440dnl# -------------------------------------------------------------------------- 446dnl# --------------------------------------------------------------------------
441 447
442AC_PATH_PROG(MV, mv, mv)
443AC_PATH_PROG(CP, cp, cp)
444AC_PATH_PROG(LN, ln, ln)
445AC_PATH_PROG(SED, sed, sed)
446AC_PATH_PROG(ECHO, echo, echo)
447AC_PATH_PROG(CMP, cmp, cmp)
448AC_PATH_PROG(TIC, tic) 448AC_PATH_PROG(TIC, tic)
449 449
450dnl# need a neat way to detect SVR4 or its features 450dnl# need a neat way to detect SVR4 or its features
451dnl# in src/command.c we use these functions: 451dnl# in src/command.c we use these functions:
452dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 452dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
… …
467 467
468LIBAFTERIMAGE_CFLAGS= 468LIBAFTERIMAGE_CFLAGS=
469AFTERIMAGE_LIBS= 469AFTERIMAGE_LIBS=
470have_afterimage= 470have_afterimage=
471 471
472if test x$support_afterimage == xyes; then 472if test x$support_afterimage = xyes; then
473 AC_MSG_CHECKING(installed libAfterImage)
474 support_afterimage=no 473 support_afterimage=no
474
475 if test "x$afterimage_config" = "x" ; then 475 if test "x$afterimage_config" = "x" ; then
476 if afterimage-config --version > /dev/null 2>&1 ; then
477 afterimage_config=afterimage-config 476 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 477 fi
483 else 478
484 afterimage_config=$afterimage_config/afterimage-config 479 AC_MSG_CHECKING(for libAfterImage)
485 fi
486 if $afterimage_config --version > /dev/null 2>&1 ; then 480 if $afterimage_config --version >/dev/null 2>&1 ; then
487 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 481 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
488 AFTERIMAGE_LIBS=`$afterimage_config --libs` 482 AFTERIMAGE_LIBS=`$afterimage_config --libs`
489 if test "x$AFTERIMAGE_LIBS" != "x"; then 483 if test "x$AFTERIMAGE_LIBS" != "x"; then
490 support_afterimage=yes 484 support_afterimage=yes
491 fi 485 fi
492 fi 486 fi
493 487
494 if test "x$support_afterimage" = "xyes"; then 488 if test "x$support_afterimage" = "xyes"; then
495 AC_MSG_RESULT($AFTERIMAGE_LIBS) 489 AC_MSG_RESULT($AFTERIMAGE_LIBS)
496 else 490 else
497 AC_MSG_RESULT(afterimage-config not found in $afterimage_config - can't use libAfterImage for images.) 491 AC_MSG_RESULT(no)
498 fi 492 fi
499fi 493fi
500 494
501if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then 495if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
502 VT_FIND_LIBXPM 496 VT_FIND_LIBXPM
… …
749if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 743if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
750exit (XSupportsLocale() ? 0 : 1); 744exit (XSupportsLocale() ? 0 : 1);
751else 745else
752exit (1);}]])],[dnl 746exit (1);}]])],[dnl
753 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 747 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
754 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) 748 :])])
755if test x$rxvt_cv_func_xlocale = xyes; then
756 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)
757fi
758 749
759AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 750AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
760[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 751[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
761#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 752#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
762if test x$rxvt_cv_func_xsetlocale = xyes; then 753if test x$rxvt_cv_func_xsetlocale = xyes; then
… …
961 952
962if test x$support_perl = xyes; then 953if test x$support_perl = xyes; then
963 support_frills=yes 954 support_frills=yes
964fi 955fi
965 956
966AC_SUBST(DEBUG)
967AC_SUBST(DINCLUDE)
968AC_SUBST(CFLAGS) 957AC_SUBST(CFLAGS)
969AC_SUBST(CPPFLAGS) 958AC_SUBST(CPPFLAGS)
970AC_SUBST(LDFLAGS) 959AC_SUBST(LDFLAGS)
971AC_SUBST(X_CFLAGS) 960AC_SUBST(X_CFLAGS)
972 961
973dnl# Attack the libs 962dnl# Attack the libs
974if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 963if 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"` 964 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
977 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` 965 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
978 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` 966 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
979 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` 967 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
980fi 968fi
981AC_SUBST(DLIB)
982AC_SUBST(LIBS) 969AC_SUBST(LIBS)
983AC_SUBST(X_LIBS) 970AC_SUBST(X_LIBS)
984AC_SUBST(X_EXTRA_LIBS) 971AC_SUBST(X_EXTRA_LIBS)
985 972
986AC_SUBST(LIBAFTERIMAGE_CFLAGS) 973AC_SUBST(LIBAFTERIMAGE_CFLAGS)
… …
1032if test x$support_xpm = xyes; then 1019if test x$support_xpm = xyes; then
1033 echo " Xpm library: $XPM_LIBS" 1020 echo " Xpm library: $XPM_LIBS"
1034fi 1021fi
1035 1022
1036if test x$support_afterimage = xyes; then 1023if test x$support_afterimage = xyes; then
1037 echo " AfterImage library: $AFTERIMAGE_LIBS" 1024 echo " AfterImage support: yes"
1038fi 1025fi
1039 1026
1040if test x$support_afterstep = xyes; then 1027if test x$support_afterstep = xyes; then
1041 echo " With AfterStep integration" 1028 echo " AfterStep integration: yes"
1042fi 1029fi
1043 1030
1044if test x$term != x; then 1031if test x$term != x; then
1045 echo " set TERM to: $term" 1032 echo " set TERM to: $term"
1046fi 1033fi

Diff Legend

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