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.45 by root, Sat Jun 9 13:04:27 2007 UTC vs.
Revision 1.56 by root, Tue Jun 26 00:40:18 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
… …
74 78
75AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.) 79AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
76 80
77case $host in 81case $host in
78 *-*-solaris* ) 82 *-*-solaris* )
79 AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) 83 AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris)
80 AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
81 AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
82 ;; 84 ;;
83esac 85esac
84 86
85dnl if test x$GXX = xyes; then 87dnl if test x$GXX = xyes; then
86dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... 88dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
… …
239 support_afterimage=$enableval 241 support_afterimage=$enableval
240 fi]) 242 fi])
241 243
242AC_ARG_WITH(afterimage_config, 244AC_ARG_WITH(afterimage_config,
243 [ --with-afterimage-config=DIR use libAfterImage config script in DIR], 245 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
244 [afterimage_config="$withval"]) 246 [if test "x$withval" != x; then
247 afterimage_config=$withval/afterimage-config
248 fi])
245 249
246AC_ARG_ENABLE(afterstep, 250AC_ARG_ENABLE(afterstep,
247 [ --enable-afterstep enable integration with AfterStep window manager], 251 [ --enable-afterstep enable integration with AfterStep window manager],
248 [if test x$enableval = xyes -o x$enableval = xno; then 252 [if test x$enableval = xyes -o x$enableval = xno; then
249 support_afterstep=$enableval 253 support_afterstep=$enableval
… …
437 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 441 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
438 fi]) 442 fi])
439 443
440dnl# -------------------------------------------------------------------------- 444dnl# --------------------------------------------------------------------------
441 445
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) 446AC_PATH_PROG(TIC, tic)
449 447
450dnl# need a neat way to detect SVR4 or its features 448dnl# need a neat way to detect SVR4 or its features
451dnl# in src/command.c we use these functions: 449dnl# in src/command.c we use these functions:
452dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 450dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
… …
470have_afterimage= 468have_afterimage=
471 469
472if test x$support_afterimage = xyes; then 470if test x$support_afterimage = xyes; then
473 support_afterimage=no 471 support_afterimage=no
474 472
475 if test "x$afterimage_config" = "x" ; then 473 if test "x$afterimage_config" = "x" ; then
476 AC_PATH_PROG(afterimage_config, afterimage-config, no) 474 AC_PATH_PROG(afterimage_config, afterimage-config, no)
477 else
478 afterimage_config=$afterimage_config/afterimage-config
479 fi 475 fi
480 476
481 AC_MSG_CHECKING(for libAfterImage) 477 AC_MSG_CHECKING(for libAfterImage)
482 if $afterimage_config --version >/dev/null 2>&1 ; then 478 if $afterimage_config --version >/dev/null 2>&1 ; then
483 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 479 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
… …
745if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 741if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
746exit (XSupportsLocale() ? 0 : 1); 742exit (XSupportsLocale() ? 0 : 1);
747else 743else
748exit (1);}]])],[dnl 744exit (1);}]])],[dnl
749 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 745 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
750 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) 746 :])])
747if test x$support_xim = xyes; then
751if test x$rxvt_cv_func_xlocale = xyes; then 748 if test x$rxvt_cv_func_xlocale = xyes; then
752 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 749 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
750 fi
753fi 751fi
754 752
755AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 753AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
756[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 754[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
757#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 755#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
… …
832fi 830fi
833if test x$support_tinting = xyes; then 831if test x$support_tinting = xyes; then
834 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) 832 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
835fi 833fi
836if test x$support_inheritpixmap = xyes; then 834if test x$support_inheritpixmap = xyes; then
837 AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) 835 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
838fi 836fi
839if test x$support_keepscrolling = xno; then 837if test x$support_keepscrolling = xno; then
840 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 838 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
841fi 839fi
842if test x$support_selectionscrolling = xyes; then 840if test x$support_selectionscrolling = xyes; then
… …
848if test x$support_mousewheel = xyes; then 846if test x$support_mousewheel = xyes; then
849 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 847 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
850fi 848fi
851if test x$support_mouseslipwheel = xyes; then 849if test x$support_mouseslipwheel = xyes; then
852 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) 850 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
853fi
854if test x$support_xim = xyes -o x$multichar_set = xyes; then
855 if test x$rxvt_cv_func_xlocale = xyes; then
856 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
857 fi
858fi 851fi
859if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then 852if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then
860 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage) 853 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
861fi 854fi
862 855
… …
957 950
958if test x$support_perl = xyes; then 951if test x$support_perl = xyes; then
959 support_frills=yes 952 support_frills=yes
960fi 953fi
961 954
962AC_SUBST(DEBUG)
963AC_SUBST(DINCLUDE)
964AC_SUBST(CFLAGS) 955AC_SUBST(CFLAGS)
965AC_SUBST(CPPFLAGS) 956AC_SUBST(CPPFLAGS)
966AC_SUBST(LDFLAGS) 957AC_SUBST(LDFLAGS)
967AC_SUBST(X_CFLAGS) 958AC_SUBST(X_CFLAGS)
968 959
969dnl# Attack the libs 960dnl# Attack the libs
970if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 961if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
971 DLIB=`echo $DLIB | sed "$R_TRANSLATE"`
972 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 962 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
973 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` 963 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
974 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` 964 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
975 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` 965 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
976fi 966fi
977AC_SUBST(DLIB)
978AC_SUBST(LIBS) 967AC_SUBST(LIBS)
979AC_SUBST(X_LIBS) 968AC_SUBST(X_LIBS)
980AC_SUBST(X_EXTRA_LIBS) 969AC_SUBST(X_EXTRA_LIBS)
981 970
982AC_SUBST(LIBAFTERIMAGE_CFLAGS) 971AC_SUBST(LIBAFTERIMAGE_CFLAGS)
… …
1032if test x$support_afterimage = xyes; then 1021if test x$support_afterimage = xyes; then
1033 echo " AfterImage support: yes" 1022 echo " AfterImage support: yes"
1034fi 1023fi
1035 1024
1036if test x$support_afterstep = xyes; then 1025if test x$support_afterstep = xyes; then
1037 echo " AfterStep intergration: yes" 1026 echo " AfterStep integration: yes"
1038fi 1027fi
1039 1028
1040if test x$term != x; then 1029if test x$term != x; then
1041 echo " set TERM to: $term" 1030 echo " set TERM to: $term"
1042fi 1031fi

Diff Legend

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