--- rxvt-unicode/configure 2007/08/26 19:38:30 1.111 +++ rxvt-unicode/configure 2007/11/05 01:04:43 1.115 @@ -1319,6 +1319,7 @@ --enable-everything enable standard non-multichoice features NOTE: this option is order dependent NOTE: automatically enabled with --enable-shared + --enable-warnings turn on g++ warnings --enable-unicode3 use 21 instead of 16 bits to represent unicode characters --enable-combining enable composition of base and combining characters --enable-xft enable xft support on systems that have it @@ -1336,14 +1337,14 @@ --disable-delete-key disable handling of the delete key --disable-resources disable all resource checking --enable-8bitctrls enable 8 bit control sequences (not recommended) - --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) --disable-swapscreen disable swap screen support --enable-iso14755 enable support for extended ISO 14755 modes --enable-frills enable support for rarely used features --enable-keepscrolling enable continual scrolling on scrollbar arrow press --enable-selectionscrolling enable scrolling during selections --enable-mousewheel enable scrolling via mouse wheel or buttons 4 & 5 - --enable-slipwheeling enable slip wheel scrolling (requires previous) + --enable-slipwheeling enable slip wheel scrolling (requires --enable-mousewheel) --enable-smart-resize enable smart growth/shrink behaviour --enable-text-blink enable blinking text --enable-pointer-blank enable pointer blank when typing or inactive pointer @@ -1355,7 +1356,7 @@ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-afterimage-config=DIR use libAfterImage config script in DIR - --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) --with-res-name=NAME use this as default resource name (default: urxvt) --with-res-class=CLASS use this as the resource class (default: URxvt) --with-name=NAME set the basename for the installed binaries (default: urxvt) @@ -3871,7 +3872,7 @@ 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" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4493,6 +4494,64 @@ fi +WARNINGS=no +# Check whether --enable-warnings was given. +if test "${enable_warnings+set}" = set; then + enableval=$enable_warnings; if test x$enableval = xyes; then + WARNINGS=yes + fi +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" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CXXFLAGS="$save_CXXFLAGS" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + else + CXXFLAGS="$CXXFLAGS -w" + fi +fi + # Check whether --enable-unicode3 was given. if test "${enable_unicode3+set}" = set; then enableval=$enable_unicode3; if test x$enableval = xyes -o x$enableval = xno; then @@ -4861,6 +4920,7 @@ done IFS=$as_save_IFS + test -z "$ac_cv_path_TIC" && ac_cv_path_TIC=":" ;; esac fi @@ -9578,13 +9638,7 @@ - - -for ac_func in \ - unsetenv \ - setutent \ - on_exit \ - +for ac_func in unsetenv do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -9733,9 +9787,9 @@ for ac_func in \ - ttyslot \ updwtmp \ updwtmpx \ + updlastlogx \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -11166,13 +11220,6 @@ #define LASTLOG_FILE "$path_lastlog" _ACEOF - if test -d "$path_lastlog"; then - -cat >>confdefs.h <<\_ACEOF -#define LASTLOG_IS_DIR 1 -_ACEOF - - fi fi { echo "$as_me:$LINENO: checking where lastlogx is located" >&5 @@ -11264,33 +11311,9 @@ -{ echo "$as_me:$LINENO: checking where ttys/ttytab is located" >&5 -echo $ECHO_N "checking where ttys/ttytab is located... $ECHO_C" >&6; } -if test "${rxvt_cv_path_ttytab+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - for ttys_file in /etc/ttys /etc/ttytab; -do - if test -f "$ttys_file" ; then - rxvt_cv_path_ttytab=$ttys_file - break - fi -done -fi -{ echo "$as_me:$LINENO: result: $rxvt_cv_path_ttytab" >&5 -echo "${ECHO_T}$rxvt_cv_path_ttytab" >&6; } -if test x$rxvt_cv_path_ttytab != x; then - -cat >>confdefs.h <<_ACEOF -#define TTYTAB_FILENAME "$rxvt_cv_path_ttytab" -_ACEOF - -fi - - -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" if test x$support_xim = xyes; then @@ -11475,8 +11498,8 @@ _ACEOF fi -LIBS=$ac_save_LIBS -CFLAGS=$ac_save_CFLAGS +LIBS=$save_LIBS +CFLAGS=$save_CFLAGS { echo "$as_me:$LINENO: checking for working plain setlocale" >&5 echo $ECHO_N "checking for working plain setlocale... $ECHO_C" >&6; } @@ -12731,7 +12754,7 @@ cat >>confdefs.h <<\_ACEOF -#define XPM_BACKGROUND 1 +#define BG_IMAGE_FROM_FILE 1 _ACEOF fi