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.61 by ayin, Thu Jun 28 17:19:56 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
… …
534AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 530AC_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])]) 531[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 532if test x$rxvt_cv_xpointer = xyes; then
537 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 533 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
538fi 534fi
539LIBS=$ac_save_LIBS
540CFLAGS=$ac_save_CFLAGS
541 535
542AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 536AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
543[AC_COMPILE_IFELSE( 537[AC_COMPILE_IFELSE(
544 [AC_LANG_PROGRAM([ 538 [AC_LANG_PROGRAM([
545#define XLIB_ILLEGAL_ACCESS 539#define XLIB_ILLEGAL_ACCESS
… …
685dnl# this is a really hack test for some basic Xlocale stuff 679dnl# this is a really hack test for some basic Xlocale stuff
686ac_save_LIBS=$LIBS 680ac_save_LIBS=$LIBS
687ac_save_CFLAGS=$CFLAGS 681ac_save_CFLAGS=$CFLAGS
688CFLAGS="$CFLAGS $X_CFLAGS" 682CFLAGS="$CFLAGS $X_CFLAGS"
689LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 683LIBS="$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, 684AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
694[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 685[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
695#include <stdlib.h> 686#include <stdlib.h>
696main() { 687main() {
697char *p; 688char *p;
… …
914AC_SUBST(CPPFLAGS) 905AC_SUBST(CPPFLAGS)
915AC_SUBST(LDFLAGS) 906AC_SUBST(LDFLAGS)
916AC_SUBST(X_CFLAGS) 907AC_SUBST(X_CFLAGS)
917 908
918dnl# Attack the libs 909dnl# 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) 910AC_SUBST(LIBS)
926AC_SUBST(X_LIBS) 911AC_SUBST(X_LIBS)
927AC_SUBST(X_EXTRA_LIBS) 912AC_SUBST(X_EXTRA_LIBS)
928 913
929AC_SUBST(LIBAFTERIMAGE_CFLAGS) 914AC_SUBST(LIBAFTERIMAGE_CFLAGS)

Diff Legend

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