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.68 by ayin, Wed Aug 1 18:10:10 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
… …
245 [ --with-afterimage-config=DIR use libAfterImage config script in DIR], 241 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
246 [if test "x$withval" != x; then 242 [if test "x$withval" != x; then
247 afterimage_config=$withval/afterimage-config 243 afterimage_config=$withval/afterimage-config
248 fi]) 244 fi])
249 245
250AC_ARG_ENABLE(afterstep, 246dnl AC_ARG_ENABLE(afterstep,
251 [ --enable-afterstep enable integration with AfterStep window manager], 247dnl [ --enable-afterstep enable integration with AfterStep window manager],
252 [if test x$enableval = xyes -o x$enableval = xno; then 248dnl [if test x$enableval = xyes -o x$enableval = xno; then
253 support_afterstep=$enableval 249dnl support_afterstep=$enableval
254 fi]) 250dnl fi])
255 251
256AC_ARG_ENABLE(transparency, 252AC_ARG_ENABLE(transparency,
257 [ --enable-transparency enable transparent backgrounds], 253 [ --enable-transparency enable transparent backgrounds],
258 [if test x$enableval = xyes -o x$enableval = xno; then 254 [if test x$enableval = xyes -o x$enableval = xno; then
259 support_inheritpixmap=$enableval 255 support_inheritpixmap=$enableval
… …
461AC_PATH_XTRA 457AC_PATH_XTRA
462 458
463dnl# the only reasonable way to find libXpm is do-it-yourself 459dnl# the only reasonable way to find libXpm is do-it-yourself
464dnl# only check if we want xpm-background 460dnl# only check if we want xpm-background
465 461
466LIBAFTERIMAGE_CFLAGS= 462AFTERIMAGE_CFLAGS=
467AFTERIMAGE_LIBS= 463AFTERIMAGE_LIBS=
468have_afterimage= 464AFTERIMAGE_VERSION=
469 465
470if test x$support_afterimage = xyes; then 466if test x$support_afterimage = xyes; then
471 support_afterimage=no 467 support_afterimage=no
472 468
473 if test "x$afterimage_config" = "x" ; then 469 if test "x$afterimage_config" = "x" ; then
474 AC_PATH_PROG(afterimage_config, afterimage-config, no) 470 AC_PATH_PROG(afterimage_config, afterimage-config, no)
475 fi 471 fi
476
477 AC_MSG_CHECKING(for libAfterImage) 472 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
478 if $afterimage_config --version >/dev/null 2>&1 ; then 473 AFTERIMAGE_VERSION=`$afterimage_config --version`
474 if test -n "$AFTERIMAGE_VERSION" ; then
479 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 475 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
480 AFTERIMAGE_LIBS=`$afterimage_config --libs` 476 AFTERIMAGE_LIBS=`$afterimage_config --libs`
481 if test "x$AFTERIMAGE_LIBS" != "x"; then 477 if test "x$AFTERIMAGE_LIBS" != "x"; then
478 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
479 libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .`
480 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
482 support_afterimage=yes 481 support_afterimage=yes
482 fi
483 fi 483 fi
484 fi 484 fi
485 485
486 if test "x$support_afterimage" = "xyes"; then 486 if test "x$support_afterimage" = "xyes"; then
487 AC_MSG_RESULT($AFTERIMAGE_LIBS) 487 AC_MSG_RESULT($AFTERIMAGE_LIBS)
… …
534AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 534AC_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])]) 535[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 536if test x$rxvt_cv_xpointer = xyes; then
537 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 537 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
538fi 538fi
539LIBS=$ac_save_LIBS
540CFLAGS=$ac_save_CFLAGS
541 539
542AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 540AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
543[AC_COMPILE_IFELSE( 541[AC_COMPILE_IFELSE(
544 [AC_LANG_PROGRAM([ 542 [AC_LANG_PROGRAM([
545#define XLIB_ILLEGAL_ACCESS 543#define XLIB_ILLEGAL_ACCESS
… …
806 804
807if test x$support_afterimage = xyes; then 805if test x$support_afterimage = xyes; then
808 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 806 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
809fi 807fi
810 808
811if test x$support_afterstep = xyes; then 809dnl if test x$support_afterstep = xyes; then
812 AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) 810dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
813fi 811dnl fi
814 812
815if test x$support_scroll_rxvt = xyes; then 813if test x$support_scroll_rxvt = xyes; then
816 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) 814 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
817 scrolltypes="rxvt" 815 scrolltypes="rxvt"
818fi 816fi
… …
915dnl# Attack the libs 913dnl# Attack the libs
916AC_SUBST(LIBS) 914AC_SUBST(LIBS)
917AC_SUBST(X_LIBS) 915AC_SUBST(X_LIBS)
918AC_SUBST(X_EXTRA_LIBS) 916AC_SUBST(X_EXTRA_LIBS)
919 917
920AC_SUBST(LIBAFTERIMAGE_CFLAGS) 918AC_SUBST(AFTERIMAGE_CFLAGS)
921AC_SUBST(AFTERIMAGE_LIBS) 919AC_SUBST(AFTERIMAGE_LIBS)
922 920
923AC_ARG_PROGRAM 921AC_ARG_PROGRAM
924 922
925dnl# test for "sun" or "__sun__" before include sys_ioctl 923dnl# test for "sun" or "__sun__" before include sys_ioctl
… …
969 967
970if test x$support_afterimage = xyes; then 968if test x$support_afterimage = xyes; then
971 echo " AfterImage support: yes" 969 echo " AfterImage support: yes"
972fi 970fi
973 971
974if test x$support_afterstep = xyes; then 972dnl if test x$support_afterstep = xyes; then
975 echo " AfterStep integration: yes" 973dnl echo " AfterStep integration: yes"
976fi 974dnl fi
977 975
978if test x$term != x; then 976if test x$term != x; then
979 echo " set TERM to: $term" 977 echo " set TERM to: $term"
980fi 978fi
981if test x$terminfo != x; then 979if test x$terminfo != x; then

Diff Legend

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