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.30 by root, Wed Jan 25 22:09:33 2006 UTC vs.
Revision 1.35 by root, Thu Feb 2 14:41:00 2006 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
… …
91AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])]) 90AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])])
92 91
93dnl# solaris needs to link libnsl and socket 92dnl# solaris needs to link libnsl and socket
94AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])]) 93AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])])
95AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])]) 94AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])])
96
97dnl# more solaris
98AC_CHECK_FUNC(sched_yield, [], [AC_CHECK_LIB(rt, sched_yield, [LIBS="$LIBS -lrt"])])
99
100dnl# sched_yield to improve terminal efficiency
101AC_MSG_CHECKING(for sched_yield support)
102AC_TRY_LINK([#include <sched.h>],[sched_yield ()],
103 [AC_MSG_RESULT(yes)
104 AC_DEFINE(HAVE_SCHED_YIELD, 1, Define if you have sched-h and sched_yield)],
105 [AC_MSG_RESULT(no)])
106 95
107dnl AC_ENABLE_SHARED(no)dnl# libtool 96dnl AC_ENABLE_SHARED(no)dnl# libtool
108dnl AC_ENABLE_STATIC(yes)dnl# libtool 97dnl AC_ENABLE_STATIC(yes)dnl# libtool
109dnl AC_PROG_LIBTOOL()dnl# libtool 98dnl AC_PROG_LIBTOOL()dnl# libtool
110 99
… …
284 [ --enable-plain-scroll enable plain style scrollbar], 273 [ --enable-plain-scroll enable plain style scrollbar],
285 [if test x$enableval = xyes -o x$enableval = xno; then 274 [if test x$enableval = xyes -o x$enableval = xno; then
286 support_scroll_plain=$enableval 275 support_scroll_plain=$enableval
287 fi]) 276 fi])
288 277
289dnl AC_ARG_ENABLE(half-shadow,
290dnl [ --enable-half-shadow use half width/height shadow on rxvt scrollbar],
291dnl [if test x$enableval = xyes; then
292dnl AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less)
293dnl fi])
294
295AC_ARG_WITH(codesets, 278AC_ARG_WITH(codesets,
296 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], 279 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
297 [codesets="$withval"]) 280 [codesets="$withval"])
298 281
299AC_ARG_ENABLE(xim, 282AC_ARG_ENABLE(xim,
… …
548 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 531 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
549fi 532fi
550LIBS=$ac_save_LIBS 533LIBS=$ac_save_LIBS
551CFLAGS=$ac_save_CFLAGS 534CFLAGS=$ac_save_CFLAGS
552 535
536AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
537[AC_COMPILE_IFELSE(
538 [AC_LANG_PROGRAM([
539#define XLIB_ILLEGAL_ACCESS
540#include <X11/Xlib.h>
541 ],[
542 Display *dpy;
543 dpy->xdefaults = (char *)0;
544 ])],
545 [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no]
546)])
547if test x$rxvt_xlib_illegal_access = xyes; then
548 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
549fi
553 550
554AC_C_CONST 551AC_C_CONST
555AC_C_INLINE 552AC_C_INLINE
556 553
557dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow. 554dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
… …
893AC_SUBST(PERLPRIVLIBEXP) 890AC_SUBST(PERLPRIVLIBEXP)
894AC_SUBST(PERL) 891AC_SUBST(PERL)
895AC_SUBST(IF_PERL) 892AC_SUBST(IF_PERL)
896AC_SUBST(PERL_O) 893AC_SUBST(PERL_O)
897 894
895 AC_TRY_LINK([
896#include <EXTERN.h>
897#include <perl.h>
898#include <XSUB.h>
899],[
900 PerlInterpreter *perl = perl_alloc ();
901],[rxvt_perl_link=yes],[rxvt_perl_link=no])
898if test x$support_perl = xyes; then 902if test x$support_perl = xyes; then
899 support_frills=yes 903 support_frills=yes
900fi 904fi
901 905
902dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
903
904CFLAGS=${CFLAGS--O}
905LDFLAGS=${LDFLAGS--O}
906
907CPPFLAGS="$CPPFLAGS"
908AC_SUBST(DEBUG) 906AC_SUBST(DEBUG)
909AC_SUBST(DINCLUDE) 907AC_SUBST(DINCLUDE)
910AC_SUBST(CFLAGS) 908AC_SUBST(CFLAGS)
911AC_SUBST(CPPFLAGS) 909AC_SUBST(CPPFLAGS)
912AC_SUBST(LDFLAGS) 910AC_SUBST(LDFLAGS)
… …
1002 echo ". functions could not be found. ." 1000 echo ". functions could not be found. ."
1003 echo ". XIM is now being DISABLED! ." 1001 echo ". XIM is now being DISABLED! ."
1004 echo ".----------------------------------------------------------------." 1002 echo ".----------------------------------------------------------------."
1005fi 1003fi
1006 1004
1007echo " *** Optionally check src/feature.h for further options ***" 1005echo "*** Optionally check src/feature.h for further, rarely used options ***"
1008echo 1006echo
1009 1007
1010echo ".----------------------------------------------------------------."
1011echo ". NOTE: some features are disabled by default, try ."
1012echo ". configure --help to get an idea of the optional features, ."
1013echo ". or read ./README.configure ."
1014echo ". ."
1015echo ". The script ./reconf gives a reasonable baseline, try it if ."
1016echo ". you do not want to read documentation and still want some ."
1017echo ". useful features. ."
1018echo ".----------------------------------------------------------------."
1019echo
1020

Diff Legend

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