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.46 by ayin, Sat Jun 9 14:13:16 2007 UTC vs.
Revision 1.58 by ayin, Tue Jun 26 19:47:00 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 [
51 [AC_MSG_RESULT(ok)], 52 AC_MSG_RESULT(ok)
53 CXXLIB="-lsupc++"
54 ],
52 [ 55 [
53 AC_MSG_RESULT([no, making everything bigger and slower]) 56 AC_MSG_RESULT([no, making everything bigger and slower])
54 LIBS="$save_LIBS" 57 LIBS="$save_LIBS"
55 LINKER="$save_CXX" 58 LINKER="$save_CXX"
56 ] 59 ]
57 ) 60 )
58 CXX="$save_CXX" 61 CXX="$save_CXX"
59fi 62fi
60AC_SUBST(LINKER,[$LINKER]) 63AC_SUBST(LINKER,[$LINKER])
64AC_SUBST(CXXLIB)
61 65
62dnl# -------------------------------------------------------------------------- 66dnl# --------------------------------------------------------------------------
63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 67dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
64dnl# 68dnl#
65if test -z "$orig_CXXFLAGS"; then 69if test -z "$orig_CXXFLAGS"; then
… …
74 78
75AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.) 79AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
76 80
77case $host in 81case $host in
78 *-*-solaris* ) 82 *-*-solaris* )
79 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)
80 AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
81 AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
82 ;; 84 ;;
83esac 85esac
84 86
85dnl if test x$GXX = xyes; then 87dnl if test x$GXX = xyes; then
86dnl 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...
… …
239 support_afterimage=$enableval 241 support_afterimage=$enableval
240 fi]) 242 fi])
241 243
242AC_ARG_WITH(afterimage_config, 244AC_ARG_WITH(afterimage_config,
243 [ --with-afterimage-config=DIR use libAfterImage config script in DIR], 245 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
244 [afterimage_config="$withval"]) 246 [if test "x$withval" != x; then
247 afterimage_config=$withval/afterimage-config
248 fi])
245 249
246AC_ARG_ENABLE(afterstep, 250AC_ARG_ENABLE(afterstep,
247 [ --enable-afterstep enable integration with AfterStep window manager], 251 [ --enable-afterstep enable integration with AfterStep window manager],
248 [if test x$enableval = xyes -o x$enableval = xno; then 252 [if test x$enableval = xyes -o x$enableval = xno; then
249 support_afterstep=$enableval 253 support_afterstep=$enableval
… …
437 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"
438 fi]) 442 fi])
439 443
440dnl# -------------------------------------------------------------------------- 444dnl# --------------------------------------------------------------------------
441 445
442AC_PATH_PROG(MV, mv, mv)
443AC_PATH_PROG(CP, cp, cp)
444AC_PATH_PROG(LN, ln, ln)
445AC_PATH_PROG(SED, sed, sed)
446AC_PATH_PROG(ECHO, echo, echo)
447AC_PATH_PROG(CMP, cmp, cmp)
448AC_PATH_PROG(TIC, tic) 446AC_PATH_PROG(TIC, tic)
449 447
450dnl# need a neat way to detect SVR4 or its features 448dnl# need a neat way to detect SVR4 or its features
451dnl# in src/command.c we use these functions: 449dnl# in src/command.c we use these functions:
452dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 450dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
… …
472if test x$support_afterimage = xyes; then 470if test x$support_afterimage = xyes; then
473 support_afterimage=no 471 support_afterimage=no
474 472
475 if test "x$afterimage_config" = "x" ; then 473 if test "x$afterimage_config" = "x" ; then
476 AC_PATH_PROG(afterimage_config, afterimage-config, no) 474 AC_PATH_PROG(afterimage_config, afterimage-config, no)
477 else
478 afterimage_config=$afterimage_config/afterimage-config
479 fi 475 fi
480 476
481 AC_MSG_CHECKING(for libAfterImage) 477 AC_MSG_CHECKING(for libAfterImage)
482 if $afterimage_config --version >/dev/null 2>&1 ; then 478 if $afterimage_config --version >/dev/null 2>&1 ; then
483 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 479 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
… …
532[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> 528[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
533#include <sys/ioctl.h> 529#include <sys/ioctl.h>
534#ifdef HAVE_TERMIOS_H 530#ifdef HAVE_TERMIOS_H
535#include <termios.h> 531#include <termios.h>
536#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])])
537
538dnl# ELF systems may want to store paths for dynamic libraries.
539dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
540dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
541if test -n "$GCC"; then
542 LDARG="-Wl,"
543else
544 LDARG=""
545fi
546changequote(, )dnl
547R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-rpath '$LDARG'\1/g'
548changequote([, ])dnl
549
550ac_save_CFLAGS=$CFLAGS
551ac_save_LIBS=$LIBS
552CFLAGS="$CFLAGS $X_CFLAGS"
553LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
554AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
555[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
556#include <stdlib.h>
557main()
558{
559 exit(0);
560 (void) XOpenDisplay("foobar");
561}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
562 AC_MSG_WARN(You may need to check the LIBS line)])])
563if test x$rxvt_cv_rpath != xyes; then
564 changequote(, )dnl
565 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
566 changequote([, ])dnl
567 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
568 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
569[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
570#include <stdlib.h>
571main()
572{
573 exit(0);
574 (void) XOpenDisplay("foobar");
575}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
576 if test x$rxvt_cv_R != xyes; then
577 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
578 fi
579fi
580 533
581AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 534AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
582[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])])
583if test x$rxvt_cv_xpointer = xyes; then 536if test x$rxvt_cv_xpointer = xyes; then
584 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 537 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
… …
745if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 698if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
746exit (XSupportsLocale() ? 0 : 1); 699exit (XSupportsLocale() ? 0 : 1);
747else 700else
748exit (1);}]])],[dnl 701exit (1);}]])],[dnl
749 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 702 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
750 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) 703 :])])
704if test x$support_xim = xyes; then
751if test x$rxvt_cv_func_xlocale = xyes; then 705 if test x$rxvt_cv_func_xlocale = xyes; then
752 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 706 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
707 fi
753fi 708fi
754 709
755AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 710AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
756[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 711[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
757#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 712#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
… …
832fi 787fi
833if test x$support_tinting = xyes; then 788if test x$support_tinting = xyes; then
834 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) 789 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
835fi 790fi
836if test x$support_inheritpixmap = xyes; then 791if test x$support_inheritpixmap = xyes; then
837 AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) 792 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
838fi 793fi
839if test x$support_keepscrolling = xno; then 794if 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) 795 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
841fi 796fi
842if test x$support_selectionscrolling = xyes; then 797if 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) 798 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
844fi 799fi
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 800if test x$support_mousewheel = xyes; then
849 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 801 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
850fi 802fi
851if test x$support_mouseslipwheel = xyes; then 803if 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) 804 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
853fi
854if test x$support_xim = xyes -o x$multichar_set = xyes; then
855 if test x$rxvt_cv_func_xlocale = xyes; then
856 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
857 fi
858fi 805fi
859if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then 806if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then
860 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage) 807 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
861fi 808fi
862 809
… …
957 904
958if test x$support_perl = xyes; then 905if test x$support_perl = xyes; then
959 support_frills=yes 906 support_frills=yes
960fi 907fi
961 908
962AC_SUBST(DEBUG) 909if test x$support_frills = xyes; then
963AC_SUBST(DINCLUDE) 910 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
911fi
912
964AC_SUBST(CFLAGS) 913AC_SUBST(CFLAGS)
965AC_SUBST(CPPFLAGS) 914AC_SUBST(CPPFLAGS)
966AC_SUBST(LDFLAGS) 915AC_SUBST(LDFLAGS)
967AC_SUBST(X_CFLAGS) 916AC_SUBST(X_CFLAGS)
968 917
969dnl# Attack the libs 918dnl# Attack the libs
970if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 919if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
971 DLIB=`echo $DLIB | sed "$R_TRANSLATE"`
972 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 920 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
973 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` 921 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
974 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` 922 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
975 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` 923 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
976fi 924fi
977AC_SUBST(DLIB)
978AC_SUBST(LIBS) 925AC_SUBST(LIBS)
979AC_SUBST(X_LIBS) 926AC_SUBST(X_LIBS)
980AC_SUBST(X_EXTRA_LIBS) 927AC_SUBST(X_EXTRA_LIBS)
981 928
982AC_SUBST(LIBAFTERIMAGE_CFLAGS) 929AC_SUBST(LIBAFTERIMAGE_CFLAGS)
… …
1032if test x$support_afterimage = xyes; then 979if test x$support_afterimage = xyes; then
1033 echo " AfterImage support: yes" 980 echo " AfterImage support: yes"
1034fi 981fi
1035 982
1036if test x$support_afterstep = xyes; then 983if test x$support_afterstep = xyes; then
1037 echo " AfterStep intergration: yes" 984 echo " AfterStep integration: yes"
1038fi 985fi
1039 986
1040if test x$term != x; then 987if test x$term != x; then
1041 echo " set TERM to: $term" 988 echo " set TERM to: $term"
1042fi 989fi

Diff Legend

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