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.76 by ayin, Tue Sep 18 12:17:58 2007 UTC vs.
Revision 1.79 by ayin, Wed Oct 31 11:59:09 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"
… …
193 support_perl=yes 193 support_perl=yes
194 codesets=all 194 codesets=all
195 fi 195 fi
196 ]) 196 ])
197 197
198WARNINGS=no
199AC_ARG_ENABLE(warnings,
200 [ --enable-warnings turn on g++ warnings],
201 [if test x$enableval = xyes; then
202 WARNINGS=yes
203 fi])
204if test x$GXX = xyes; then
205 if test $WARNINGS = yes; then
206 save_CXXFLAGS="$CXXFLAGS"
207 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor"
208 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
209 else
210 CXXFLAGS="$CXXFLAGS -w"
211 fi
212fi
213
198AC_ARG_ENABLE(unicode3, 214AC_ARG_ENABLE(unicode3,
199 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 215 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
200 [if test x$enableval = xyes -o x$enableval = xno; then 216 [if test x$enableval = xyes -o x$enableval = xno; then
201 support_unicode3=$enableval 217 support_unicode3=$enableval
202 fi]) 218 fi])
… …
278 [if test x$enableval = xyes -o x$enableval = xno; then 294 [if test x$enableval = xyes -o x$enableval = xno; then
279 support_scroll_plain=$enableval 295 support_scroll_plain=$enableval
280 fi]) 296 fi])
281 297
282AC_ARG_WITH(codesets, 298AC_ARG_WITH(codesets,
283 [ --with-codesets=NAME,.. 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)],
284 [codesets="$withval"]) 300 [codesets="$withval"])
285 301
286AC_ARG_ENABLE(xim, 302AC_ARG_ENABLE(xim,
287 [ --enable-xim XIM (X Input Method) protocol support], 303 [ --enable-xim XIM (X Input Method) protocol support],
288 [if test x$enableval = xyes -o x$enableval = xno; then 304 [if test x$enableval = xyes -o x$enableval = xno; then
… …
313 support_8bitctrls=$enableval 329 support_8bitctrls=$enableval
314 fi]) 330 fi])
315 331
316RESFALLBACK=Rxvt 332RESFALLBACK=Rxvt
317AC_ARG_ENABLE(fallback, 333AC_ARG_ENABLE(fallback,
318 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 334 [ --enable-fallback@<:@=CLASS@:>@ fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
319 [ 335 [
320 test x$enableval = xyes && enableval=Rxvt 336 test x$enableval = xyes && enableval=Rxvt
321 test x$enableval = xno && enableval= 337 test x$enableval = xno && enableval=
322 RESFALLBACK="$enableval" 338 RESFALLBACK="$enableval"
323 ]) 339 ])
… …
382 [if test x$enableval = xyes -o x$enableval = xno; then 398 [if test x$enableval = xyes -o x$enableval = xno; then
383 support_mousewheel=$enableval 399 support_mousewheel=$enableval
384 fi]) 400 fi])
385 401
386AC_ARG_ENABLE(slipwheeling, 402AC_ARG_ENABLE(slipwheeling,
387 [ --enable-slipwheeling enable slip wheel scrolling (requires previous)], 403 [ --enable-slipwheeling enable slip wheel scrolling (requires --enable-mousewheel)],
388 [if test x$enableval = xyes -o x$enableval = xno; then 404 [if test x$enableval = xyes -o x$enableval = xno; then
389 support_mouseslipwheel=$enableval 405 support_mouseslipwheel=$enableval
390 fi]) 406 fi])
391 407
392AC_ARG_ENABLE(smart-resize, 408AC_ARG_ENABLE(smart-resize,
… …
655 671
656dnl# -------------------------------------------------------------------------- 672dnl# --------------------------------------------------------------------------
657dnl# -------------------------------------------------------------------------- 673dnl# --------------------------------------------------------------------------
658 674
659dnl# this is a really hack test for some basic Xlocale stuff 675dnl# this is a really hack test for some basic Xlocale stuff
660ac_save_LIBS=$LIBS 676save_LIBS=$LIBS
661ac_save_CFLAGS=$CFLAGS 677save_CFLAGS=$CFLAGS
662CFLAGS="$CFLAGS $X_CFLAGS" 678CFLAGS="$CFLAGS $X_CFLAGS"
663LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 679LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
664if test x$support_xim = xyes; then 680if test x$support_xim = xyes; then
665 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 681 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
666 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 682 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
… …
697[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 713[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
698#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 714#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
699if test x$rxvt_cv_func_xsetlocale = xyes; then 715if test x$rxvt_cv_func_xsetlocale = xyes; then
700 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 716 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
701fi 717fi
702LIBS=$ac_save_LIBS 718LIBS=$save_LIBS
703CFLAGS=$ac_save_CFLAGS 719CFLAGS=$save_CFLAGS
704 720
705AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 721AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
706[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])]) 722[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
707if test x$rxvt_cv_func_setlocale = xyes; then 723if test x$rxvt_cv_func_setlocale = xyes; then
708 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 724 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)

Diff Legend

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