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.51 by ayin, Wed Jun 13 12:34:32 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
… …
443 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 437 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
444 fi]) 438 fi])
445 439
446dnl# -------------------------------------------------------------------------- 440dnl# --------------------------------------------------------------------------
447 441
448AC_PATH_PROG(CP, cp, cp)
449AC_PATH_PROG(SED, sed, sed)
450AC_PATH_PROG(ECHO, echo, echo)
451AC_PATH_PROG(TIC, tic) 442AC_PATH_PROG(TIC, tic)
452 443
453dnl# need a neat way to detect SVR4 or its features 444dnl# need a neat way to detect SVR4 or its features
454dnl# in src/command.c we use these functions: 445dnl# in src/command.c we use these functions:
455dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 446dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
… …
466AC_PATH_XTRA 457AC_PATH_XTRA
467 458
468dnl# the only reasonable way to find libXpm is do-it-yourself 459dnl# the only reasonable way to find libXpm is do-it-yourself
469dnl# only check if we want xpm-background 460dnl# only check if we want xpm-background
470 461
471LIBAFTERIMAGE_CFLAGS= 462AFTERIMAGE_CFLAGS=
472AFTERIMAGE_LIBS= 463AFTERIMAGE_LIBS=
473have_afterimage= 464AFTERIMAGE_VERSION=
474 465
475if test x$support_afterimage = xyes; then 466if test x$support_afterimage = xyes; then
476 support_afterimage=no 467 support_afterimage=no
477 468
478 if test "x$afterimage_config" = "x" ; then 469 if test "x$afterimage_config" = "x" ; then
479 AC_PATH_PROG(afterimage_config, afterimage-config, no) 470 AC_PATH_PROG(afterimage_config, afterimage-config, no)
480 fi 471 fi
481 472 if test "x$afterimage_config" != "xno" ; then
482 AC_MSG_CHECKING(for libAfterImage) 473 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
483 if $afterimage_config --version >/dev/null 2>&1 ; then 474 xAFTERIMAGE_VERSION=`$afterimage_config --version`
475 if test -n "$xAFTERIMAGE_VERSION" ; then
484 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 476 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
485 AFTERIMAGE_LIBS=`$afterimage_config --libs` 477 xAFTERIMAGE_LIBS=`$afterimage_config --libs`
486 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
487 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
488 fi 488 fi
489 fi
490
491 if test "x$support_afterimage" = "xyes"; then 489 if test "x$support_afterimage" = "xyes"; then
492 AC_MSG_RESULT($AFTERIMAGE_LIBS) 490 AC_MSG_RESULT($AFTERIMAGE_LIBS)
493 else 491 else
494 AC_MSG_RESULT(no) 492 AC_MSG_RESULT(no)
493 fi
495 fi 494 fi
496fi 495fi
497 496
498if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then 497if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
499 VT_FIND_LIBXPM 498 VT_FIND_LIBXPM
… …
534#include <sys/ioctl.h> 533#include <sys/ioctl.h>
535#ifdef HAVE_TERMIOS_H 534#ifdef HAVE_TERMIOS_H
536#include <termios.h> 535#include <termios.h>
537#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])])
538 537
539dnl# ELF systems may want to store paths for dynamic libraries.
540dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
541dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
542if test -n "$GCC"; then
543 LDARG="-Wl,"
544else
545 LDARG=""
546fi
547changequote(, )dnl
548R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-rpath '$LDARG'\1/g'
549changequote([, ])dnl
550
551ac_save_CFLAGS=$CFLAGS
552ac_save_LIBS=$LIBS
553CFLAGS="$CFLAGS $X_CFLAGS"
554LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
555AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
556[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
557#include <stdlib.h>
558main()
559{
560 exit(0);
561 (void) XOpenDisplay("foobar");
562}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
563 AC_MSG_WARN(You may need to check the LIBS line)])])
564if test x$rxvt_cv_rpath != xyes; then
565 changequote(, )dnl
566 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
567 changequote([, ])dnl
568 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
569 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
570[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
571#include <stdlib.h>
572main()
573{
574 exit(0);
575 (void) XOpenDisplay("foobar");
576}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
577 if test x$rxvt_cv_R != xyes; then
578 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
579 fi
580fi
581
582AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 538AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
583[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])])
584if test x$rxvt_cv_xpointer = xyes; then 540if test x$rxvt_cv_xpointer = xyes; then
585 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 541 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
586fi 542fi
587LIBS=$ac_save_LIBS
588CFLAGS=$ac_save_CFLAGS
589 543
590AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 544AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
591[AC_COMPILE_IFELSE( 545[AC_COMPILE_IFELSE(
592 [AC_LANG_PROGRAM([ 546 [AC_LANG_PROGRAM([
593#define XLIB_ILLEGAL_ACCESS 547#define XLIB_ILLEGAL_ACCESS
… …
733dnl# this is a really hack test for some basic Xlocale stuff 687dnl# this is a really hack test for some basic Xlocale stuff
734ac_save_LIBS=$LIBS 688ac_save_LIBS=$LIBS
735ac_save_CFLAGS=$CFLAGS 689ac_save_CFLAGS=$CFLAGS
736CFLAGS="$CFLAGS $X_CFLAGS" 690CFLAGS="$CFLAGS $X_CFLAGS"
737LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 691LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
738if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
739 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
740fi
741AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 692AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
742[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 693[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
743#include <stdlib.h> 694#include <stdlib.h>
744main() { 695main() {
745char *p; 696char *p;
746if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 697if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
747exit (XSupportsLocale() ? 0 : 1); 698exit (XSupportsLocale() ? 0 : 1);
748else 699else
749exit (1);}]])],[dnl 700exit (1);}]])],[dnl
750 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 701 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
751 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) 702 :])])
703if test x$support_xim = xyes; then
752if test x$rxvt_cv_func_xlocale = xyes; then 704 if test x$rxvt_cv_func_xlocale = xyes; then
753 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 705 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
706 fi
754fi 707fi
755 708
756AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 709AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
757[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 710[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
758#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 711#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
… …
833fi 786fi
834if test x$support_tinting = xyes; then 787if test x$support_tinting = xyes; then
835 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)
836fi 789fi
837if test x$support_inheritpixmap = xyes; then 790if test x$support_inheritpixmap = xyes; then
838 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)
839fi 792fi
840if test x$support_keepscrolling = xno; then 793if test x$support_keepscrolling = xno; then
841 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)
842fi 795fi
843if test x$support_selectionscrolling = xyes; then 796if test x$support_selectionscrolling = xyes; then
844 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)
845fi 798fi
846if test x$support_frills = xyes; then
847 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
848fi
849if test x$support_mousewheel = xyes; then 799if test x$support_mousewheel = xyes; then
850 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)
851fi 801fi
852if test x$support_mouseslipwheel = xyes; then 802if test x$support_mouseslipwheel = xyes; then
853 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)
854fi 804fi
855if test x$support_xim = xyes -o x$multichar_set = xyes; then
856 if test x$rxvt_cv_func_xlocale = xyes; then
857 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
858 fi
859fi
860if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then 805if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then
861 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage) 806 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
862fi 807fi
863 808
864if test x$support_afterimage = xyes; then 809if test x$support_afterimage = xyes; then
865 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)
866fi 811fi
867 812
868if test x$support_afterstep = xyes; then 813dnl if test x$support_afterstep = xyes; then
869 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)
870fi 815dnl fi
871 816
872if test x$support_scroll_rxvt = xyes; then 817if test x$support_scroll_rxvt = xyes; then
873 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) 818 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
874 scrolltypes="rxvt" 819 scrolltypes="rxvt"
875fi 820fi
… …
958 903
959if test x$support_perl = xyes; then 904if test x$support_perl = xyes; then
960 support_frills=yes 905 support_frills=yes
961fi 906fi
962 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
963AC_SUBST(CFLAGS) 912AC_SUBST(CFLAGS)
964AC_SUBST(CPPFLAGS) 913AC_SUBST(CPPFLAGS)
965AC_SUBST(LDFLAGS) 914AC_SUBST(LDFLAGS)
966AC_SUBST(X_CFLAGS) 915AC_SUBST(X_CFLAGS)
967 916
968dnl# Attack the libs 917dnl# Attack the libs
969if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
970 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
971 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
972 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
973 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
974fi
975AC_SUBST(LIBS) 918AC_SUBST(LIBS)
976AC_SUBST(X_LIBS) 919AC_SUBST(X_LIBS)
977AC_SUBST(X_EXTRA_LIBS) 920AC_SUBST(X_EXTRA_LIBS)
978 921
979AC_SUBST(LIBAFTERIMAGE_CFLAGS) 922AC_SUBST(AFTERIMAGE_CFLAGS)
980AC_SUBST(AFTERIMAGE_LIBS) 923AC_SUBST(AFTERIMAGE_LIBS)
981 924
982AC_ARG_PROGRAM 925AC_ARG_PROGRAM
983 926
984dnl# test for "sun" or "__sun__" before include sys_ioctl 927dnl# test for "sun" or "__sun__" before include sys_ioctl
… …
1028 971
1029if test x$support_afterimage = xyes; then 972if test x$support_afterimage = xyes; then
1030 echo " AfterImage support: yes" 973 echo " AfterImage support: yes"
1031fi 974fi
1032 975
1033if test x$support_afterstep = xyes; then 976dnl if test x$support_afterstep = xyes; then
1034 echo " AfterStep integration: yes" 977dnl echo " AfterStep integration: yes"
1035fi 978dnl fi
1036 979
1037if test x$term != x; then 980if test x$term != x; then
1038 echo " set TERM to: $term" 981 echo " set TERM to: $term"
1039fi 982fi
1040if test x$terminfo != x; then 983if test x$terminfo != x; then
… …
1045if test x$RESFALLBACK != x; then 988if test x$RESFALLBACK != x; then
1046 echo " resource class fallback: $RESFALLBACK" 989 echo " resource class fallback: $RESFALLBACK"
1047fi 990fi
1048echo 991echo
1049echo " embedded perl: $support_perl" 992echo " embedded perl: $support_perl"
993echo " libafterimage: $support_afterimage"
1050echo 994echo
1051if test x$support_xpm = xneedsmanualspecification; then 995if test x$support_xpm = xneedsmanualspecification; then
1052 echo ".----------------------------------------------------------------." 996 echo ".----------------------------------------------------------------."
1053 echo ". WARNING: --enable-xpm-background was specified however the ." 997 echo ". WARNING: --enable-xpm-background was specified however the ."
1054 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