--- rxvt-unicode/configure 2004/03/01 01:06:45 1.13 +++ rxvt-unicode/configure 2004/08/15 04:42:45 1.34 @@ -467,7 +467,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION DATE LSMDATE LIBVERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK LINKER CXXCPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL INSTALL_LIBRXVT MV RM CP LN SED CMP TBL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XPM_CPPFLAGS XPM_CFLAGS XPM_LIBS rxvt_int16_typedef rxvt_uint16_typedef rxvt_int32_typedef rxvt_uint32_typedef rxvt_intp_define rxvt_u_intp_define DEBUG DINCLUDE DLIB RXVTNAME include_stdint_h include_stdarg_h include_stdlib_h include_unistd_h include_string_h include_fcntl_h include_util_h include_assert_h include_sys_ioctl_h include_sys_select_h include_sys_strredir_h include_sys_time_h include_time_h LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION DATE LSMDATE LIBVERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK LINKER CXXCPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL INSTALL_LIBRXVT RXVTNAME MV RM CP LN SED CMP TBL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XPM_CPPFLAGS XPM_CFLAGS XPM_LIBS rxvt_int16_typedef rxvt_uint16_typedef rxvt_int32_typedef rxvt_uint32_typedef rxvt_intp_define rxvt_u_intp_define DEBUG DINCLUDE DLIB include_stdint_h include_stdarg_h include_stdlib_h include_unistd_h include_string_h include_fcntl_h include_util_h include_assert_h include_sys_ioctl_h include_sys_select_h include_sys_strredir_h include_sys_time_h include_time_h LIBOBJS LTLIBOBJS' ac_subst_files='MCOMMON' # Initialize some variables set by options. @@ -1031,12 +1031,15 @@ NOTE: this option is order dependent NOTE: automatically enabled with --enable-shared --enable-unicode3 use 21 instead of 16 bits to represent unicode characters - --enable-xft enable xft support on systems that have it + --enable-combining enable composition of base and combining characters + --enable-xft enable xft support on systems that have it --enable-utmp enable utmp (utmpx) support --enable-wtmp enable wtmp (wtmpx) support (requires --enable-utmp) --enable-lastlog enable lastlog support (requires --enable-utmp) --enable-xpm-background enable XPM background pixmaps --enable-transparency enable transparent backgrounds + --enable-tinting enable tinting of transparent bg + --enable-fading enable colors fading when off focus --enable-menubar enable menubar --enable-rxvt-scroll enable rxvt style scrollbar --enable-next-scroll enable NeXT style scrollbar @@ -1049,8 +1052,11 @@ --disable-delete-key disable handling of the delete key --disable-resources disable all resource checking --enable-xgetdefault enable resources via X instead of our small version + --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-strings enable some replacement system functions --disable-swapscreen disable swap screen support + --enable-iso14755 enable support for extended ISO 14755 modes --enable-frills enable support for rarely used features --enable-linespace enable support for linespace --enable-24bit enable support for using 24bit visuals if available @@ -1058,8 +1064,6 @@ --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-old-selection enable v2.20 (& prior) mouse selection style support - --disable-new-selection disable new mouse (xterm) selection style support --enable-dmalloc enable Gray Watson's malloc - for debugging use --enable-dlmalloc enable Doug Lea's malloc - for production use NOTE: enable only one malloc package @@ -1074,8 +1078,11 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-gnu-ld assume the C compiler uses GNU ld default=no --with-pic try to use only PIC/non-PIC objects default=use both - --with-codesets=NAME,... compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all) - --with-term=NAME set the terminal to NAME (default \"rxvt\") + --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_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) + --with-term=NAME set the terminal to NAME (default: rxvt) --with-terminfo=PATH set the path to the terminfo tree to PATH --with-x use the X Window System --with-xpm-includes=DIR use XPM includes in DIR @@ -1532,6 +1539,7 @@ + ac_aux_dir= for ac_dir in autoconf $srcdir/autoconf; do if test -f $ac_dir/install-sh; then @@ -3278,9 +3286,6 @@ CPPFLAGS="-D_GNU_SOURCE -D_XOPEN_SOURCE" -if test x$GXX = xyes; then - CXXFLAGS="$CXXFLAGS -fno-exceptions" -fi ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3690,6 +3695,209 @@ fi +echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5 +echo $ECHO_N "checking for setlocale in -lxpg4... $ECHO_C" >&6 +if test "${ac_cv_lib_xpg4_setlocale+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxpg4 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char setlocale (); +int +main () +{ +setlocale (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 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); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_xpg4_setlocale=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_xpg4_setlocale=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4_setlocale" >&5 +echo "${ECHO_T}$ac_cv_lib_xpg4_setlocale" >&6 +if test $ac_cv_lib_xpg4_setlocale = yes; then + LIBS="$LIBS -lxpg4" +fi + + +echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +int +main () +{ +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 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); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_nsl_gethostbyname=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 +if test $ac_cv_lib_nsl_gethostbyname = yes; then + LIBS="$LIBS -lnsl" +fi + +echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 +echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 +if test "${ac_cv_lib_socket_socket+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char socket (); +int +main () +{ +socket (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 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); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_socket=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_socket_socket=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 +if test $ac_cv_lib_socket_socket = yes; then + LIBS="$LIBS -lsocket" +fi + + # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -5032,7 +5240,7 @@ case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 5035 "configure"' > conftest.$ac_ext + echo '#line 5243 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5583,7 +5791,7 @@ save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -7199,7 +7407,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <>confdefs.h <<_ACEOF +#define RESFALLBACK "$RESFALLBACK" +_ACEOF + +fi + +RESNAME=urxvt + +# Check whether --with-res-name or --without-res-name was given. +if test "${with_res_name+set}" = set; then + withval="$with_res_name" + RESNAME="$withval" +fi; + +cat >>confdefs.h <<_ACEOF +#define RESNAME "$RESNAME" +_ACEOF + + +RESCLASS=URxvt + +# Check whether --with-res-class or --without-res-class was given. +if test "${with_res_class+set}" = set; then + withval="$with_res_class" + RESCLASS="$withval" +fi; + +cat >>confdefs.h <<_ACEOF +#define RESCLASS "$RESCLASS" +_ACEOF + + +RXVTNAME=urxvt + +# Check whether --with-name or --without-name was given. +if test "${with_name+set}" = set; then + withval="$with_name" + RXVTNAME="$withval" +fi; + +RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` + + # Check whether --enable-strings or --disable-strings was given. if test "${enable_strings+set}" = set; then enableval="$enable_strings" @@ -8298,6 +8602,14 @@ fi fi; +# Check whether --enable-iso14755 or --disable-iso14755 was given. +if test "${enable_iso14755+set}" = set; then + enableval="$enable_iso14755" + if test x$enableval = xyes -o x$enableval = xno; then + support_iso14755=$enableval + fi +fi; + # Check whether --enable-frills or --disable-frills was given. if test "${enable_frills+set}" = set; then enableval="$enable_frills" @@ -8354,26 +8666,6 @@ fi fi; -# Check whether --enable-old-selection or --disable-old-selection was given. -if test "${enable_old_selection+set}" = set; then - enableval="$enable_old_selection" - if test x$enableval = xyes -o x$enableval = xno; then - support_oldselection=$enableval - fi -fi; - -# Check whether --enable-new-selection or --disable-new-selection was given. -if test "${enable_new_selection+set}" = set; then - enableval="$enable_new_selection" - if test x$enableval = xno; then - -cat >>confdefs.h <<\_ACEOF -#define NO_NEW_SELECTION 1 -_ACEOF - - fi -fi; - # Check whether --enable-dmalloc or --disable-dmalloc was given. if test "${enable_dmalloc+set}" = set; then enableval="$enable_dmalloc" @@ -8806,9 +9098,12 @@ -echo "$as_me:$LINENO: checking for X" >&5 + +if test "x$ac_path_x_has_been_run" != xyes; then + echo "$as_me:$LINENO: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 +ac_path_x_has_been_run=yes # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -8901,7 +9196,7 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for a specified header file. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -9035,10 +9330,15 @@ # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + # It might be that x_includes is empty (headers are found in the + # standard search path. Then output the corresponding message + ac_out_x_includes=$x_includes + test "x$x_includes" = x && ac_out_x_includes="in standard search path" + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 fi +fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. @@ -10625,6 +10925,7 @@ + for ac_header in \ assert.h \ fcntl.h \ @@ -10641,6 +10942,7 @@ sys/select.h \ sys/sockio.h \ sys/strredir.h \ + sys/stropts.h \ sys/time.h \ utmp.h \ utmpx.h \ @@ -11438,7 +11740,6 @@ fi - echo "$as_me:$LINENO: checking for char" >&5 echo $ECHO_N "checking for char... $ECHO_C" >&6 if test "${ac_cv_type_char+set}" = set; then @@ -15801,7 +16102,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { @@ -15912,6 +16213,64 @@ fi +echo "$as_me:$LINENO: checking for broken XIM callback" >&5 +echo $ECHO_N "checking for broken XIM callback... $ECHO_C" >&6 +if test "${rxvt_broken_ximcb+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF + +#include + +void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); + +void f() { + XIMCallback cb; + cb.callback = im_destroy_cb; +} + +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + rxvt_broken_ximcb=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +rxvt_broken_ximcb=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $rxvt_broken_ximcb" >&5 +echo "${ECHO_T}$rxvt_broken_ximcb" >&6 + +if test x$rxvt_broken_ximcb = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define XIMCB_PROTO_BROKEN 1 +_ACEOF + +fi + echo "$as_me:$LINENO: checking for getpt" >&5 echo $ECHO_N "checking for getpt... $ECHO_C" >&6 if test "${rxvt_cv_func_getpt+set}" = set; then @@ -15925,7 +16284,7 @@ /* end confdefs.h. */ #define _GNU_SOURCE #ifdef HAVE_STDLIB_H -# include +# include #endif int main () @@ -16100,74 +16459,34 @@ fi -echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5 -echo $ECHO_N "checking for setlocale in -lxpg4... $ECHO_C" >&6 -if test "${ac_cv_lib_xpg4_setlocale+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lxpg4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +if test x$support_iso14755 = xyes; then -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char setlocale (); -int -main () -{ -setlocale (); - ; - return 0; -} +cat >>confdefs.h <<\_ACEOF +#define ISO_14755 1 _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_xpg4_setlocale=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_xpg4_setlocale=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +if test x$support_8bitctrls = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define EIGHT_BIT_CONTROLS 1 +_ACEOF + fi -echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4_setlocale" >&5 -echo "${ECHO_T}$ac_cv_lib_xpg4_setlocale" >&6 -if test $ac_cv_lib_xpg4_setlocale = yes; then - LIBS="$LIBS -lxpg4" +if test x$support_fading = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define OFF_FOCUS_FADING 1 +_ACEOF + fi +if test x$support_tinting = xyes; then +cat >>confdefs.h <<\_ACEOF +#define TINTING 1 +_ACEOF +fi if test x$support_inheritpixmap = xyes; then cat >>confdefs.h <<\_ACEOF @@ -16196,10 +16515,10 @@ _ACEOF fi -if test x$support_frills = xno; then +if test x$support_frills = xyes; then cat >>confdefs.h <<\_ACEOF -#define NO_FRILLS 1 +#define ENABLE_FRILLS 1 _ACEOF fi @@ -16231,13 +16550,6 @@ _ACEOF fi -if test x$support_oldselection = xno; then - -cat >>confdefs.h <<\_ACEOF -#define NO_OLD_SELECTION 1 -_ACEOF - -fi if test x$support_utmp = xyes; then cat >>confdefs.h <<\_ACEOF @@ -16335,10 +16647,16 @@ _ACEOF fi +if test x$support_combining = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define ENABLE_COMBINING 1 +_ACEOF + +fi if test x$codesets = xall; then - codesets=jp,jp-ext,kr,cn,cn-ext,vn + codesets=jp,jp-ext,kr,cn,cn-ext fi -for codeset in `echo $codesets | tr "a-z,\\-" "A-Z _"`; do cat >>confdefs.h <<\_ACEOF #define ENCODING_EU 1 @@ -16349,6 +16667,7 @@ #define ENCODING_VN 1 _ACEOF +for codeset in `echo $codesets | tr "a-z,\\-" "A-Z _"`; do case "$codeset" in JP ) cat >>confdefs.h <<\_ACEOF @@ -16427,9 +16746,6 @@ rm conftest.sed -RXVTNAME=`echo rxvt|sed "$program_transform_name"` - - @@ -16439,14 +16755,14 @@ include_stdint_h="/* #include */" fi if test "$ac_cv_header_stdarg_h" = "yes" -o "$notset" = "dontmatch"; then - include_stdarg_h="#include " + include_stdarg_h="#include " else - include_stdarg_h="/* #include */" + include_stdarg_h="/* #include */" fi if test "$ac_cv_header_stdlib_h" = "yes" -o "$notset" = "dontmatch"; then - include_stdlib_h="#include " + include_stdlib_h="#include " else - include_stdlib_h="/* #include */" + include_stdlib_h="/* #include */" fi if test "$ac_cv_header_unistd_h" = "yes" -o "$notset" = "dontmatch"; then include_unistd_h="#include " @@ -16454,9 +16770,9 @@ include_unistd_h="/* #include */" fi if test "$ac_cv_header_string_h" = "yes" -o "$notset" = "dontmatch"; then - include_string_h="#include " + include_string_h="#include " else - include_string_h="/* #include */" + include_string_h="/* #include */" fi if test "$ac_cv_header_fcntl_h" = "yes" -o "$notset" = "dontmatch"; then include_fcntl_h="#include " @@ -16741,6 +17057,7 @@ fi ac_config_files="$ac_config_files autoconf/Make.common Makefile doc/Makefile src/Makefile src/test/Makefile src/rxvtlib.h W11/Makefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -17396,6 +17713,7 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@INSTALL_LIBRXVT@,$INSTALL_LIBRXVT,;t t +s,@RXVTNAME@,$RXVTNAME,;t t s,@MV@,$MV,;t t s,@RM@,$RM,;t t s,@CP@,$CP,;t t @@ -17419,7 +17737,6 @@ s,@DEBUG@,$DEBUG,;t t s,@DINCLUDE@,$DINCLUDE,;t t s,@DLIB@,$DLIB,;t t -s,@RXVTNAME@,$RXVTNAME,;t t s,@include_stdint_h@,$include_stdint_h,;t t s,@include_stdarg_h@,$include_stdarg_h,;t t s,@include_stdlib_h@,$include_stdlib_h,;t t @@ -17958,8 +18275,8 @@ " echo " pty/tty type: "$rxvt_cv_ptys if test x$support_utmp != xyes; then - echo " utmp support: disabled -" + echo " utmp support: disabled" + echo else echo " utmp support: enabled utmp file: $rxvt_cv_path_utmp @@ -17967,17 +18284,21 @@ wtmp file: $rxvt_cv_path_wtmp wtmpx file: $rxvt_cv_path_wtmpx lastlog file: $rxvt_cv_path_lastlog - ttys/ttytab file: $rxvt_cv_path_ttytab -" + ttys/ttytab file: $rxvt_cv_path_ttytab" + echo fi if test x$term != x; then - echo " set TERM to: $term -" + echo " set TERM to: $term" fi if test x$terminfo != x; then - echo " set TERMINFO to: $terminfo -" + echo " set TERMINFO to: $terminfo" +fi +echo " default resource name: $RESNAME" +echo " resource class: $RESCLASS" +if test x$RESFALLBACK != x; then + echo " resource class fallback: $RESFALLBACK" fi +echo if test x$rxvt_cv_ptys = xUNKNOWN; then echo ".----------------------------------------------------------------." echo ". WARNING: could not determine pty/tty type. Do not build until ." @@ -18001,5 +18322,13 @@ echo ". XIM is now being DISABLED! ." echo ".----------------------------------------------------------------." fi -echo " *** Please check src/feature.h for further options *** -" + +echo " *** Please check src/feature.h for further options ***" +echo + +echo ".----------------------------------------------------------------." +echo ". NOTE: most features are disabled by default, try ." +echo ". configure --help to get an idea of the optional features ." +echo ".----------------------------------------------------------------." +echo +