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.52 by ayin, Wed Jun 13 16:20:41 2007 UTC vs.
Revision 1.60 by ayin, Tue Jun 26 21:59:13 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...
… …
531#include <sys/ioctl.h> 525#include <sys/ioctl.h>
532#ifdef HAVE_TERMIOS_H 526#ifdef HAVE_TERMIOS_H
533#include <termios.h> 527#include <termios.h>
534#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) 528#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
535 529
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, 530AC_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])]) 531[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 532if test x$rxvt_cv_xpointer = xyes; then
582 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 533 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
583fi 534fi
… …
730dnl# this is a really hack test for some basic Xlocale stuff 681dnl# this is a really hack test for some basic Xlocale stuff
731ac_save_LIBS=$LIBS 682ac_save_LIBS=$LIBS
732ac_save_CFLAGS=$CFLAGS 683ac_save_CFLAGS=$CFLAGS
733CFLAGS="$CFLAGS $X_CFLAGS" 684CFLAGS="$CFLAGS $X_CFLAGS"
734LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 685LIBS="$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, 686AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
739[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 687[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
740#include <stdlib.h> 688#include <stdlib.h>
741main() { 689main() {
742char *p; 690char *p;
743if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 691if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
744exit (XSupportsLocale() ? 0 : 1); 692exit (XSupportsLocale() ? 0 : 1);
745else 693else
746exit (1);}]])],[dnl 694exit (1);}]])],[dnl
747 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 695 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
748 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) 696 :])])
697if test x$support_xim = xyes; then
749if test x$rxvt_cv_func_xlocale = xyes; then 698 if test x$rxvt_cv_func_xlocale = xyes; then
750 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 699 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
700 fi
751fi 701fi
752 702
753AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 703AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
754[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 704[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
755#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 705#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
… …
830fi 780fi
831if test x$support_tinting = xyes; then 781if test x$support_tinting = xyes; then
832 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) 782 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
833fi 783fi
834if test x$support_inheritpixmap = xyes; then 784if test x$support_inheritpixmap = xyes; then
835 AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) 785 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
836fi 786fi
837if test x$support_keepscrolling = xno; then 787if test x$support_keepscrolling = xno; then
838 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 788 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
839fi 789fi
840if test x$support_selectionscrolling = xyes; then 790if test x$support_selectionscrolling = xyes; then
841 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) 791 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
842fi 792fi
843if test x$support_frills = xyes; then
844 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
845fi
846if test x$support_mousewheel = xyes; then 793if test x$support_mousewheel = xyes; then
847 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 794 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
848fi 795fi
849if test x$support_mouseslipwheel = xyes; then 796if test x$support_mouseslipwheel = xyes; then
850 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) 797 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
851fi
852if test x$support_xim = xyes -o x$multichar_set = xyes; then
853 if test x$rxvt_cv_func_xlocale = xyes; then
854 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
855 fi
856fi 798fi
857if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then 799if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then
858 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage) 800 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
859fi 801fi
860 802
… …
955 897
956if test x$support_perl = xyes; then 898if test x$support_perl = xyes; then
957 support_frills=yes 899 support_frills=yes
958fi 900fi
959 901
902if test x$support_frills = xyes; then
903 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
904fi
905
960AC_SUBST(CFLAGS) 906AC_SUBST(CFLAGS)
961AC_SUBST(CPPFLAGS) 907AC_SUBST(CPPFLAGS)
962AC_SUBST(LDFLAGS) 908AC_SUBST(LDFLAGS)
963AC_SUBST(X_CFLAGS) 909AC_SUBST(X_CFLAGS)
964 910
965dnl# Attack the libs 911dnl# Attack the libs
966if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
967 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
968 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
969 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
970 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
971fi
972AC_SUBST(LIBS) 912AC_SUBST(LIBS)
973AC_SUBST(X_LIBS) 913AC_SUBST(X_LIBS)
974AC_SUBST(X_EXTRA_LIBS) 914AC_SUBST(X_EXTRA_LIBS)
975 915
976AC_SUBST(LIBAFTERIMAGE_CFLAGS) 916AC_SUBST(LIBAFTERIMAGE_CFLAGS)

Diff Legend

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