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.67 by ayin, Tue Jul 31 18:13:26 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...
… …
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
482 AC_MSG_CHECKING(for libAfterImage) 472 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
483 if $afterimage_config --version >/dev/null 2>&1 ; then 473 AFTERIMAGE_VERSION=`$afterimage_config --version`
474 if test -n "$AFTERIMAGE_VERSION" ; then
484 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 475 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
485 AFTERIMAGE_LIBS=`$afterimage_config --libs` 476 AFTERIMAGE_LIBS=`$afterimage_config --libs`
486 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
487 support_afterimage=yes 481 support_afterimage=yes
482 fi
488 fi 483 fi
489 fi 484 fi
490 485
491 if test "x$support_afterimage" = "xyes"; then 486 if test "x$support_afterimage" = "xyes"; then
492 AC_MSG_RESULT($AFTERIMAGE_LIBS) 487 AC_MSG_RESULT($AFTERIMAGE_LIBS)
… …
534#include <sys/ioctl.h> 529#include <sys/ioctl.h>
535#ifdef HAVE_TERMIOS_H 530#ifdef HAVE_TERMIOS_H
536#include <termios.h> 531#include <termios.h>
537#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) 532#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
538 533
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, 534AC_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])]) 535[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 536if test x$rxvt_cv_xpointer = xyes; then
585 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 537 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
586fi 538fi
587LIBS=$ac_save_LIBS
588CFLAGS=$ac_save_CFLAGS
589 539
590AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 540AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
591[AC_COMPILE_IFELSE( 541[AC_COMPILE_IFELSE(
592 [AC_LANG_PROGRAM([ 542 [AC_LANG_PROGRAM([
593#define XLIB_ILLEGAL_ACCESS 543#define XLIB_ILLEGAL_ACCESS
… …
733dnl# this is a really hack test for some basic Xlocale stuff 683dnl# this is a really hack test for some basic Xlocale stuff
734ac_save_LIBS=$LIBS 684ac_save_LIBS=$LIBS
735ac_save_CFLAGS=$CFLAGS 685ac_save_CFLAGS=$CFLAGS
736CFLAGS="$CFLAGS $X_CFLAGS" 686CFLAGS="$CFLAGS $X_CFLAGS"
737LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 687LIBS="$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, 688AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
742[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 689[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
743#include <stdlib.h> 690#include <stdlib.h>
744main() { 691main() {
745char *p; 692char *p;
746if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 693if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
747exit (XSupportsLocale() ? 0 : 1); 694exit (XSupportsLocale() ? 0 : 1);
748else 695else
749exit (1);}]])],[dnl 696exit (1);}]])],[dnl
750 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 697 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
751 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) 698 :])])
699if test x$support_xim = xyes; then
752if test x$rxvt_cv_func_xlocale = xyes; then 700 if test x$rxvt_cv_func_xlocale = xyes; then
753 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 701 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
702 fi
754fi 703fi
755 704
756AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 705AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
757[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 706[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])]) 707#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
… …
833fi 782fi
834if test x$support_tinting = xyes; then 783if test x$support_tinting = xyes; then
835 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) 784 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
836fi 785fi
837if test x$support_inheritpixmap = xyes; then 786if test x$support_inheritpixmap = xyes; then
838 AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) 787 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
839fi 788fi
840if test x$support_keepscrolling = xno; then 789if 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) 790 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
842fi 791fi
843if test x$support_selectionscrolling = xyes; then 792if 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) 793 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
845fi 794fi
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 795if test x$support_mousewheel = xyes; then
850 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 796 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
851fi 797fi
852if test x$support_mouseslipwheel = xyes; then 798if 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) 799 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
854fi
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 800fi
860if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then 801if 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) 802 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
862fi 803fi
863 804
… …
958 899
959if test x$support_perl = xyes; then 900if test x$support_perl = xyes; then
960 support_frills=yes 901 support_frills=yes
961fi 902fi
962 903
904if test x$support_frills = xyes; then
905 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
906fi
907
963AC_SUBST(CFLAGS) 908AC_SUBST(CFLAGS)
964AC_SUBST(CPPFLAGS) 909AC_SUBST(CPPFLAGS)
965AC_SUBST(LDFLAGS) 910AC_SUBST(LDFLAGS)
966AC_SUBST(X_CFLAGS) 911AC_SUBST(X_CFLAGS)
967 912
968dnl# Attack the libs 913dnl# 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) 914AC_SUBST(LIBS)
976AC_SUBST(X_LIBS) 915AC_SUBST(X_LIBS)
977AC_SUBST(X_EXTRA_LIBS) 916AC_SUBST(X_EXTRA_LIBS)
978 917
979AC_SUBST(LIBAFTERIMAGE_CFLAGS) 918AC_SUBST(AFTERIMAGE_CFLAGS)
980AC_SUBST(AFTERIMAGE_LIBS) 919AC_SUBST(AFTERIMAGE_LIBS)
981 920
982AC_ARG_PROGRAM 921AC_ARG_PROGRAM
983 922
984dnl# test for "sun" or "__sun__" before include sys_ioctl 923dnl# test for "sun" or "__sun__" before include sys_ioctl

Diff Legend

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