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.37 by ayin, Mon May 7 13:42:23 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
… …
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,
… …
516ac_save_CFLAGS=$CFLAGS 499ac_save_CFLAGS=$CFLAGS
517ac_save_LIBS=$LIBS 500ac_save_LIBS=$LIBS
518CFLAGS="$CFLAGS $X_CFLAGS" 501CFLAGS="$CFLAGS $X_CFLAGS"
519LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 502LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
520AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, 503AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
521[AC_RUN_IFELSE([AC_LANG_SOURCE([[ 504[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
505#include <stdlib.h>
522main() 506main()
523{ 507{
524 exit(0); 508 exit(0);
525 (void) XOpenDisplay("foobar"); 509 (void) XOpenDisplay("foobar");
526}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl 510}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
… …
529 changequote(, )dnl 513 changequote(, )dnl
530 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 514 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
531 changequote([, ])dnl 515 changequote([, ])dnl
532 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"`
533 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,
534[AC_RUN_IFELSE([AC_LANG_SOURCE([[ 518[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
519#include <stdlib.h>
535main() 520main()
536{ 521{
537 exit(0); 522 exit(0);
538 (void) XOpenDisplay("foobar"); 523 (void) XOpenDisplay("foobar");
539}]])],[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])])
… …
548 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 533 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
549fi 534fi
550LIBS=$ac_save_LIBS 535LIBS=$ac_save_LIBS
551CFLAGS=$ac_save_CFLAGS 536CFLAGS=$ac_save_CFLAGS
552 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
553 552
554AC_C_CONST 553AC_C_CONST
555AC_C_INLINE 554AC_C_INLINE
556 555
557dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow. 556dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
… …
687if 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
688 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 687 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
689fi 688fi
690AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 689AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
691[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>
692main() { 692main() {
693char *p; 693char *p;
694if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 694if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
695exit (XSupportsLocale() ? 0 : 1); 695exit (XSupportsLocale() ? 0 : 1);
696else 696else
… …
893AC_SUBST(PERLPRIVLIBEXP) 893AC_SUBST(PERLPRIVLIBEXP)
894AC_SUBST(PERL) 894AC_SUBST(PERL)
895AC_SUBST(IF_PERL) 895AC_SUBST(IF_PERL)
896AC_SUBST(PERL_O) 896AC_SUBST(PERL_O)
897 897
898 AC_TRY_LINK([
899#include <EXTERN.h>
900#include <perl.h>
901#include <XSUB.h>
902],[
903 PerlInterpreter *perl = perl_alloc ();
904],[rxvt_perl_link=yes],[rxvt_perl_link=no])
898if test x$support_perl = xyes; then 905if test x$support_perl = xyes; then
899 support_frills=yes 906 support_frills=yes
900fi 907fi
901 908
902dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
903
904CFLAGS=${CFLAGS--O}
905LDFLAGS=${LDFLAGS--O}
906
907CPPFLAGS="$CPPFLAGS"
908AC_SUBST(DEBUG) 909AC_SUBST(DEBUG)
909AC_SUBST(DINCLUDE) 910AC_SUBST(DINCLUDE)
910AC_SUBST(CFLAGS) 911AC_SUBST(CFLAGS)
911AC_SUBST(CPPFLAGS) 912AC_SUBST(CPPFLAGS)
912AC_SUBST(LDFLAGS) 913AC_SUBST(LDFLAGS)
… …
963 964
964 Rxvt version: $VERSION : $DATE 965 Rxvt version: $VERSION : $DATE
965 Source code location: $srcdir 966 Source code location: $srcdir
966 Install path: ${prefix}/bin 967 Install path: ${prefix}/bin
967 Compiler: $CXX 968 Compiler: $CXX
968 Compiler flags: $CFLAGS 969 Compiler flags: $CXXFLAGS
969 Linker: $LINKER" 970 Linker: $LINKER"
970 971
971if test x$support_xpm = xyes; then 972if test x$support_xpm = xyes; then
972 echo " Xpm library: $XPM_LIBS" 973 echo " Xpm library: $XPM_LIBS"
973fi 974fi
… …
1002 echo ". functions could not be found. ." 1003 echo ". functions could not be found. ."
1003 echo ". XIM is now being DISABLED! ." 1004 echo ". XIM is now being DISABLED! ."
1004 echo ".----------------------------------------------------------------." 1005 echo ".----------------------------------------------------------------."
1005fi 1006fi
1006 1007
1007echo " *** Optionally check src/feature.h for further options ***" 1008echo "*** Optionally check src/feature.h for further, rarely used options ***"
1008echo 1009echo
1009 1010
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