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.55 by ayin, Mon Jun 25 23:11:23 2007 UTC vs.
Revision 1.62 by sasha, Wed Jul 25 22:41:45 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
… …
464dnl# only check if we want xpm-background 460dnl# only check if we want xpm-background
465 461
466LIBAFTERIMAGE_CFLAGS= 462LIBAFTERIMAGE_CFLAGS=
467AFTERIMAGE_LIBS= 463AFTERIMAGE_LIBS=
468have_afterimage= 464have_afterimage=
465AFTERIMAGE_VERSION=
469 466
470if test x$support_afterimage = xyes; then 467if test x$support_afterimage = xyes; then
471 support_afterimage=no 468 support_afterimage=no
472 469
473 if test "x$afterimage_config" = "x" ; then 470 if test "x$afterimage_config" = "x" ; then
474 AC_PATH_PROG(afterimage_config, afterimage-config, no) 471 AC_PATH_PROG(afterimage_config, afterimage-config, no)
475 fi 472 fi
476 473 AC_PROG_AWK
477 AC_MSG_CHECKING(for libAfterImage) 474 AC_MSG_CHECKING(for libAfterImage version >= 1.15 )
478 if $afterimage_config --version >/dev/null 2>&1 ; then 475 AFTERIMAGE_VERSION=`$afterimage_config --version`
476 if test -n $AFTERIMAGE_VERSION ; then
479 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 477 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
480 AFTERIMAGE_LIBS=`$afterimage_config --libs` 478 AFTERIMAGE_LIBS=`$afterimage_config --libs`
481 if test "x$AFTERIMAGE_LIBS" != "x"; then 479 if test "x$AFTERIMAGE_LIBS" != "x"; then
480 libai_ver_major=`echo $AFTERIMAGE_VERSION | $AWK -F . '{print $1}'`
481 libai_ver_minor=`echo $AFTERIMAGE_VERSION | $AWK -F . '{print $2}'`
482 if test "$libai_ver_major -gt 1 -o ($libai_ver_major -eq 1 -a $libai_ver_minor -ge 15)"; then
482 support_afterimage=yes 483 support_afterimage=yes;
484 fi
483 fi 485 fi
484 fi 486 fi
485 487
486 if test "x$support_afterimage" = "xyes"; then 488 if test "x$support_afterimage" = "xyes"; then
487 AC_MSG_RESULT($AFTERIMAGE_LIBS) 489 AC_MSG_RESULT($AFTERIMAGE_LIBS)
… …
529#include <sys/ioctl.h> 531#include <sys/ioctl.h>
530#ifdef HAVE_TERMIOS_H 532#ifdef HAVE_TERMIOS_H
531#include <termios.h> 533#include <termios.h>
532#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) 534#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
533 535
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, 536AC_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])]) 537[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 538if test x$rxvt_cv_xpointer = xyes; then
580 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 539 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
581fi 540fi
582LIBS=$ac_save_LIBS
583CFLAGS=$ac_save_CFLAGS
584 541
585AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 542AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
586[AC_COMPILE_IFELSE( 543[AC_COMPILE_IFELSE(
587 [AC_LANG_PROGRAM([ 544 [AC_LANG_PROGRAM([
588#define XLIB_ILLEGAL_ACCESS 545#define XLIB_ILLEGAL_ACCESS
… …
728dnl# this is a really hack test for some basic Xlocale stuff 685dnl# this is a really hack test for some basic Xlocale stuff
729ac_save_LIBS=$LIBS 686ac_save_LIBS=$LIBS
730ac_save_CFLAGS=$CFLAGS 687ac_save_CFLAGS=$CFLAGS
731CFLAGS="$CFLAGS $X_CFLAGS" 688CFLAGS="$CFLAGS $X_CFLAGS"
732LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 689LIBS="$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, 690AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
737[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 691[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
738#include <stdlib.h> 692#include <stdlib.h>
739main() { 693main() {
740char *p; 694char *p;
… …
830fi 784fi
831if test x$support_tinting = xyes; then 785if test x$support_tinting = xyes; then
832 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)
833fi 787fi
834if test x$support_inheritpixmap = xyes; then 788if test x$support_inheritpixmap = xyes; then
835 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)
836fi 790fi
837if test x$support_keepscrolling = xno; then 791if 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) 792 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
839fi 793fi
840if test x$support_selectionscrolling = xyes; then 794if 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) 795 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
842fi
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 796fi
846if test x$support_mousewheel = xyes; then 797if test x$support_mousewheel = xyes; then
847 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)
848fi 799fi
849if test x$support_mouseslipwheel = xyes; then 800if test x$support_mouseslipwheel = xyes; then
… …
933 PERL_O=rxvtperl.o 884 PERL_O=rxvtperl.o
934 PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" 885 PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`"
935 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" 886 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
936 PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" 887 PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
937 else 888 else
938 AC_MSG_ERROR([no, unable to link]) 889 AC_MSG_RESULT([no, unable to link])
890 rxvt_perl_link=no
939 fi 891 fi
940 else 892 else
941 AC_MSG_ERROR([no working perl found, or perl not version >= 5.8]) 893 AC_MSG_RESULT([no working perl found, or perl not version >= 5.8])
894 support_perl=no
942 fi 895 fi
943fi 896fi
944AC_SUBST(PERLLIB) 897AC_SUBST(PERLLIB)
945AC_SUBST(PERLFLAGS) 898AC_SUBST(PERLFLAGS)
946AC_SUBST(PERLPRIVLIBEXP) 899AC_SUBST(PERLPRIVLIBEXP)
… …
950 903
951if test x$support_perl = xyes; then 904if test x$support_perl = xyes; then
952 support_frills=yes 905 support_frills=yes
953fi 906fi
954 907
908if test x$support_frills = xyes; then
909 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
910fi
911
955AC_SUBST(CFLAGS) 912AC_SUBST(CFLAGS)
956AC_SUBST(CPPFLAGS) 913AC_SUBST(CPPFLAGS)
957AC_SUBST(LDFLAGS) 914AC_SUBST(LDFLAGS)
958AC_SUBST(X_CFLAGS) 915AC_SUBST(X_CFLAGS)
959 916
960dnl# Attack the libs 917dnl# 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) 918AC_SUBST(LIBS)
968AC_SUBST(X_LIBS) 919AC_SUBST(X_LIBS)
969AC_SUBST(X_EXTRA_LIBS) 920AC_SUBST(X_EXTRA_LIBS)
970 921
971AC_SUBST(LIBAFTERIMAGE_CFLAGS) 922AC_SUBST(LIBAFTERIMAGE_CFLAGS)

Diff Legend

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