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.78 by ayin, Wed Oct 31 11:55:23 2007 UTC vs.
Revision 1.82 by root, Sun Nov 11 04:08:00 2007 UTC

… …
62dnl# -------------------------------------------------------------------------- 62dnl# --------------------------------------------------------------------------
63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
64dnl# 64dnl#
65if test -z "$orig_CXXFLAGS"; then 65if test -z "$orig_CXXFLAGS"; then
66 if test x$GCC = xyes && test "x$GXX" = xyes; then 66 if test x$GCC = xyes && test "x$GXX" = xyes; then
67 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" 67 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"
68 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"]) 68 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
69 else 69 else
70 CXXFLAGS="-O" 70 CXXFLAGS="-O"
71 fi 71 fi
72 CFLAGS="$CXXFLAGS" 72 CFLAGS="$CXXFLAGS"
… …
294 [if test x$enableval = xyes -o x$enableval = xno; then 294 [if test x$enableval = xyes -o x$enableval = xno; then
295 support_scroll_plain=$enableval 295 support_scroll_plain=$enableval
296 fi]) 296 fi])
297 297
298AC_ARG_WITH(codesets, 298AC_ARG_WITH(codesets,
299 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], 299 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
300 [codesets="$withval"]) 300 [codesets="$withval"])
301 301
302AC_ARG_ENABLE(xim, 302AC_ARG_ENABLE(xim,
303 [ --enable-xim XIM (X Input Method) protocol support], 303 [ --enable-xim XIM (X Input Method) protocol support],
304 [if test x$enableval = xyes -o x$enableval = xno; then 304 [if test x$enableval = xyes -o x$enableval = xno; then
… …
432AC_ARG_WITH(terminfo, 432AC_ARG_WITH(terminfo,
433 [ --with-terminfo=PATH set the path to the terminfo tree to PATH], 433 [ --with-terminfo=PATH set the path to the terminfo tree to PATH],
434 [if test x$withval != x; then 434 [if test x$withval != x; then
435 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 435 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
436 fi]) 436 fi])
437
438dnl# --------------------------------------------------------------------------
439
440m4_include([libev/libev.m4])
437 441
438dnl# -------------------------------------------------------------------------- 442dnl# --------------------------------------------------------------------------
439 443
440AC_PATH_PROG(TIC, tic, :) 444AC_PATH_PROG(TIC, tic, :)
441 445
… …
642dnl# CHECKING FOR LIBRARY FUNCTIONS 646dnl# CHECKING FOR LIBRARY FUNCTIONS
643dnl# -------------------------------------------------------------------------- 647dnl# --------------------------------------------------------------------------
644AC_TYPE_SIGNAL 648AC_TYPE_SIGNAL
645dnl> AC_FUNC_VPRINTF 649dnl> AC_FUNC_VPRINTF
646 650
647AC_CHECK_FUNCS( \ 651AC_CHECK_FUNCS(unsetenv)
648 unsetenv \
649 setutent \
650 on_exit \
651)
652 652
653UTMP_CHECK 653UTMP_CHECK
654 654
655dnl# -------------------------------------------------------------------------- 655dnl# --------------------------------------------------------------------------
656 656
657dnl# find ttys/ttytab
658AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab,
659[for ttys_file in dnl
660 /etc/ttys /etc/ttytab;
661do
662 if test -f "$ttys_file" ; then
663 rxvt_cv_path_ttytab=$ttys_file
664 break
665 fi
666done
667])
668if test x$rxvt_cv_path_ttytab != x; then
669 AC_DEFINE_UNQUOTED(TTYTAB_FILENAME, "$rxvt_cv_path_ttytab", Define location of ttys/ttytab)
670fi
671
672dnl# -------------------------------------------------------------------------- 657dnl# --------------------------------------------------------------------------
673dnl# -------------------------------------------------------------------------- 658dnl# --------------------------------------------------------------------------
674 659
675dnl# this is a really hack test for some basic Xlocale stuff 660dnl# this is a really hack test for some basic Xlocale stuff
676ac_save_LIBS=$LIBS 661save_LIBS=$LIBS
677ac_save_CFLAGS=$CFLAGS 662save_CFLAGS=$CFLAGS
678CFLAGS="$CFLAGS $X_CFLAGS" 663CFLAGS="$CFLAGS $X_CFLAGS"
679LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 664LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
680if test x$support_xim = xyes; then 665if test x$support_xim = xyes; then
681 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 666 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
682 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 667 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
… …
713[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 698[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
714#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 699#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
715if test x$rxvt_cv_func_xsetlocale = xyes; then 700if test x$rxvt_cv_func_xsetlocale = xyes; then
716 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 701 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
717fi 702fi
718LIBS=$ac_save_LIBS 703LIBS=$save_LIBS
719CFLAGS=$ac_save_CFLAGS 704CFLAGS=$save_CFLAGS
720 705
721AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 706AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
722[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])]) 707[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
723if test x$rxvt_cv_func_setlocale = xyes; then 708if test x$rxvt_cv_func_setlocale = xyes; then
724 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 709 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)

Diff Legend

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