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.34 by root, Tue Jan 31 20:09:06 2006 UTC vs.
Revision 1.38 by ayin, Mon May 7 13:43:39 2007 UTC

… …
45 save_LIBS="$LIBS" 45 save_LIBS="$LIBS"
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 [AC_MSG_RESULT(ok)], 51 [AC_MSG_RESULT(ok)],
52 [ 52 [
53 AC_MSG_RESULT([no, making everything bigger and slower]) 53 AC_MSG_RESULT([no, making everything bigger and slower])
54 LIBS="$save_LIBS" 54 LIBS="$save_LIBS"
55 LINKER="$save_CXX" 55 LINKER="$save_CXX"
… …
57 ) 57 )
58 CXX="$save_CXX" 58 CXX="$save_CXX"
59fi 59fi
60AC_SUBST(LINKER,[$LINKER]) 60AC_SUBST(LINKER,[$LINKER])
61 61
62AC_LANG(C++)
63dnl# -------------------------------------------------------------------------- 62dnl# --------------------------------------------------------------------------
64dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
65dnl# 64dnl#
66if test -z "$orig_CXXFLAGS"; then 65if test -z "$orig_CXXFLAGS"; then
67 if test x$GCC = xyes && test "x$GXX" = xyes; then 66 if test x$GCC = xyes && test "x$GXX" = xyes; then
68 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" 67 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"
69 AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [], [CXXFLAGS="-g -O3"]) 68 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
70 else 69 else
71 CXXFLAGS="-O" 70 CXXFLAGS="-O"
72 fi 71 fi
73 CFLAGS="$CXXFLAGS" 72 CFLAGS="$CXXFLAGS"
74fi 73fi
… …
500ac_save_CFLAGS=$CFLAGS 499ac_save_CFLAGS=$CFLAGS
501ac_save_LIBS=$LIBS 500ac_save_LIBS=$LIBS
502CFLAGS="$CFLAGS $X_CFLAGS" 501CFLAGS="$CFLAGS $X_CFLAGS"
503LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 502LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
504AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, 503AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
505[AC_RUN_IFELSE([AC_LANG_SOURCE([[ 504[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
505#include <stdlib.h>
506main() 506main()
507{ 507{
508 exit(0); 508 exit(0);
509 (void) XOpenDisplay("foobar"); 509 (void) XOpenDisplay("foobar");
510}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl 510}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
… …
513 changequote(, )dnl 513 changequote(, )dnl
514 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 514 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
515 changequote([, ])dnl 515 changequote([, ])dnl
516 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 516 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
517 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R, 517 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
518[AC_RUN_IFELSE([AC_LANG_SOURCE([[ 518[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
519#include <stdlib.h>
519main() 520main()
520{ 521{
521 exit(0); 522 exit(0);
522 (void) XOpenDisplay("foobar"); 523 (void) XOpenDisplay("foobar");
523}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])]) 524}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
… …
532 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 533 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
533fi 534fi
534LIBS=$ac_save_LIBS 535LIBS=$ac_save_LIBS
535CFLAGS=$ac_save_CFLAGS 536CFLAGS=$ac_save_CFLAGS
536 537
538AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
539[AC_COMPILE_IFELSE(
540 [AC_LANG_PROGRAM([
541#define XLIB_ILLEGAL_ACCESS
542#include <X11/Xlib.h>
543 ],[
544 Display *dpy;
545 dpy->xdefaults = (char *)0;
546 ])],
547 [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no]
548)])
549if test x$rxvt_xlib_illegal_access = xyes; then
550 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
551fi
537 552
538AC_C_CONST 553AC_C_CONST
539AC_C_INLINE 554AC_C_INLINE
540 555
541dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow. 556dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
… …
671if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 686if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
672 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 687 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
673fi 688fi
674AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 689AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
675[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 690[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
691#include <stdlib.h>
676main() { 692main() {
677char *p; 693char *p;
678if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 694if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
679exit (XSupportsLocale() ? 0 : 1); 695exit (XSupportsLocale() ? 0 : 1);
680else 696else
… …
881 897
882if test x$support_perl = xyes; then 898if test x$support_perl = xyes; then
883 support_frills=yes 899 support_frills=yes
884fi 900fi
885 901
886dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
887
888CFLAGS=${CFLAGS--O}
889LDFLAGS=${LDFLAGS--O}
890
891CPPFLAGS="$CPPFLAGS"
892AC_SUBST(DEBUG) 902AC_SUBST(DEBUG)
893AC_SUBST(DINCLUDE) 903AC_SUBST(DINCLUDE)
894AC_SUBST(CFLAGS) 904AC_SUBST(CFLAGS)
895AC_SUBST(CPPFLAGS) 905AC_SUBST(CPPFLAGS)
896AC_SUBST(LDFLAGS) 906AC_SUBST(LDFLAGS)
… …
947 957
948 Rxvt version: $VERSION : $DATE 958 Rxvt version: $VERSION : $DATE
949 Source code location: $srcdir 959 Source code location: $srcdir
950 Install path: ${prefix}/bin 960 Install path: ${prefix}/bin
951 Compiler: $CXX 961 Compiler: $CXX
952 Compiler flags: $CFLAGS 962 Compiler flags: $CXXFLAGS
953 Linker: $LINKER" 963 Linker: $LINKER"
954 964
955if test x$support_xpm = xyes; then 965if test x$support_xpm = xyes; then
956 echo " Xpm library: $XPM_LIBS" 966 echo " Xpm library: $XPM_LIBS"
957fi 967fi

Diff Legend

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