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.59 by ayin, Tue Jun 26 20:53:07 2007 UTC vs.
Revision 1.70 by ayin, Thu Aug 2 00:09:54 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 [
52 AC_MSG_RESULT(ok) 51 [AC_MSG_RESULT(ok)],
53 CXXLIB="-lsupc++"
54 ],
55 [ 52 [
56 AC_MSG_RESULT([no, making everything bigger and slower]) 53 AC_MSG_RESULT([no, making everything bigger and slower])
57 LIBS="$save_LIBS" 54 LIBS="$save_LIBS"
58 LINKER="$save_CXX" 55 LINKER="$save_CXX"
59 ] 56 ]
60 ) 57 )
61 CXX="$save_CXX" 58 CXX="$save_CXX"
62fi 59fi
63AC_SUBST(LINKER,[$LINKER]) 60AC_SUBST(LINKER,[$LINKER])
64AC_SUBST(CXXLIB)
65 61
66dnl# -------------------------------------------------------------------------- 62dnl# --------------------------------------------------------------------------
67dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
68dnl# 64dnl#
69if test -z "$orig_CXXFLAGS"; then 65if test -z "$orig_CXXFLAGS"; then
… …
112support_scroll_rxvt=yes 108support_scroll_rxvt=yes
113support_scroll_next=yes 109support_scroll_next=yes
114support_scroll_xterm=yes 110support_scroll_xterm=yes
115support_scroll_plain=yes 111support_scroll_plain=yes
116support_xim=yes 112support_xim=yes
117support_xpm=yes
118support_afterimage=yes 113support_afterimage=yes
119support_afterstep=yes 114support_afterstep=yes
120support_xft=yes 115support_xft=yes
121support_unicode3=no 116support_unicode3=no
122support_combining=yes 117support_combining=yes
… …
158 support_scroll_xterm=no 153 support_scroll_xterm=no
159 support_scroll_plain=no 154 support_scroll_plain=no
160 support_utmp=no 155 support_utmp=no
161 support_wtmp=no 156 support_wtmp=no
162 support_xim=no 157 support_xim=no
163 support_xpm=no
164 support_afterimage=no 158 support_afterimage=no
165 support_afterstep=no 159 support_afterstep=no
166 support_xft=no 160 support_xft=no
167 support_unicode3=no 161 support_unicode3=no
168 support_combining=no 162 support_combining=no
… …
189 support_scroll_xterm=yes 183 support_scroll_xterm=yes
190 support_scroll_plain=yes 184 support_scroll_plain=yes
191 support_utmp=yes 185 support_utmp=yes
192 support_wtmp=yes 186 support_wtmp=yes
193 support_xim=yes 187 support_xim=yes
194 support_xpm=yes
195 support_afterimage=yes 188 support_afterimage=yes
196 support_afterstep=yes 189 support_afterstep=yes
197 support_xft=yes 190 support_xft=yes
198 support_unicode3=yes 191 support_unicode3=yes
199 support_combining=yes 192 support_combining=yes
… …
227 [ --enable-font-styles enable bold and italic support], 220 [ --enable-font-styles enable bold and italic support],
228 [if test x$enableval = xyes -o x$enableval = xno; then 221 [if test x$enableval = xyes -o x$enableval = xno; then
229 support_styles=$enableval 222 support_styles=$enableval
230 fi]) 223 fi])
231 224
232AC_ARG_ENABLE(xpm-background,
233 [ --enable-xpm-background enable background pixmaps],
234 [if test x$enableval = xyes -o x$enableval = xno; then
235 support_xpm=$enableval
236 fi])
237
238AC_ARG_ENABLE(afterimage, 225AC_ARG_ENABLE(afterimage,
239 [ --enable-afterimage enable integration with libAfterImage for background images], 226 [ --enable-afterimage enable integration with libAfterImage for background images],
240 [if test x$enableval = xyes -o x$enableval = xno; then 227 [if test x$enableval = xyes -o x$enableval = xno; then
241 support_afterimage=$enableval 228 support_afterimage=$enableval
242 fi]) 229 fi])
… …
245 [ --with-afterimage-config=DIR use libAfterImage config script in DIR], 232 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
246 [if test "x$withval" != x; then 233 [if test "x$withval" != x; then
247 afterimage_config=$withval/afterimage-config 234 afterimage_config=$withval/afterimage-config
248 fi]) 235 fi])
249 236
250AC_ARG_ENABLE(afterstep, 237dnl AC_ARG_ENABLE(afterstep,
251 [ --enable-afterstep enable integration with AfterStep window manager], 238dnl [ --enable-afterstep enable integration with AfterStep window manager],
252 [if test x$enableval = xyes -o x$enableval = xno; then 239dnl [if test x$enableval = xyes -o x$enableval = xno; then
253 support_afterstep=$enableval 240dnl support_afterstep=$enableval
254 fi]) 241dnl fi])
255 242
256AC_ARG_ENABLE(transparency, 243AC_ARG_ENABLE(transparency,
257 [ --enable-transparency enable transparent backgrounds], 244 [ --enable-transparency enable transparent backgrounds],
258 [if test x$enableval = xyes -o x$enableval = xno; then 245 [if test x$enableval = xyes -o x$enableval = xno; then
259 support_inheritpixmap=$enableval 246 support_inheritpixmap=$enableval
… …
458dnl## #endif 445dnl## #endif
459dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?)) 446dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
460 447
461AC_PATH_XTRA 448AC_PATH_XTRA
462 449
463dnl# the only reasonable way to find libXpm is do-it-yourself
464dnl# only check if we want xpm-background
465
466LIBAFTERIMAGE_CFLAGS= 450AFTERIMAGE_CFLAGS=
467AFTERIMAGE_LIBS= 451AFTERIMAGE_LIBS=
468have_afterimage= 452AFTERIMAGE_VERSION=
469 453
470if test x$support_afterimage = xyes; then 454if test x$support_afterimage = xyes; then
471 support_afterimage=no 455 support_afterimage=no
472 456
473 if test "x$afterimage_config" = "x" ; then 457 if test "x$afterimage_config" = "x" ; then
474 AC_PATH_PROG(afterimage_config, afterimage-config, no) 458 AC_PATH_PROG(afterimage_config, afterimage-config, no)
475 fi 459 fi
476 460 if test "x$afterimage_config" != "xno" ; then
477 AC_MSG_CHECKING(for libAfterImage) 461 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
478 if $afterimage_config --version >/dev/null 2>&1 ; then 462 xAFTERIMAGE_VERSION=`$afterimage_config --version`
463 if test -n "$xAFTERIMAGE_VERSION" ; then
479 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 464 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
480 AFTERIMAGE_LIBS=`$afterimage_config --libs` 465 xAFTERIMAGE_LIBS=`$afterimage_config --libs`
481 if test "x$AFTERIMAGE_LIBS" != "x"; then 466 if test "x$xAFTERIMAGE_LIBS" != "x"; then
467 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .`
468 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .`
469 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
482 support_afterimage=yes 470 support_afterimage=yes
471 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
472 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
473 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
474 fi
475 fi
483 fi 476 fi
484 fi
485
486 if test "x$support_afterimage" = "xyes"; then 477 if test "x$support_afterimage" = "xyes"; then
487 AC_MSG_RESULT($AFTERIMAGE_LIBS) 478 AC_MSG_RESULT($AFTERIMAGE_LIBS)
488 else 479 else
489 AC_MSG_RESULT(no) 480 AC_MSG_RESULT(no)
490 fi 481 fi
491fi
492
493if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
494 VT_FIND_LIBXPM
495 if test x$no_xpm = xyes; then
496 support_xpm=needsmanualspecification
497 fi 482 fi
498fi 483fi
499 484
500dnl# -------------------------------------------------------------------------- 485dnl# --------------------------------------------------------------------------
501dnl# CHECKING FOR HEADER FILES 486dnl# CHECKING FOR HEADER FILES
… …
534AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 519AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
535[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) 520[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
536if test x$rxvt_cv_xpointer = xyes; then 521if test x$rxvt_cv_xpointer = xyes; then
537 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 522 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
538fi 523fi
539LIBS=$ac_save_LIBS
540CFLAGS=$ac_save_CFLAGS
541 524
542AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 525AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
543[AC_COMPILE_IFELSE( 526[AC_COMPILE_IFELSE(
544 [AC_LANG_PROGRAM([ 527 [AC_LANG_PROGRAM([
545#define XLIB_ILLEGAL_ACCESS 528#define XLIB_ILLEGAL_ACCESS
… …
798 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 781 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
799fi 782fi
800if test x$support_mouseslipwheel = xyes; then 783if test x$support_mouseslipwheel = xyes; then
801 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) 784 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
802fi 785fi
803if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then
804 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
805fi
806
807if test x$support_afterimage = xyes; then 786if test x$support_afterimage = xyes; then
808 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 787 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
788 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage)
809fi 789fi
810 790
811if test x$support_afterstep = xyes; then 791dnl if test x$support_afterstep = xyes; then
812 AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) 792dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
813fi 793dnl fi
814 794
815if test x$support_scroll_rxvt = xyes; then 795if test x$support_scroll_rxvt = xyes; then
816 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) 796 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
817 scrolltypes="rxvt" 797 scrolltypes="rxvt"
818fi 798fi
… …
915dnl# Attack the libs 895dnl# Attack the libs
916AC_SUBST(LIBS) 896AC_SUBST(LIBS)
917AC_SUBST(X_LIBS) 897AC_SUBST(X_LIBS)
918AC_SUBST(X_EXTRA_LIBS) 898AC_SUBST(X_EXTRA_LIBS)
919 899
920AC_SUBST(LIBAFTERIMAGE_CFLAGS) 900AC_SUBST(AFTERIMAGE_CFLAGS)
921AC_SUBST(AFTERIMAGE_LIBS) 901AC_SUBST(AFTERIMAGE_LIBS)
922 902
923AC_ARG_PROGRAM 903AC_ARG_PROGRAM
924 904
925dnl# test for "sun" or "__sun__" before include sys_ioctl 905dnl# test for "sun" or "__sun__" before include sys_ioctl
… …
961 Install path: ${prefix}/bin 941 Install path: ${prefix}/bin
962 Compiler: $CXX 942 Compiler: $CXX
963 Compiler flags: $CXXFLAGS 943 Compiler flags: $CXXFLAGS
964 Linker: $LINKER" 944 Linker: $LINKER"
965 945
966if test x$support_xpm = xyes; then
967 echo " Xpm library: $XPM_LIBS"
968fi
969
970if test x$support_afterimage = xyes; then 946if test x$support_afterimage = xyes; then
971 echo " AfterImage support: yes" 947 echo " AfterImage support: yes"
972fi 948fi
973 949
974if test x$support_afterstep = xyes; then 950dnl if test x$support_afterstep = xyes; then
975 echo " AfterStep integration: yes" 951dnl echo " AfterStep integration: yes"
976fi 952dnl fi
977 953
978if test x$term != x; then 954if test x$term != x; then
979 echo " set TERM to: $term" 955 echo " set TERM to: $term"
980fi 956fi
981if test x$terminfo != x; then 957if test x$terminfo != x; then
… …
986if test x$RESFALLBACK != x; then 962if test x$RESFALLBACK != x; then
987 echo " resource class fallback: $RESFALLBACK" 963 echo " resource class fallback: $RESFALLBACK"
988fi 964fi
989echo 965echo
990echo " embedded perl: $support_perl" 966echo " embedded perl: $support_perl"
967echo " libafterimage: $support_afterimage"
991echo 968echo
992if test x$support_xpm = xneedsmanualspecification; then
993 echo ".----------------------------------------------------------------."
994 echo ". WARNING: --enable-xpm-background was specified however the ."
995 echo ". XPM includes files and libraries could not be found. ."
996 echo ". XPM backgrounds are now being DISABLED! If you want ."
997 echo ". to use them you should rerun configure with the ."
998 echo ". appropriate --with-xpm-includes=/path/to/xpm/includes ."
999 echo ". and --with-xpm-library=/path/to/xpm/library lines. ."
1000 echo ".----------------------------------------------------------------."
1001fi
1002if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then 969if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
1003 echo ".----------------------------------------------------------------." 970 echo ".----------------------------------------------------------------."
1004 echo ". WARNING: --enable-xim was specified however the locale support ." 971 echo ". WARNING: --enable-xim was specified however the locale support ."
1005 echo ". functions could not be found. ." 972 echo ". functions could not be found. ."
1006 echo ". XIM is now being DISABLED! ." 973 echo ". XIM is now being DISABLED! ."

Diff Legend

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