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.56 by root, Tue Jun 26 00:40:18 2007 UTC vs.
Revision 1.66 by ayin, Fri Jul 27 10:06:43 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
… …
461AC_PATH_XTRA 457AC_PATH_XTRA
462 458
463dnl# the only reasonable way to find libXpm is do-it-yourself 459dnl# the only reasonable way to find libXpm is do-it-yourself
464dnl# only check if we want xpm-background 460dnl# only check if we want xpm-background
465 461
466LIBAFTERIMAGE_CFLAGS= 462AFTERIMAGE_CFLAGS=
467AFTERIMAGE_LIBS= 463AFTERIMAGE_LIBS=
468have_afterimage= 464AFTERIMAGE_VERSION=
469 465
470if test x$support_afterimage = xyes; then 466if test x$support_afterimage = xyes; then
471 support_afterimage=no 467 support_afterimage=no
472 468
473 if test "x$afterimage_config" = "x" ; then 469 if test "x$afterimage_config" = "x" ; then
474 AC_PATH_PROG(afterimage_config, afterimage-config, no) 470 AC_PATH_PROG(afterimage_config, afterimage-config, no)
475 fi 471 fi
476
477 AC_MSG_CHECKING(for libAfterImage) 472 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
478 if $afterimage_config --version >/dev/null 2>&1 ; then 473 AFTERIMAGE_VERSION=`$afterimage_config --version`
474 if test -n $AFTERIMAGE_VERSION ; then
479 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 475 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
480 AFTERIMAGE_LIBS=`$afterimage_config --libs` 476 AFTERIMAGE_LIBS=`$afterimage_config --libs`
481 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
482 support_afterimage=yes 481 support_afterimage=yes
482 fi
483 fi 483 fi
484 fi 484 fi
485 485
486 if test "x$support_afterimage" = "xyes"; then 486 if test "x$support_afterimage" = "xyes"; then
487 AC_MSG_RESULT($AFTERIMAGE_LIBS) 487 AC_MSG_RESULT($AFTERIMAGE_LIBS)
… …
529#include <sys/ioctl.h> 529#include <sys/ioctl.h>
530#ifdef HAVE_TERMIOS_H 530#ifdef HAVE_TERMIOS_H
531#include <termios.h> 531#include <termios.h>
532#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])])
533 533
534dnl# ELF systems may want to store paths for dynamic libraries.
535dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
536dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
537if test -n "$GCC"; then
538 LDARG="-Wl,"
539else
540 LDARG=""
541fi
542changequote(, )dnl
543R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-rpath '$LDARG'\1/g'
544changequote([, ])dnl
545
546ac_save_CFLAGS=$CFLAGS
547ac_save_LIBS=$LIBS
548CFLAGS="$CFLAGS $X_CFLAGS"
549LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
550AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
551[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
552#include <stdlib.h>
553main()
554{
555 exit(0);
556 (void) XOpenDisplay("foobar");
557}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
558 AC_MSG_WARN(You may need to check the LIBS line)])])
559if test x$rxvt_cv_rpath != xyes; then
560 changequote(, )dnl
561 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
562 changequote([, ])dnl
563 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
564 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
565[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
566#include <stdlib.h>
567main()
568{
569 exit(0);
570 (void) XOpenDisplay("foobar");
571}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
572 if test x$rxvt_cv_R != xyes; then
573 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
574 fi
575fi
576
577AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 534AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
578[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])])
579if test x$rxvt_cv_xpointer = xyes; then 536if test x$rxvt_cv_xpointer = xyes; then
580 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 537 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
581fi 538fi
582LIBS=$ac_save_LIBS
583CFLAGS=$ac_save_CFLAGS
584 539
585AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 540AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
586[AC_COMPILE_IFELSE( 541[AC_COMPILE_IFELSE(
587 [AC_LANG_PROGRAM([ 542 [AC_LANG_PROGRAM([
588#define XLIB_ILLEGAL_ACCESS 543#define XLIB_ILLEGAL_ACCESS
… …
728dnl# this is a really hack test for some basic Xlocale stuff 683dnl# this is a really hack test for some basic Xlocale stuff
729ac_save_LIBS=$LIBS 684ac_save_LIBS=$LIBS
730ac_save_CFLAGS=$CFLAGS 685ac_save_CFLAGS=$CFLAGS
731CFLAGS="$CFLAGS $X_CFLAGS" 686CFLAGS="$CFLAGS $X_CFLAGS"
732LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 687LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
733if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
734 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
735fi
736AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 688AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
737[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 689[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
738#include <stdlib.h> 690#include <stdlib.h>
739main() { 691main() {
740char *p; 692char *p;
… …
838 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)
839fi 791fi
840if test x$support_selectionscrolling = xyes; then 792if 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) 793 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
842fi 794fi
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 795if test x$support_mousewheel = xyes; then
847 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)
848fi 797fi
849if test x$support_mouseslipwheel = xyes; then 798if 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) 799 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
… …
950 899
951if test x$support_perl = xyes; then 900if test x$support_perl = xyes; then
952 support_frills=yes 901 support_frills=yes
953fi 902fi
954 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
955AC_SUBST(CFLAGS) 908AC_SUBST(CFLAGS)
956AC_SUBST(CPPFLAGS) 909AC_SUBST(CPPFLAGS)
957AC_SUBST(LDFLAGS) 910AC_SUBST(LDFLAGS)
958AC_SUBST(X_CFLAGS) 911AC_SUBST(X_CFLAGS)
959 912
960dnl# Attack the libs 913dnl# Attack the libs
961if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
962 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
963 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
964 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
965 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
966fi
967AC_SUBST(LIBS) 914AC_SUBST(LIBS)
968AC_SUBST(X_LIBS) 915AC_SUBST(X_LIBS)
969AC_SUBST(X_EXTRA_LIBS) 916AC_SUBST(X_EXTRA_LIBS)
970 917
971AC_SUBST(LIBAFTERIMAGE_CFLAGS) 918AC_SUBST(AFTERIMAGE_CFLAGS)
972AC_SUBST(AFTERIMAGE_LIBS) 919AC_SUBST(AFTERIMAGE_LIBS)
973 920
974AC_ARG_PROGRAM 921AC_ARG_PROGRAM
975 922
976dnl# 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