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.58 by ayin, Tue Jun 26 19:47:00 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)
… …
534AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 536AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
535[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])])
536if test x$rxvt_cv_xpointer = xyes; then 538if test x$rxvt_cv_xpointer = xyes; then
537 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 539 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
538fi 540fi
539LIBS=$ac_save_LIBS
540CFLAGS=$ac_save_CFLAGS
541 541
542AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 542AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
543[AC_COMPILE_IFELSE( 543[AC_COMPILE_IFELSE(
544 [AC_LANG_PROGRAM([ 544 [AC_LANG_PROGRAM([
545#define XLIB_ILLEGAL_ACCESS 545#define XLIB_ILLEGAL_ACCESS
… …
685dnl# this is a really hack test for some basic Xlocale stuff 685dnl# this is a really hack test for some basic Xlocale stuff
686ac_save_LIBS=$LIBS 686ac_save_LIBS=$LIBS
687ac_save_CFLAGS=$CFLAGS 687ac_save_CFLAGS=$CFLAGS
688CFLAGS="$CFLAGS $X_CFLAGS" 688CFLAGS="$CFLAGS $X_CFLAGS"
689LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 689LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
690if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
691 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
692fi
693AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 690AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
694[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 691[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
695#include <stdlib.h> 692#include <stdlib.h>
696main() { 693main() {
697char *p; 694char *p;
… …
887 PERL_O=rxvtperl.o 884 PERL_O=rxvtperl.o
888 PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" 885 PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`"
889 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" 886 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
890 PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" 887 PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
891 else 888 else
892 AC_MSG_ERROR([no, unable to link]) 889 AC_MSG_RESULT([no, unable to link])
890 rxvt_perl_link=no
893 fi 891 fi
894 else 892 else
895 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
896 fi 895 fi
897fi 896fi
898AC_SUBST(PERLLIB) 897AC_SUBST(PERLLIB)
899AC_SUBST(PERLFLAGS) 898AC_SUBST(PERLFLAGS)
900AC_SUBST(PERLPRIVLIBEXP) 899AC_SUBST(PERLPRIVLIBEXP)
… …
914AC_SUBST(CPPFLAGS) 913AC_SUBST(CPPFLAGS)
915AC_SUBST(LDFLAGS) 914AC_SUBST(LDFLAGS)
916AC_SUBST(X_CFLAGS) 915AC_SUBST(X_CFLAGS)
917 916
918dnl# Attack the libs 917dnl# Attack the libs
919if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
920 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
921 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
922 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
923 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
924fi
925AC_SUBST(LIBS) 918AC_SUBST(LIBS)
926AC_SUBST(X_LIBS) 919AC_SUBST(X_LIBS)
927AC_SUBST(X_EXTRA_LIBS) 920AC_SUBST(X_EXTRA_LIBS)
928 921
929AC_SUBST(LIBAFTERIMAGE_CFLAGS) 922AC_SUBST(LIBAFTERIMAGE_CFLAGS)

Diff Legend

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