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.59 by ayin, Tue Jun 26 20:53:07 2007 UTC

… …
78 78
79AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.) 79AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
80 80
81case $host in 81case $host in
82 *-*-solaris* ) 82 *-*-solaris* )
83 AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) 83 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 ;; 84 ;;
87esac 85esac
88 86
89dnl if test x$GXX = xyes; then 87dnl if test x$GXX = xyes; then
90dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... 88dnl 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" 441 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
444 fi]) 442 fi])
445 443
446dnl# -------------------------------------------------------------------------- 444dnl# --------------------------------------------------------------------------
447 445
448AC_PATH_PROG(CP, cp, cp)
449AC_PATH_PROG(SED, sed, sed)
450AC_PATH_PROG(ECHO, echo, echo)
451AC_PATH_PROG(TIC, tic) 446AC_PATH_PROG(TIC, tic)
452 447
453dnl# need a neat way to detect SVR4 or its features 448dnl# need a neat way to detect SVR4 or its features
454dnl# in src/command.c we use these functions: 449dnl# in src/command.c we use these functions:
455dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 450dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
… …
533[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> 528[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
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
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 533
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)
… …
733dnl# this is a really hack test for some basic Xlocale stuff 685dnl# this is a really hack test for some basic Xlocale stuff
734ac_save_LIBS=$LIBS 686ac_save_LIBS=$LIBS
735ac_save_CFLAGS=$CFLAGS 687ac_save_CFLAGS=$CFLAGS
736CFLAGS="$CFLAGS $X_CFLAGS" 688CFLAGS="$CFLAGS $X_CFLAGS"
737LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 689LIBS="$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, 690AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
742[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 691[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
743#include <stdlib.h> 692#include <stdlib.h>
744main() { 693main() {
745char *p; 694char *p;
746if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 695if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
747exit (XSupportsLocale() ? 0 : 1); 696exit (XSupportsLocale() ? 0 : 1);
748else 697else
749exit (1);}]])],[dnl 698exit (1);}]])],[dnl
750 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 699 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
751 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) 700 :])])
701if test x$support_xim = xyes; then
752if test x$rxvt_cv_func_xlocale = xyes; then 702 if test x$rxvt_cv_func_xlocale = xyes; then
753 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 703 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
704 fi
754fi 705fi
755 706
756AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 707AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
757[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 708[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])]) 709#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
… …
833fi 784fi
834if test x$support_tinting = xyes; then 785if test x$support_tinting = xyes; then
835 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) 786 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
836fi 787fi
837if test x$support_inheritpixmap = xyes; then 788if test x$support_inheritpixmap = xyes; then
838 AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) 789 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
839fi 790fi
840if test x$support_keepscrolling = xno; then 791if 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) 792 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
842fi 793fi
843if test x$support_selectionscrolling = xyes; then 794if 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) 795 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
845fi 796fi
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 797if test x$support_mousewheel = xyes; then
850 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 798 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
851fi 799fi
852if test x$support_mouseslipwheel = xyes; then 800if 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) 801 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 802fi
860if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then 803if 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) 804 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
862fi 805fi
863 806
… …
958 901
959if test x$support_perl = xyes; then 902if test x$support_perl = xyes; then
960 support_frills=yes 903 support_frills=yes
961fi 904fi
962 905
906if test x$support_frills = xyes; then
907 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
908fi
909
963AC_SUBST(CFLAGS) 910AC_SUBST(CFLAGS)
964AC_SUBST(CPPFLAGS) 911AC_SUBST(CPPFLAGS)
965AC_SUBST(LDFLAGS) 912AC_SUBST(LDFLAGS)
966AC_SUBST(X_CFLAGS) 913AC_SUBST(X_CFLAGS)
967 914
968dnl# Attack the libs 915dnl# 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) 916AC_SUBST(LIBS)
976AC_SUBST(X_LIBS) 917AC_SUBST(X_LIBS)
977AC_SUBST(X_EXTRA_LIBS) 918AC_SUBST(X_EXTRA_LIBS)
978 919
979AC_SUBST(LIBAFTERIMAGE_CFLAGS) 920AC_SUBST(LIBAFTERIMAGE_CFLAGS)

Diff Legend

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