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.54 by ayin, Mon Jun 25 13:53:42 2007 UTC vs.
Revision 1.69 by root, Wed Aug 1 18:38:15 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
… …
78 74
79AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.) 75AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
80 76
81case $host in 77case $host in
82 *-*-solaris* ) 78 *-*-solaris* )
83 AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) 79 AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris)
84 AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
85 AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
86 ;; 80 ;;
87esac 81esac
88 82
89dnl if test x$GXX = xyes; then 83dnl if test x$GXX = xyes; then
90dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... 84dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
… …
247 [ --with-afterimage-config=DIR use libAfterImage config script in DIR], 241 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
248 [if test "x$withval" != x; then 242 [if test "x$withval" != x; then
249 afterimage_config=$withval/afterimage-config 243 afterimage_config=$withval/afterimage-config
250 fi]) 244 fi])
251 245
252AC_ARG_ENABLE(afterstep, 246dnl AC_ARG_ENABLE(afterstep,
253 [ --enable-afterstep enable integration with AfterStep window manager], 247dnl [ --enable-afterstep enable integration with AfterStep window manager],
254 [if test x$enableval = xyes -o x$enableval = xno; then 248dnl [if test x$enableval = xyes -o x$enableval = xno; then
255 support_afterstep=$enableval 249dnl support_afterstep=$enableval
256 fi]) 250dnl fi])
257 251
258AC_ARG_ENABLE(transparency, 252AC_ARG_ENABLE(transparency,
259 [ --enable-transparency enable transparent backgrounds], 253 [ --enable-transparency enable transparent backgrounds],
260 [if test x$enableval = xyes -o x$enableval = xno; then 254 [if test x$enableval = xyes -o x$enableval = xno; then
261 support_inheritpixmap=$enableval 255 support_inheritpixmap=$enableval
… …
463AC_PATH_XTRA 457AC_PATH_XTRA
464 458
465dnl# the only reasonable way to find libXpm is do-it-yourself 459dnl# the only reasonable way to find libXpm is do-it-yourself
466dnl# only check if we want xpm-background 460dnl# only check if we want xpm-background
467 461
468LIBAFTERIMAGE_CFLAGS= 462AFTERIMAGE_CFLAGS=
469AFTERIMAGE_LIBS= 463AFTERIMAGE_LIBS=
470have_afterimage= 464AFTERIMAGE_VERSION=
471 465
472if test x$support_afterimage = xyes; then 466if test x$support_afterimage = xyes; then
473 support_afterimage=no 467 support_afterimage=no
474 468
475 if test "x$afterimage_config" = "x" ; then 469 if test "x$afterimage_config" = "x" ; then
476 AC_PATH_PROG(afterimage_config, afterimage-config, no) 470 AC_PATH_PROG(afterimage_config, afterimage-config, no)
477 fi 471 fi
478 472 if test "x$afterimage_config" != "xno" ; then
479 AC_MSG_CHECKING(for libAfterImage) 473 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
480 if $afterimage_config --version >/dev/null 2>&1 ; then 474 xAFTERIMAGE_VERSION=`$afterimage_config --version`
475 if test -n "$xAFTERIMAGE_VERSION" ; then
481 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 476 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
482 AFTERIMAGE_LIBS=`$afterimage_config --libs` 477 xAFTERIMAGE_LIBS=`$afterimage_config --libs`
483 if test "x$AFTERIMAGE_LIBS" != "x"; then 478 if test "x$xAFTERIMAGE_LIBS" != "x"; then
479 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .`
480 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .`
481 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
484 support_afterimage=yes 482 support_afterimage=yes
483 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
484 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
485 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
486 fi
487 fi
485 fi 488 fi
486 fi
487
488 if test "x$support_afterimage" = "xyes"; then 489 if test "x$support_afterimage" = "xyes"; then
489 AC_MSG_RESULT($AFTERIMAGE_LIBS) 490 AC_MSG_RESULT($AFTERIMAGE_LIBS)
490 else 491 else
491 AC_MSG_RESULT(no) 492 AC_MSG_RESULT(no)
493 fi
492 fi 494 fi
493fi 495fi
494 496
495if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then 497if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
496 VT_FIND_LIBXPM 498 VT_FIND_LIBXPM
… …
531#include <sys/ioctl.h> 533#include <sys/ioctl.h>
532#ifdef HAVE_TERMIOS_H 534#ifdef HAVE_TERMIOS_H
533#include <termios.h> 535#include <termios.h>
534#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) 536#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
535 537
536dnl# ELF systems may want to store paths for dynamic libraries.
537dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
538dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
539if test -n "$GCC"; then
540 LDARG="-Wl,"
541else
542 LDARG=""
543fi
544changequote(, )dnl
545R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-rpath '$LDARG'\1/g'
546changequote([, ])dnl
547
548ac_save_CFLAGS=$CFLAGS
549ac_save_LIBS=$LIBS
550CFLAGS="$CFLAGS $X_CFLAGS"
551LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
552AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
553[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
554#include <stdlib.h>
555main()
556{
557 exit(0);
558 (void) XOpenDisplay("foobar");
559}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
560 AC_MSG_WARN(You may need to check the LIBS line)])])
561if test x$rxvt_cv_rpath != xyes; then
562 changequote(, )dnl
563 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
564 changequote([, ])dnl
565 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
566 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
567[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
568#include <stdlib.h>
569main()
570{
571 exit(0);
572 (void) XOpenDisplay("foobar");
573}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
574 if test x$rxvt_cv_R != xyes; then
575 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
576 fi
577fi
578
579AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 538AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
580[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) 539[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
581if test x$rxvt_cv_xpointer = xyes; then 540if test x$rxvt_cv_xpointer = xyes; then
582 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 541 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
583fi 542fi
584LIBS=$ac_save_LIBS
585CFLAGS=$ac_save_CFLAGS
586 543
587AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 544AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
588[AC_COMPILE_IFELSE( 545[AC_COMPILE_IFELSE(
589 [AC_LANG_PROGRAM([ 546 [AC_LANG_PROGRAM([
590#define XLIB_ILLEGAL_ACCESS 547#define XLIB_ILLEGAL_ACCESS
… …
730dnl# this is a really hack test for some basic Xlocale stuff 687dnl# this is a really hack test for some basic Xlocale stuff
731ac_save_LIBS=$LIBS 688ac_save_LIBS=$LIBS
732ac_save_CFLAGS=$CFLAGS 689ac_save_CFLAGS=$CFLAGS
733CFLAGS="$CFLAGS $X_CFLAGS" 690CFLAGS="$CFLAGS $X_CFLAGS"
734LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 691LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
735if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
736 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
737fi
738AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 692AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
739[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 693[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
740#include <stdlib.h> 694#include <stdlib.h>
741main() { 695main() {
742char *p; 696char *p;
… …
832fi 786fi
833if test x$support_tinting = xyes; then 787if test x$support_tinting = xyes; then
834 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) 788 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
835fi 789fi
836if test x$support_inheritpixmap = xyes; then 790if test x$support_inheritpixmap = xyes; then
837 AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) 791 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
838fi 792fi
839if test x$support_keepscrolling = xno; then 793if 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) 794 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
841fi 795fi
842if test x$support_selectionscrolling = xyes; then 796if test x$support_selectionscrolling = xyes; then
843 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) 797 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
844fi 798fi
845if test x$support_frills = xyes; then
846 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
847fi
848if test x$support_mousewheel = xyes; then 799if test x$support_mousewheel = xyes; then
849 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 800 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
850fi 801fi
851if test x$support_mouseslipwheel = xyes; then 802if 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) 803 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
… …
857 808
858if test x$support_afterimage = xyes; then 809if test x$support_afterimage = xyes; then
859 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 810 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
860fi 811fi
861 812
862if test x$support_afterstep = xyes; then 813dnl if test x$support_afterstep = xyes; then
863 AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) 814dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
864fi 815dnl fi
865 816
866if test x$support_scroll_rxvt = xyes; then 817if test x$support_scroll_rxvt = xyes; then
867 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) 818 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
868 scrolltypes="rxvt" 819 scrolltypes="rxvt"
869fi 820fi
… …
952 903
953if test x$support_perl = xyes; then 904if test x$support_perl = xyes; then
954 support_frills=yes 905 support_frills=yes
955fi 906fi
956 907
908if test x$support_frills = xyes; then
909 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
910fi
911
957AC_SUBST(CFLAGS) 912AC_SUBST(CFLAGS)
958AC_SUBST(CPPFLAGS) 913AC_SUBST(CPPFLAGS)
959AC_SUBST(LDFLAGS) 914AC_SUBST(LDFLAGS)
960AC_SUBST(X_CFLAGS) 915AC_SUBST(X_CFLAGS)
961 916
962dnl# Attack the libs 917dnl# Attack the libs
963if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
964 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
965 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
966 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
967 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
968fi
969AC_SUBST(LIBS) 918AC_SUBST(LIBS)
970AC_SUBST(X_LIBS) 919AC_SUBST(X_LIBS)
971AC_SUBST(X_EXTRA_LIBS) 920AC_SUBST(X_EXTRA_LIBS)
972 921
973AC_SUBST(LIBAFTERIMAGE_CFLAGS) 922AC_SUBST(AFTERIMAGE_CFLAGS)
974AC_SUBST(AFTERIMAGE_LIBS) 923AC_SUBST(AFTERIMAGE_LIBS)
975 924
976AC_ARG_PROGRAM 925AC_ARG_PROGRAM
977 926
978dnl# test for "sun" or "__sun__" before include sys_ioctl 927dnl# test for "sun" or "__sun__" before include sys_ioctl
… …
1022 971
1023if test x$support_afterimage = xyes; then 972if test x$support_afterimage = xyes; then
1024 echo " AfterImage support: yes" 973 echo " AfterImage support: yes"
1025fi 974fi
1026 975
1027if test x$support_afterstep = xyes; then 976dnl if test x$support_afterstep = xyes; then
1028 echo " AfterStep integration: yes" 977dnl echo " AfterStep integration: yes"
1029fi 978dnl fi
1030 979
1031if test x$term != x; then 980if test x$term != x; then
1032 echo " set TERM to: $term" 981 echo " set TERM to: $term"
1033fi 982fi
1034if test x$terminfo != x; then 983if test x$terminfo != x; then
… …
1039if test x$RESFALLBACK != x; then 988if test x$RESFALLBACK != x; then
1040 echo " resource class fallback: $RESFALLBACK" 989 echo " resource class fallback: $RESFALLBACK"
1041fi 990fi
1042echo 991echo
1043echo " embedded perl: $support_perl" 992echo " embedded perl: $support_perl"
993echo " libafterimage: $support_afterimage"
1044echo 994echo
1045if test x$support_xpm = xneedsmanualspecification; then 995if test x$support_xpm = xneedsmanualspecification; then
1046 echo ".----------------------------------------------------------------." 996 echo ".----------------------------------------------------------------."
1047 echo ". WARNING: --enable-xpm-background was specified however the ." 997 echo ". WARNING: --enable-xpm-background was specified however the ."
1048 echo ". XPM includes files and libraries could not be found. ." 998 echo ". XPM includes files and libraries could not be found. ."

Diff Legend

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