--- rxvt-unicode/configure.ac 2007/08/03 23:32:14 1.72 +++ rxvt-unicode/configure.ac 2007/11/05 00:19:14 1.80 @@ -64,7 +64,7 @@ dnl# if test -z "$orig_CXXFLAGS"; then if test x$GCC = xyes && test "x$GXX" = xyes; then - CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" + CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"]) else CXXFLAGS="-O" @@ -195,6 +195,22 @@ fi ]) +WARNINGS=no +AC_ARG_ENABLE(warnings, + [ --enable-warnings turn on g++ warnings], + [if test x$enableval = xyes; then + WARNINGS=yes + fi]) +if test x$GXX = xyes; then + if test $WARNINGS = yes; then + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) + else + CXXFLAGS="$CXXFLAGS -w" + fi +fi + AC_ARG_ENABLE(unicode3, [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], [if test x$enableval = xyes -o x$enableval = xno; then @@ -280,7 +296,7 @@ fi]) AC_ARG_WITH(codesets, - [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], + [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], [codesets="$withval"]) AC_ARG_ENABLE(xim, @@ -315,7 +331,7 @@ RESFALLBACK=Rxvt AC_ARG_ENABLE(fallback, - [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], + [ --enable-fallback@<:@=CLASS@:>@ fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], [ test x$enableval = xyes && enableval=Rxvt test x$enableval = xno && enableval= @@ -384,7 +400,7 @@ fi]) AC_ARG_ENABLE(slipwheeling, - [ --enable-slipwheeling enable slip wheel scrolling (requires previous)], + [ --enable-slipwheeling enable slip wheel scrolling (requires --enable-mousewheel)], [if test x$enableval = xyes -o x$enableval = xno; then support_mouseslipwheel=$enableval fi]) @@ -421,7 +437,7 @@ dnl# -------------------------------------------------------------------------- -AC_PATH_PROG(TIC, tic) +AC_PATH_PROG(TIC, tic, :) dnl# need a neat way to detect SVR4 or its features dnl# in src/command.c we use these functions: @@ -628,11 +644,7 @@ AC_TYPE_SIGNAL dnl> AC_FUNC_VPRINTF -AC_CHECK_FUNCS( \ - unsetenv \ - setutent \ - on_exit \ -) +AC_CHECK_FUNCS(unsetenv) UTMP_CHECK @@ -657,24 +669,39 @@ dnl# -------------------------------------------------------------------------- dnl# this is a really hack test for some basic Xlocale stuff -ac_save_LIBS=$LIBS -ac_save_CFLAGS=$CFLAGS +save_LIBS=$LIBS +save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" -AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, -[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -#include -main() { -char *p; -if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) -exit (XSupportsLocale() ? 0 : 1); -else -exit (1);}]])],[dnl - rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl - :])]) if test x$support_xim = xyes; then + AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, + [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include + #include + main() { + char *p; + if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) + exit (XSupportsLocale() ? 0 : 1); + else + exit (1);}]])],[dnl + rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl + :])]) if test x$rxvt_cv_func_xlocale = xyes; then AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) + AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, + [AC_COMPILE_IFELSE([ + #include + + void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); + + void f() { + XIMCallback cb; + cb.callback = im_destroy_cb; + } + ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)]) + + if test x$rxvt_broken_ximcb = xyes; then + AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) + fi fi fi @@ -684,8 +711,8 @@ if test x$rxvt_cv_func_xsetlocale = xyes; then AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) fi -LIBS=$ac_save_LIBS -CFLAGS=$ac_save_CFLAGS +LIBS=$save_LIBS +CFLAGS=$save_CFLAGS AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])]) @@ -701,22 +728,6 @@ SCM_RIGHTS_CHECK -AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, -[AC_COMPILE_IFELSE([ -#include - -void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); - -void f() { - XIMCallback cb; - cb.callback = im_destroy_cb; -} -],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)]) - -if test x$rxvt_broken_ximcb = xyes; then - AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) -fi - PTY_CHECK TTY_GROUP_CHECK @@ -765,6 +776,9 @@ if test x$support_selectionscrolling = xyes; then AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) fi +if test x$support_frills = xyes; then + AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) +fi if test x$support_mousewheel = xyes; then AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) fi @@ -773,7 +787,7 @@ fi if test x$support_afterimage = xyes; then AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) - AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage) + AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage) fi dnl if test x$support_afterstep = xyes; then @@ -867,14 +881,6 @@ AC_SUBST(IF_PERL) AC_SUBST(PERL_O) -if test x$support_perl = xyes; then - support_frills=yes -fi - -if test x$support_frills = xyes; then - AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) -fi - AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS)