--- rxvt-unicode/configure 2005/02/18 12:15:06 1.53 +++ rxvt-unicode/configure 2006/02/02 14:40:59 1.99 @@ -309,8 +309,8 @@ # 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os 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 INSTALL_LIBRXVT RXVTNAME MV RM CP LN SED ECHO CMP TBL TIC 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' +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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os 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 EGREP LINKER INSTALL_LIBRXVT RXVTNAME MV CP LN SED ECHO CMP TIC CXXCPP 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 PKG_CONFIG XFT_CONFIG PERL PERLLIB PERLFLAGS PERLPRIVLIBEXP IF_PERL PERL_O 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='' # Initialize some variables set by options. ac_init_help= @@ -872,43 +872,34 @@ --enable-combining enable composition of base and combining characters --enable-xft enable xft support on systems that have it --enable-font-styles enable bold and italic support - --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 --enable-xterm-scroll enable Xterm style scrollbar + --enable-perl enable embedded perl interpreter --enable-plain-scroll enable plain style scrollbar - --enable-half-shadow use half width/height shadow on rxvt scrollbar --enable-xim XIM (X Input Method) protocol support - --enable-ttygid enable tty setting to group named "tty" --disable-backspace-key disable handling of the backspace key --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-24bit enable support for using 24bit visuals if available --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-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 --enable-smart-resize enable smart growth/shrink behaviour - --enable-cursor-blink enable blinking cursor --enable-text-blink enable blinking text --enable-pointer-blank enable pointer blank when typing or inactive pointer + --enable-utmp enable utmp (utmpx) support + --enable-wtmp enable wtmp (wtmpx) support (requires --enable-utmp) + --enable-lastlog enable lastlog support (requires --enable-utmp) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1375,8 +1366,12 @@ + + ac_config_headers="$ac_config_headers config.h:config.h.in" + + ac_aux_dir= -for ac_dir in autoconf $srcdir/autoconf; do +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -1392,17 +1387,14 @@ fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf $srcdir/autoconf" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in autoconf $srcdir/autoconf" >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 +echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi ac_config_guess="$SHELL $ac_aux_dir/config.guess" ac_config_sub="$SHELL $ac_aux_dir/config.sub" ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - ac_config_headers="$ac_config_headers config.h:autoconf/config.h.in" - - # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 @@ -1464,6 +1456,8 @@ echo "configuring for rxvt $VERSION" echo "" +orig_CXXFLAGS="$CXXFLAGS" + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3053,72 +3047,60 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + + +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi fi +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep - test -n "$AWK" && break -done -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +echo "$as_me:$LINENO: checking for AIX" >&5 +echo $ECHO_N "checking for AIX... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef _AIX + yes +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +cat >>confdefs.h <<\_ACEOF +#define _ALL_SOURCE 1 +_ACEOF -if test -z "$orig_CXXFLAGS"; then - CXXFLAGS='-O' - if test x$GCC = xyes && test "x$GXX" = xyes; then - CXXFLAGS="-g -O3" - fi - CFLAGS="$CXXFLAGS" +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi +rm -f conftest* -LINKER="$CXX" -if test x$GCC = xyes && test x$GXX = xyes; then -echo "$as_me:$LINENO: checking for main in -lsupc++" >&5 -echo $ECHO_N "checking for main in -lsupc++... $ECHO_C" >&6 -if test "${ac_cv_lib_supcpp_main+set}" = set; then +echo "$as_me:$LINENO: checking for library containing strerror" >&5 +echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 +if test "${ac_cv_search_strerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsupc++ $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_strerror=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -3126,11 +3108,17 @@ 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 strerror (); int main () { -main (); +strerror (); ; return 0; } @@ -3156,365 +3144,285 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_supcpp_main=yes + ac_cv_search_strerror="none required" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_supcpp_main=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_supcpp_main" >&5 -echo "${ECHO_T}$ac_cv_lib_supcpp_main" >&6 -if test $ac_cv_lib_supcpp_main = yes; then - - LINKER="$CC" - LIBS="$LIBS -lsupc++" - -fi - -fi -LINKER=$LINKER - - - -cat >>confdefs.h <<\_ACEOF -#define _GNU_SOURCE 1 -_ACEOF - - -case $host in - *-*-solaris* ) - -cat >>confdefs.h <<\_ACEOF -#define _XOPEN_SOURCE_EXTENDED 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define _XOPEN_SOURCE 2 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define __EXTENSIONS__ 1 -_ACEOF - - ;; -esac - - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF +if test "$ac_cv_search_strerror" = no; then + for ac_lib in cposix; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif - Syntax error +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strerror (); +int +main () +{ +strerror (); + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : + (exit $ac_status); } && + { ac_try='test -z "$ac_c_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_search_strerror="-l$ac_lib" +break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +echo "${ECHO_T}$ac_cv_search_strerror" >&6 +if test "$ac_cv_search_strerror" != no; then + test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF +fi + +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + +if test x$GCC = xyes && test x$GXX = xyes; then + echo "$as_me:$LINENO: checking for working libsupc++" >&5 +echo $ECHO_N "checking for working libsupc++... $ECHO_C" >&6 + save_CXX="$CXX" + save_LIBS="$LIBS" + CXX="$CC" + LIBS="$LIBS -lsupc++" + LINKER="$CC" + +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +struct test { }; void f() try { throw new test; } catch (...) { throw; } +int +main () +{ + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue + (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 + echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6 else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi + echo "$as_me:$LINENO: result: no, making everything bigger and slower" >&5 +echo "${ECHO_T}no, making everything bigger and slower" >&6 + LIBS="$save_LIBS" + LINKER="$save_CXX" - done - ac_cv_prog_CXXCPP=$CXXCPP fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CXX="$save_CXX" fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF +LINKER=$LINKER + + +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" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error + +int +main () +{ + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (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 : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue +CXXFLAGS="-g -O3" fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext else - ac_cpp_err= + CXXFLAGS="-O" fi -else - ac_cpp_err=yes + CFLAGS="$CXXFLAGS" fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +cat >>confdefs.h <<\_ACEOF +#define _GNU_SOURCE 1 +_ACEOF -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep +case $host in + *-*-solaris* ) +cat >>confdefs.h <<\_ACEOF +#define _XOPEN_SOURCE_EXTENDED 1 +_ACEOF -echo "$as_me:$LINENO: checking for AIX" >&5 -echo $ECHO_N "checking for AIX... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<\_ACEOF +#define _XOPEN_SOURCE 2 _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef _AIX - yes -#endif -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + cat >>confdefs.h <<\_ACEOF -#define _ALL_SOURCE 1 +#define __EXTENSIONS__ 1 _ACEOF -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -f conftest* + ;; +esac -echo "$as_me:$LINENO: checking for library containing strerror" >&5 -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 -if test "${ac_cv_search_strerror+set}" = set; then +echo "$as_me:$LINENO: checking for setlocale" >&5 +echo $ECHO_N "checking for setlocale... $ECHO_C" >&6 +if test "${ac_cv_func_setlocale+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_strerror=no -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define setlocale to an innocuous variant, in case declares setlocale. + For example, HP-UX 11i declares gettimeofday. */ +#define setlocale innocuous_setlocale + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char setlocale (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef setlocale /* 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 strerror (); +char setlocale (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_setlocale) || defined (__stub___setlocale) +choke me +#else +char (*f) () = setlocale; +#endif +#ifdef __cplusplus +} +#endif + int main () { -strerror (); +return f != setlocale; ; return 0; } @@ -3540,18 +3448,29 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_strerror="none required" + ac_cv_func_setlocale=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_func_setlocale=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_strerror" = no; then - for ac_lib in cposix; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF +fi +echo "$as_me:$LINENO: result: $ac_cv_func_setlocale" >&5 +echo "${ECHO_T}$ac_cv_func_setlocale" >&6 +if test $ac_cv_func_setlocale = yes; then + : +else + 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 @@ -3564,11 +3483,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char strerror (); +char setlocale (); int main () { -strerror (); +setlocale (); ; return 0; } @@ -3594,52 +3513,78 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_strerror="-l$ac_lib" -break + 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 - done +LIBS=$ac_check_lib_save_LIBS fi -LIBS=$ac_func_search_save_LIBS +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: result: $ac_cv_search_strerror" >&5 -echo "${ECHO_T}$ac_cv_search_strerror" >&6 -if test "$ac_cv_search_strerror" != no; then - test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" 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 "$as_me:$LINENO: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 +if test "${ac_cv_func_gethostbyname+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 + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. + For example, HP-UX 11i declares gettimeofday. */ +#define gethostbyname innocuous_gethostbyname + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gethostbyname (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef gethostbyname /* 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 (); +char gethostbyname (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) +choke me +#else +char (*f) () = gethostbyname; +#endif +#ifdef __cplusplus +} +#endif + int main () { -setlocale (); +return f != gethostbyname; ; return 0; } @@ -3665,25 +3610,22 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_xpg4_setlocale=yes + ac_cv_func_gethostbyname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_xpg4_setlocale=no +ac_cv_func_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_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 "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 +if test $ac_cv_func_gethostbyname = yes; then + : +else + 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 @@ -3750,7 +3692,101 @@ LIBS="$LIBS -lnsl" fi -echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 +fi + +echo "$as_me:$LINENO: checking for socket" >&5 +echo $ECHO_N "checking for socket... $ECHO_C" >&6 +if test "${ac_cv_func_socket+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define socket to an innocuous variant, in case declares socket. + For example, HP-UX 11i declares gettimeofday. */ +#define socket innocuous_socket + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char socket (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef socket + +/* 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 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_socket) || defined (__stub___socket) +choke me +#else +char (*f) () = socket; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != 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_func_socket=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_socket=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5 +echo "${ECHO_T}$ac_cv_func_socket" >&6 +if test $ac_cv_func_socket = yes; then + : +else + 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 @@ -3817,38 +3853,34 @@ LIBS="$LIBS -lsocket" fi +fi -MALLOC_TYPE=S -support_addstrings=no -support_frills=no -support_inheritpixmap=no -support_tinting=no -support_fading=no -support_keepscrolling=no -support_selectionscrolling=no -support_menubar=no -support_mousewheel=no -support_mouseslipwheel=no -support_utmp=no -support_wtmp=no -support_lastlog=no -support_cursor_blink=no -support_text_blink=no -support_pointer_blank=no -support_scroll_rxvt=no -support_scroll_next=no -support_scroll_xterm=no -support_scroll_plain=no -support_xim=no -support_xpm=no -support_xft=no + +support_frills=yes +support_inheritpixmap=yes +support_tinting=yes +support_fading=yes +support_keepscrolling=yes +support_selectionscrolling=yes +support_mousewheel=yes +support_mouseslipwheel=yes +support_text_blink=yes +support_pointer_blank=yes +support_scroll_rxvt=yes +support_scroll_next=yes +support_scroll_xterm=yes +support_scroll_plain=yes +support_xim=yes +support_xpm=yes +support_xft=yes support_unicode3=no -support_combining=no +support_combining=yes support_8bitctrls=no -support_iso14755=no -support_styles=no -codesets= +support_iso14755=yes +support_styles=yes +support_perl=yes +codesets=all if test "x$enable_shared" = xyes; then @@ -3864,37 +3896,66 @@ # Check whether --enable-everything or --disable-everything was given. if test "${enable_everything+set}" = set; then enableval="$enable_everything" - if test x$enableval = xyes; then - support_24bit=yes - support_frills=yes - support_inheritpixmap=yes - support_tinting=yes - support_fading=yes - support_keepscrolling=yes - support_selectionscrolling=yes - support_lastlog=yes - support_menubar=yes - support_mousewheel=yes - support_mouseslipwheel=yes - support_cursor_blink=yes - support_text_blink=yes - support_pointer_blank=yes - support_scroll_rxvt=yes - support_scroll_next=yes - support_scroll_xterm=yes - support_scroll_plain=yes - support_utmp=yes - support_wtmp=yes - support_xim=yes - support_xpm=yes - support_xft=yes - support_unicode3=yes - support_combining=yes - #support_8bitctrls=yes - support_iso14755=yes - support_styles=yes - codesets=all - fi + + if test x$enableval = xno; then + support_frills=no + support_inheritpixmap=no + support_tinting=no + support_fading=no + support_keepscrolling=no + support_selectionscrolling=no + support_lastlog=no + support_mousewheel=no + support_mouseslipwheel=no + support_text_blink=no + support_pointer_blank=no + support_scroll_rxvt=no + support_scroll_next=no + support_scroll_xterm=no + support_scroll_plain=no + support_utmp=no + support_wtmp=no + support_xim=no + support_xpm=no + support_xft=no + support_unicode3=no + support_combining=no + support_8bitctrls=no + support_iso14755=no + support_styles=no + support_perl=no + codesets= + fi + if test x$enableval = xyes; then + support_frills=yes + support_inheritpixmap=yes + support_tinting=yes + support_fading=yes + support_keepscrolling=yes + support_selectionscrolling=yes + support_lastlog=yes + support_mousewheel=yes + support_mouseslipwheel=yes + support_text_blink=yes + support_pointer_blank=yes + support_scroll_rxvt=yes + support_scroll_next=yes + support_scroll_xterm=yes + support_scroll_plain=yes + support_utmp=yes + support_wtmp=yes + support_xim=yes + support_xpm=yes + support_xft=yes + support_unicode3=yes + support_combining=yes + #support_8bitctrls=yes + support_iso14755=yes + support_styles=yes + support_perl=yes + codesets=all + fi + fi; # Check whether --enable-unicode3 or --disable-unicode3 was given. @@ -3929,30 +3990,6 @@ fi fi; -# Check whether --enable-utmp or --disable-utmp was given. -if test "${enable_utmp+set}" = set; then - enableval="$enable_utmp" - if test x$enableval = xyes -o x$enableval = xno; then - support_utmp=$enableval - fi -fi; - -# Check whether --enable-wtmp or --disable-wtmp was given. -if test "${enable_wtmp+set}" = set; then - enableval="$enable_wtmp" - if test x$enableval = xyes -o x$enableval = xno; then - support_wtmp=$enableval - fi -fi; - -# Check whether --enable-lastlog or --disable-lastlog was given. -if test "${enable_lastlog+set}" = set; then - enableval="$enable_lastlog" - if test x$enableval = xyes -o x$enableval = xno; then - support_lastlog=$enableval - fi -fi; - # Check whether --enable-xpm-background or --disable-xpm-background was given. if test "${enable_xpm_background+set}" = set; then enableval="$enable_xpm_background" @@ -3985,14 +4022,6 @@ fi fi; -# Check whether --enable-menubar or --disable-menubar was given. -if test "${enable_menubar+set}" = set; then - enableval="$enable_menubar" - if test x$enableval = xyes -o x$enableval = xno; then - support_menubar=$enableval - fi -fi; - # Check whether --enable-rxvt-scroll or --disable-rxvt-scroll was given. if test "${enable_rxvt_scroll+set}" = set; then enableval="$enable_rxvt_scroll" @@ -4017,6 +4046,14 @@ fi fi; +# Check whether --enable-perl or --disable-perl was given. +if test "${enable_perl+set}" = set; then + enableval="$enable_perl" + if test x$enableval = xyes -o x$enableval = xno; then + support_perl=$enableval + fi +fi; + # Check whether --enable-plain-scroll or --disable-plain-scroll was given. if test "${enable_plain_scroll+set}" = set; then enableval="$enable_plain_scroll" @@ -4025,18 +4062,6 @@ fi fi; -# Check whether --enable-half-shadow or --disable-half-shadow was given. -if test "${enable_half_shadow+set}" = set; then - enableval="$enable_half_shadow" - if test x$enableval = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define HALFSHADOW 1 -_ACEOF - - fi -fi; - # Check whether --with-codesets or --without-codesets was given. if test "${with_codesets+set}" = set; then @@ -4052,18 +4077,6 @@ fi fi; -# Check whether --enable-ttygid or --disable-ttygid was given. -if test "${enable_ttygid+set}" = set; then - enableval="$enable_ttygid" - if test x$enableval = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define TTY_GID_SUPPORT 1 -_ACEOF - - fi -fi; - # Check whether --enable-backspace-key or --disable-backspace-key was given. if test "${enable_backspace_key+set}" = set; then enableval="$enable_backspace_key" @@ -4100,18 +4113,6 @@ fi fi; -# Check whether --enable-xgetdefault or --disable-xgetdefault was given. -if test "${enable_xgetdefault+set}" = set; then - enableval="$enable_xgetdefault" - if test x$enableval = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define USE_XGETDEFAULT 1 -_ACEOF - - fi -fi; - # Check whether --enable-8bitctrls or --disable-8bitctrls was given. if test "${enable_8bitctrls+set}" = set; then enableval="$enable_8bitctrls" @@ -4181,14 +4182,6 @@ 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" - if test x$enableval = xyes -o x$enableval = xno; then - support_addstrings=$enableval - fi -fi; - # Check whether --enable-swapscreen or --disable-swapscreen was given. if test "${enable_swapscreen+set}" = set; then enableval="$enable_swapscreen" @@ -4217,14 +4210,6 @@ fi fi; -# Check whether --enable-24bit or --disable-24bit was given. -if test "${enable_24bit+set}" = set; then - enableval="$enable_24bit" - if test x$enableval = xyes -o x$enableval = xno; then - support_24bit=$enableval - fi -fi; - # Check whether --enable-keepscrolling or --disable-keepscrolling was given. if test "${enable_keepscrolling+set}" = set; then enableval="$enable_keepscrolling" @@ -4257,28 +4242,6 @@ fi fi; -# Check whether --enable-dmalloc or --disable-dmalloc was given. -if test "${enable_dmalloc+set}" = set; then - enableval="$enable_dmalloc" - if test x$enableval = xyes; then - MALLOC_TYPE=G - DEBUG=-DDEBUG_MALLOC - DLIB="-L/usr/local/lib -ldmalloc" - DINCLUDE=-I/usr/local/include - fi -fi; - -# Check whether --enable-dlmalloc or --disable-dlmalloc was given. -if test "${enable_dlmalloc+set}" = set; then - enableval="$enable_dlmalloc" - if test x$enableval = xyes; then - MALLOC_TYPE=D - DEBUG= - DLIB="-L/usr/local/lib -ldlmalloc" - DINCLUDE= - fi -fi; - # Check whether --enable-smart-resize or --disable-smart-resize was given. if test "${enable_smart_resize+set}" = set; then enableval="$enable_smart_resize" @@ -4291,14 +4254,6 @@ fi fi; -# Check whether --enable-cursor-blink or --disable-cursor-blink was given. -if test "${enable_cursor_blink+set}" = set; then - enableval="$enable_cursor_blink" - if test x$enableval = xyes -o x$enableval = xno; then - support_cursor_blink=$enableval - fi -fi; - # Check whether --enable-text-blink or --disable-text-blink was given. if test "${enable_text_blink+set}" = set; then enableval="$enable_text_blink" @@ -4342,12 +4297,6 @@ fi; - -cat >>confdefs.h <<\_ACEOF -#define PROTOTYPES 1 -_ACEOF - - # Extract the first word of "mv", so it can be a program name with args. set dummy mv; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -4388,46 +4337,6 @@ echo "${ECHO_T}no" >&6 fi -# Extract the first word of "rm", so it can be a program name with args. -set dummy rm; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_RM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $RM in - [\\/]* | ?:[\\/]*) - ac_cv_path_RM="$RM" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_RM" && ac_cv_path_RM="rm" - ;; -esac -fi -RM=$ac_cv_path_RM - -if test -n "$RM"; then - echo "$as_me:$LINENO: result: $RM" >&5 -echo "${ECHO_T}$RM" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - # Extract the first word of "cp", so it can be a program name with args. set dummy cp; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -4628,16 +4537,16 @@ echo "${ECHO_T}no" >&6 fi -# Extract the first word of "tbl", so it can be a program name with args. -set dummy tbl; ac_word=$2 +# Extract the first word of "tic", so it can be a program name with args. +set dummy tic; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_TBL+set}" = set; then +if test "${ac_cv_path_TIC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $TBL in + case $TIC in [\\/]* | ?:[\\/]*) - ac_cv_path_TBL="$TBL" # Let the user override the test with a path. + ac_cv_path_TIC="$TIC" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4647,7 +4556,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_TBL="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_TIC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4657,56 +4566,248 @@ ;; esac fi -TBL=$ac_cv_path_TBL +TIC=$ac_cv_path_TIC -if test -n "$TBL"; then - echo "$as_me:$LINENO: result: $TBL" >&5 -echo "${ECHO_T}$TBL" >&6 +if test -n "$TIC"; then + echo "$as_me:$LINENO: result: $TIC" >&5 +echo "${ECHO_T}$TIC" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -# Extract the first word of "tic", so it can be a program name with args. -set dummy tic; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_TIC+set}" = set; then + + + +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $TIC in - [\\/]* | ?:[\\/]*) - ac_cv_path_TIC="$TIC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_TIC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext + done -done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP - ;; -esac fi -TIC=$ac_cv_path_TIC + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6 +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -if test -n "$TIC"; then - echo "$as_me:$LINENO: result: $TIC" >&5 -echo "${ECHO_T}$TIC" >&6 + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break fi +rm -f conftest.err conftest.$ac_ext +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -4815,7 +4916,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -4842,7 +4943,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -4856,18 +4957,18 @@ # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -4905,7 +5006,7 @@ do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then + if test -r $ac_dir/libX11.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi @@ -6770,19 +6871,9 @@ - - - - - - - for ac_header in \ assert.h \ fcntl.h \ - grp.h \ - libc.h \ - lastlog.h \ stdarg.h \ stdlib.h \ string.h \ @@ -6793,15 +6884,11 @@ sys/select.h \ sys/sockio.h \ sys/strredir.h \ - sys/stropts.h \ sys/time.h \ - utmp.h \ - utmpx.h \ - stdint.h \ - pty.h \ - wchar.h \ - cwchar \ - clocale \ + stdint.h \ + wchar.h \ + cwchar \ + clocale \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -7247,6 +7334,72 @@ LIBS=$ac_save_LIBS CFLAGS=$ac_save_CFLAGS +echo "$as_me:$LINENO: checking for XLIB_ILLEGAL_ACCESS" >&5 +echo $ECHO_N "checking for XLIB_ILLEGAL_ACCESS... $ECHO_C" >&6 +if test "${rxvt_xlib_illegal_access+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define XLIB_ILLEGAL_ACCESS +#include + +int +main () +{ + + Display *dpy; + dpy->xdefaults = (char *)0; + + ; + return 0; +} +_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_xlib_illegal_access=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +rxvt_xlib_illegal_access=no + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $rxvt_xlib_illegal_access" >&5 +echo "${ECHO_T}$rxvt_xlib_illegal_access" >&6 +if test x$rxvt_xlib_illegal_access = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define XLIB_ILLEGAL_ACCESS 1 +_ACEOF + +fi echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 @@ -9638,50 +9791,172 @@ -case "$host_alias" in - *ultrix) ac_cv_func_setsid='no' ;; - *) break;; -esac +for ac_func in \ + unsetenv \ + setutent \ + on_exit \ +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func +/* 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 $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif +int +main () +{ +return f != $ac_func; + ; + 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 + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done +support_utmp=yes +support_wtmp=yes +support_lastlog=yes + +# Check whether --enable-utmp or --disable-utmp was given. +if test "${enable_utmp+set}" = set; then + enableval="$enable_utmp" + if test x$enableval = xyes -o x$enableval = xno; then + support_utmp=$enableval + fi +fi; +# Check whether --enable-wtmp or --disable-wtmp was given. +if test "${enable_wtmp+set}" = set; then + enableval="$enable_wtmp" + if test x$enableval = xyes -o x$enableval = xno; then + support_wtmp=$enableval + fi +fi; +# Check whether --enable-lastlog or --disable-lastlog was given. +if test "${enable_lastlog+set}" = set; then + enableval="$enable_lastlog" + if test x$enableval = xyes -o x$enableval = xno; then + support_lastlog=$enableval + fi +fi; +if test x$support_utmp = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define UTMP_SUPPORT 1 +_ACEOF + +fi +if test x$support_wtmp = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define WTMP_SUPPORT 1 +_ACEOF + +fi +if test x$support_lastlog = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define LASTLOG_SUPPORT 1 +_ACEOF + +fi for ac_func in \ - atexit \ - revoke \ - unsetenv \ - setutent \ - seteuid \ - setreuid \ - setsid \ - setpgrp \ - setpgid \ - openpty \ - _getpty \ - grantpt \ - unlockpt \ - isastream \ - on_exit \ - nanosleep \ + ttyslot \ updwtmp \ updwtmpx \ - ttyslot \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -9784,6 +10059,162 @@ + + +for ac_header in \ + utmp.h \ + utmpx.h \ + lastlog.h \ + +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_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 + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + if test "${ac_cv_header_utmp_h+set}" = set; then echo "$as_me:$LINENO: checking for utmp.h" >&5 echo $ECHO_N "checking for utmp.h... $ECHO_C" >&6 @@ -9923,7 +10354,7 @@ if test $ac_cv_header_utmp_h = yes; then echo "$as_me:$LINENO: checking for struct utmp" >&5 echo $ECHO_N "checking for struct utmp... $ECHO_C" >&6 -if test "${rxvt_cv_struct_utmp+set}" = set; then +if test "${struct_utmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -9933,7 +10364,6 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include #include int main () @@ -9964,18 +10394,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_utmp=yes + struct_utmp=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_utmp=no +struct_utmp=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmp" >&5 -echo "${ECHO_T}$rxvt_cv_struct_utmp" >&6 -if test x$rxvt_cv_struct_utmp = xyes; then +echo "$as_me:$LINENO: result: $struct_utmp" >&5 +echo "${ECHO_T}$struct_utmp" >&6 +if test x$struct_utmp = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_STRUCT_UTMP 1 @@ -9986,7 +10416,7 @@ echo "$as_me:$LINENO: checking for ut_host in utmp struct" >&5 echo $ECHO_N "checking for ut_host in utmp struct... $ECHO_C" >&6 -if test "${rxvt_cv_struct_utmp_host+set}" = set; then +if test "${struct_utmp_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10026,18 +10456,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_utmp_host=yes + struct_utmp_host=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_utmp_host=no +struct_utmp_host=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmp_host" >&5 -echo "${ECHO_T}$rxvt_cv_struct_utmp_host" >&6 -if test x$rxvt_cv_struct_utmp_host = xyes; then +echo "$as_me:$LINENO: result: $struct_utmp_host" >&5 +echo "${ECHO_T}$struct_utmp_host" >&6 +if test x$struct_utmp_host = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_UTMP_HOST 1 @@ -10047,7 +10477,7 @@ echo "$as_me:$LINENO: checking for ut_pid in utmp struct" >&5 echo $ECHO_N "checking for ut_pid in utmp struct... $ECHO_C" >&6 -if test "${rxvt_cv_struct_utmp_pid+set}" = set; then +if test "${struct_utmp_pid+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10087,18 +10517,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_utmp_pid=yes + struct_utmp_pid=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_utmp_pid=no +struct_utmp_pid=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmp_pid" >&5 -echo "${ECHO_T}$rxvt_cv_struct_utmp_pid" >&6 -if test x$rxvt_cv_struct_utmp_pid = xyes; then +echo "$as_me:$LINENO: result: $struct_utmp_pid" >&5 +echo "${ECHO_T}$struct_utmp_pid" >&6 +if test x$struct_utmp_pid = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_UTMP_PID 1 @@ -10249,7 +10679,7 @@ if test $ac_cv_header_utmpx_h = yes; then echo "$as_me:$LINENO: checking for struct utmpx" >&5 echo $ECHO_N "checking for struct utmpx... $ECHO_C" >&6 -if test "${rxvt_cv_struct_utmpx+set}" = set; then +if test "${struct_utmpx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10289,18 +10719,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_utmpx=yes + struct_utmpx=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_utmpx=no +struct_utmpx=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmpx" >&5 -echo "${ECHO_T}$rxvt_cv_struct_utmpx" >&6 -if test x$rxvt_cv_struct_utmpx = xyes; then +echo "$as_me:$LINENO: result: $struct_utmpx" >&5 +echo "${ECHO_T}$struct_utmpx" >&6 +if test x$struct_utmpx = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_STRUCT_UTMPX 1 @@ -10311,7 +10741,7 @@ echo "$as_me:$LINENO: checking for host in utmpx struct" >&5 echo $ECHO_N "checking for host in utmpx struct... $ECHO_C" >&6 -if test "${rxvt_cv_struct_utmpx_host+set}" = set; then +if test "${struct_utmpx_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10351,18 +10781,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_utmpx_host=yes + struct_utmpx_host=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_utmpx_host=no +struct_utmpx_host=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmpx_host" >&5 -echo "${ECHO_T}$rxvt_cv_struct_utmpx_host" >&6 -if test x$rxvt_cv_struct_utmpx_host = xyes; then +echo "$as_me:$LINENO: result: $struct_utmpx_host" >&5 +echo "${ECHO_T}$struct_utmpx_host" >&6 +if test x$struct_utmpx_host = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_UTMPX_HOST 1 @@ -10372,7 +10802,7 @@ echo "$as_me:$LINENO: checking for session in utmpx struct" >&5 echo $ECHO_N "checking for session in utmpx struct... $ECHO_C" >&6 -if test "${rxvt_cv_struct_utmpx_session+set}" = set; then +if test "${struct_utmpx_session+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10412,18 +10842,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_utmpx_session=yes + struct_utmpx_session=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_utmpx_session=no +struct_utmpx_session=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmpx_session" >&5 -echo "${ECHO_T}$rxvt_cv_struct_utmpx_session" >&6 -if test x$rxvt_cv_struct_utmpx_session = xyes; then +echo "$as_me:$LINENO: result: $struct_utmpx_session" >&5 +echo "${ECHO_T}$struct_utmpx_session" >&6 +if test x$struct_utmpx_session = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_UTMPX_SESSION 1 @@ -10436,7 +10866,7 @@ echo "$as_me:$LINENO: checking for struct lastlog" >&5 echo $ECHO_N "checking for struct lastlog... $ECHO_C" >&6 -if test "${rxvt_cv_struct_lastlog+set}" = set; then +if test "${struct_lastlog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10480,18 +10910,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_lastlog=yes + struct_lastlog=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_lastlog=no +struct_lastlog=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_lastlog" >&5 -echo "${ECHO_T}$rxvt_cv_struct_lastlog" >&6 -if test x$rxvt_cv_struct_lastlog = xyes; then +echo "$as_me:$LINENO: result: $struct_lastlog" >&5 +echo "${ECHO_T}$struct_lastlog" >&6 +if test x$struct_lastlog = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_STRUCT_LASTLOG 1 @@ -10501,7 +10931,7 @@ echo "$as_me:$LINENO: checking for struct lastlogx" >&5 echo $ECHO_N "checking for struct lastlogx... $ECHO_C" >&6 -if test "${rxvt_cv_struct_lastlogx+set}" = set; then +if test "${struct_lastlogx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10545,18 +10975,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_lastlogx=yes + struct_lastlogx=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_lastlogx=no +struct_lastlogx=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_lastlogx" >&5 -echo "${ECHO_T}$rxvt_cv_struct_lastlogx" >&6 -if test x$rxvt_cv_struct_lastlogx = xyes; then +echo "$as_me:$LINENO: result: $struct_lastlogx" >&5 +echo "${ECHO_T}$struct_lastlogx" >&6 +if test x$struct_lastlogx = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_STRUCT_LASTLOGX 1 @@ -10567,12 +10997,12 @@ echo "$as_me:$LINENO: checking where utmp is located" >&5 echo $ECHO_N "checking where utmp is located... $ECHO_C" >&6 -if test "${rxvt_cv_path_utmp+set}" = set; then +if test "${path_utmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: WARNING: Define RXVT_UTMP_FILE in config.h manually" >&5 -echo "$as_me: WARNING: Define RXVT_UTMP_FILE in config.h manually" >&2;} + { echo "$as_me:$LINENO: WARNING: Define UTMP_FILE in config.h manually" >&5 +echo "$as_me: WARNING: Define UTMP_FILE in config.h manually" >&2;} else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10618,24 +11048,24 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_path_utmp=`cat conftestval` + path_utmp=`cat conftestval` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -rxvt_cv_path_utmp= +path_utmp= fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $rxvt_cv_path_utmp" >&5 -echo "${ECHO_T}$rxvt_cv_path_utmp" >&6 -if test x$rxvt_cv_path_utmp != x; then +echo "$as_me:$LINENO: result: $path_utmp" >&5 +echo "${ECHO_T}$path_utmp" >&6 +if test x$path_utmp != x; then cat >>confdefs.h <<_ACEOF -#define RXVT_UTMP_FILE "$rxvt_cv_path_utmp" +#define UTMP_FILE "$path_utmp" _ACEOF fi @@ -10643,12 +11073,12 @@ echo "$as_me:$LINENO: checking where utmpx is located" >&5 echo $ECHO_N "checking where utmpx is located... $ECHO_C" >&6 -if test "${rxvt_cv_path_utmpx+set}" = set; then +if test "${path_utmpx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: WARNING: Define RXVT_UTMPX_FILE in config.h manually" >&5 -echo "$as_me: WARNING: Define RXVT_UTMPX_FILE in config.h manually" >&2;} + { echo "$as_me:$LINENO: WARNING: Define UTMPX_FILE in config.h manually" >&5 +echo "$as_me: WARNING: Define UTMPX_FILE in config.h manually" >&2;} else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10704,24 +11134,24 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_path_utmpx=`cat conftestval` + path_utmpx=`cat conftestval` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -rxvt_cv_path_utmpx= +path_utmpx= fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $rxvt_cv_path_utmpx" >&5 -echo "${ECHO_T}$rxvt_cv_path_utmpx" >&6 -if test x$rxvt_cv_path_utmpx != x; then +echo "$as_me:$LINENO: result: $path_utmpx" >&5 +echo "${ECHO_T}$path_utmpx" >&6 +if test x$path_utmpx != x; then cat >>confdefs.h <<_ACEOF -#define RXVT_UTMPX_FILE "$rxvt_cv_path_utmpx" +#define UTMPX_FILE "$path_utmpx" _ACEOF fi @@ -10729,12 +11159,12 @@ echo "$as_me:$LINENO: checking where wtmp is located" >&5 echo $ECHO_N "checking where wtmp is located... $ECHO_C" >&6 -if test "${rxvt_cv_path_wtmp+set}" = set; then +if test "${path_wtmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: WARNING: Define RXVT_WTMP_FILE in config.h manually" >&5 -echo "$as_me: WARNING: Define RXVT_WTMP_FILE in config.h manually" >&2;} + { echo "$as_me:$LINENO: WARNING: Define WTMP_FILE in config.h manually" >&5 +echo "$as_me: WARNING: Define WTMP_FILE in config.h manually" >&2;} else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10782,36 +11212,36 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_path_wtmp=`cat conftestval` + path_wtmp=`cat conftestval` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -rxvt_cv_path_wtmp= +path_wtmp= fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $rxvt_cv_path_wtmp" >&5 -echo "${ECHO_T}$rxvt_cv_path_wtmp" >&6 -if test x$rxvt_cv_path_wtmp != x; then +echo "$as_me:$LINENO: result: $path_wtmp" >&5 +echo "${ECHO_T}$path_wtmp" >&6 +if test x$path_wtmp != x; then cat >>confdefs.h <<_ACEOF -#define RXVT_WTMP_FILE "$rxvt_cv_path_wtmp" +#define WTMP_FILE "$path_wtmp" _ACEOF fi echo "$as_me:$LINENO: checking where wtmpx is located" >&5 echo $ECHO_N "checking where wtmpx is located... $ECHO_C" >&6 -if test "${rxvt_cv_path_wtmpx+set}" = set; then +if test "${path_wtmpx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: WARNING: Define RXVT_WTMPX_FILE in config.h manually" >&5 -echo "$as_me: WARNING: Define RXVT_WTMPX_FILE in config.h manually" >&2;} + { echo "$as_me:$LINENO: WARNING: Define WTMPX_FILE in config.h manually" >&5 +echo "$as_me: WARNING: Define WTMPX_FILE in config.h manually" >&2;} else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10858,36 +11288,36 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_path_wtmpx=`cat conftestval` + path_wtmpx=`cat conftestval` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -rxvt_cv_path_wtmpx= +path_wtmpx= fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $rxvt_cv_path_wtmpx" >&5 -echo "${ECHO_T}$rxvt_cv_path_wtmpx" >&6 -if test x$rxvt_cv_path_wtmpx != x; then +echo "$as_me:$LINENO: result: $path_wtmpx" >&5 +echo "${ECHO_T}$path_wtmpx" >&6 +if test x$path_wtmpx != x; then cat >>confdefs.h <<_ACEOF -#define RXVT_WTMPX_FILE "$rxvt_cv_path_wtmpx" +#define WTMPX_FILE "$path_wtmpx" _ACEOF fi echo "$as_me:$LINENO: checking where lastlog is located" >&5 echo $ECHO_N "checking where lastlog is located... $ECHO_C" >&6 -if test "${rxvt_cv_path_lastlog+set}" = set; then +if test "${path_lastlog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: WARNING: Define RXVT_LASTLOG_FILE in config.h manually" >&5 -echo "$as_me: WARNING: Define RXVT_LASTLOG_FILE in config.h manually" >&2;} + { echo "$as_me:$LINENO: WARNING: Define LASTLOG_FILE in config.h manually" >&5 +echo "$as_me: WARNING: Define LASTLOG_FILE in config.h manually" >&2;} else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10939,27 +11369,27 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_path_lastlog=`cat conftestval` + path_lastlog=`cat conftestval` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -rxvt_cv_path_lastlog= +path_lastlog= fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $rxvt_cv_path_lastlog" >&5 -echo "${ECHO_T}$rxvt_cv_path_lastlog" >&6 -if test x$rxvt_cv_path_lastlog != x; then +echo "$as_me:$LINENO: result: $path_lastlog" >&5 +echo "${ECHO_T}$path_lastlog" >&6 +if test x$path_lastlog != x; then cat >>confdefs.h <<_ACEOF -#define RXVT_LASTLOG_FILE "$rxvt_cv_path_lastlog" +#define LASTLOG_FILE "$path_lastlog" _ACEOF - if test -d "$rxvt_cv_path_lastlog"; then + if test -d "$path_lastlog"; then cat >>confdefs.h <<\_ACEOF #define LASTLOG_IS_DIR 1 @@ -10970,12 +11400,12 @@ echo "$as_me:$LINENO: checking where lastlogx is located" >&5 echo $ECHO_N "checking where lastlogx is located... $ECHO_C" >&6 -if test "${rxvt_cv_path_lastlogx+set}" = set; then +if test "${path_lastlogx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: WARNING: Define RXVT_LASTLOGX_FILE in config.h manually" >&5 -echo "$as_me: WARNING: Define RXVT_LASTLOGX_FILE in config.h manually" >&2;} + { echo "$as_me:$LINENO: WARNING: Define LASTLOGX_FILE in config.h manually" >&5 +echo "$as_me: WARNING: Define LASTLOGX_FILE in config.h manually" >&2;} else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11021,28 +11451,42 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_path_lastlogx=`cat conftestval` + path_lastlogx=`cat conftestval` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -rxvt_cv_path_lastlogx= +path_lastlogx= fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $rxvt_cv_path_lastlogx" >&5 -echo "${ECHO_T}$rxvt_cv_path_lastlogx" >&6 -if test x$rxvt_cv_path_lastlogx != x; then +echo "$as_me:$LINENO: result: $path_lastlogx" >&5 +echo "${ECHO_T}$path_lastlogx" >&6 +if test x$path_lastlogx != x; then cat >>confdefs.h <<_ACEOF -#define RXVT_LASTLOGX_FILE "$rxvt_cv_path_lastlogx" +#define LASTLOGX_FILE "$path_lastlogx" _ACEOF fi +if test x$support_utmp != xyes; then + echo " utmp support: disabled" + echo +else + echo " utmp support: enabled + utmp file: $path_utmp + utmpx file: $path_utmpx + wtmp file: $path_wtmp + wtmpx file: $path_wtmpx + lastlog file: $path_lastlog + lastlogx file: $path_lastlogx" +fi + + echo "$as_me:$LINENO: checking where ttys/ttytab is located" >&5 echo $ECHO_N "checking where ttys/ttytab is located... $ECHO_C" >&6 @@ -11318,6 +11762,102 @@ fi + +echo "$as_me:$LINENO: checking for unix-compliant filehandle passing ability" >&5 +echo $ECHO_N "checking for unix-compliant filehandle passing ability... $ECHO_C" >&6 +if test "${can_pass_fds+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include // broken bsds (is that redundant?) need this +#include +#include +#include + +int +main () +{ + +{ + msghdr msg; + iovec iov; + char buf [100]; + char data = 0; + + iov.iov_base = &data; + iov.iov_len = 1; + + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_control = buf; + msg.msg_controllen = sizeof buf; + + cmsghdr *cmsg = CMSG_FIRSTHDR (&msg); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + cmsg->cmsg_len = 100; + + *(int *)CMSG_DATA (cmsg) = 5; + + return sendmsg (3, &msg, 0); +} + + ; + 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 + can_pass_fds=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +can_pass_fds=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $can_pass_fds" >&5 +echo "${ECHO_T}$can_pass_fds" >&6 +if test x$can_pass_fds = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_UNIX_FDPASS 1 +_ACEOF + +else + { { echo "$as_me:$LINENO: error: libptytty requires unix-compliant filehandle passing ability" >&5 +echo "$as_me: error: libptytty requires unix-compliant filehandle passing ability" >&2;} + { (exit 1); exit 1; }; } +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 @@ -11376,9 +11916,192 @@ 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 + + + + + + +for ac_header in \ + pty.h \ + util.h \ + libutil.h \ + sys/ioctl.h \ + sys/stropts.h \ + +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_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 + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + + + + + + + + +for ac_func in \ + revoke \ + _getpty \ + getpt \ + posix_openpt \ + isastream \ + setuid \ + seteuid \ + setreuid \ + setresuid \ + +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -11387,14 +12110,47 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#define _GNU_SOURCE -#ifdef HAVE_STDLIB_H -# include +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* 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 $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + int main () { -(void)getpt(); +return f != $ac_func; ; return 0; } @@ -11420,154 +12176,498 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_func_getpt=yes + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_func_getpt=no +eval "$as_ac_var=no" fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_func_getpt" >&5 -echo "${ECHO_T}$rxvt_cv_func_getpt" >&6 -if test x$rxvt_cv_func_getpt = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETPT 1 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi +done -echo "$as_me:$LINENO: checking for pty/tty type" >&5 -echo $ECHO_N "checking for pty/tty type... $ECHO_C" >&6 -if test "${rxvt_cv_ptys+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test x$ac_cv_func_openpty = xyes; then - rxvt_cv_ptys=OPENPTY - else if test x$ac_cv_func__getpty = xyes; then - rxvt_cv_ptys=SGI4 - else if test -c /dev/ttyp20; then - rxvt_cv_ptys=SCO - else if test -c /dev/ptym/clone; then - rxvt_cv_ptys=HPUX - else if test x$rxvt_cv_func_getpt = xyes; then - rxvt_cv_ptys=GLIBC - else if test -c /dev/ptc -a -c /dev/pts; then - rxvt_cv_ptys=PTC - else if test -c /dev/ptc -a -d /dev/pts; then - rxvt_cv_ptys=PTC - else if test -c /dev/ptmx -a -c /dev/pts/0; then - rxvt_cv_ptys=STREAMS - else if test x$ac_cv_func_grantpt = xyes && test x$ac_cv_func_unlockpt = xyes; then - rxvt_cv_ptys=STREAMS - else - rxvt_cv_ptys=BSD -fi -fi -fi -fi -fi -fi -fi -fi -fi -fi -echo "$as_me:$LINENO: result: $rxvt_cv_ptys" >&5 -echo "${ECHO_T}$rxvt_cv_ptys" >&6 +have_clone=no -if test x$rxvt_cv_ptys = xOPENPTY; then +echo "$as_me:$LINENO: checking for /dev/ptym/clone" >&5 +echo $ECHO_N "checking for /dev/ptym/clone... $ECHO_C" >&6 +if test -e /dev/ptym/clone; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\_ACEOF -#define PTYS_ARE_OPENPTY 1 +#define HAVE_DEV_CLONE 1 _ACEOF -fi -if test x$rxvt_cv_ptys = xSCO; then cat >>confdefs.h <<\_ACEOF -#define PTYS_ARE_NUMERIC 1 +#define CLONE_DEVICE "/dev/ptym/clone" _ACEOF + have_clone=yes +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -if test x$rxvt_cv_ptys = xSTREAMS; then + +echo "$as_me:$LINENO: checking for /dev/ptc" >&5 +echo $ECHO_N "checking for /dev/ptc... $ECHO_C" >&6 +if test -e /dev/ptc; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\_ACEOF -#define PTYS_ARE_PTMX 1 +#define HAVE_DEV_PTC 1 _ACEOF -fi -if test x$rxvt_cv_ptys = xPTC; then cat >>confdefs.h <<\_ACEOF -#define PTYS_ARE_PTC 1 +#define CLONE_DEVICE "/dev/ptc" _ACEOF + have_clone=yes +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -if test x$rxvt_cv_ptys = xSGI4; then + +case $host in + *-*-cygwin*) + have_clone=yes cat >>confdefs.h <<\_ACEOF -#define PTYS_ARE__GETPTY 1 +#define CLONE_DEVICE "/dev/ptmx" _ACEOF -fi -if test x$rxvt_cv_ptys = xCONVEX; then + ;; + *) + echo "$as_me:$LINENO: checking for /dev/ptmx" >&5 +echo $ECHO_N "checking for /dev/ptmx... $ECHO_C" >&6 + if test -e /dev/ptmx; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\_ACEOF -#define PTYS_ARE_GETPTY 1 +#define HAVE_DEV_PTMX 1 _ACEOF -fi -if test x$rxvt_cv_ptys = xGLIBC; then cat >>confdefs.h <<\_ACEOF -#define PTYS_ARE_GETPT 1 +#define CLONE_DEVICE "/dev/ptmx" _ACEOF -fi -if test x$rxvt_cv_ptys = xHPUX; then + have_clone=yes + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + ;; +esac + +if test x$ac_cv_func_getpt = xyes -o x$ac_cv_func_posix_openpt = xyes -o x$have_clone = xyes; then + echo "$as_me:$LINENO: checking for UNIX98 ptys" >&5 +echo $ECHO_N "checking for UNIX98 ptys... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +grantpt(0);unlockpt(0);ptsname(0); + ; + 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 + unix98_pty=yes cat >>confdefs.h <<\_ACEOF -#define PTYS_ARE_CLONE 1 +#define UNIX98_PTY 1 _ACEOF + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -if test x$rxvt_cv_ptys = xBSD -o x$rxvt_cv_ptys = xHPUX -o x$rxvt_cv_ptys = xGLIBC; then -cat >>confdefs.h <<\_ACEOF -#define PTYS_ARE_SEARCHED 1 +if test -z "$unix98_pty"; then + +for ac_func in openpty +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* 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 $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + 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 + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +else + echo "$as_me:$LINENO: checking for openpty in -lutil" >&5 +echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 +if test "${ac_cv_lib_util_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lutil $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -{ echo "$as_me:$LINENO: checking for pty ranges..." >&5 -echo "$as_me: checking for pty ranges..." >&6;} -ptys=`echo /dev/pty??` -pch1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` -pch2=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` -if test x$pch1 != x; 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 openpty (); +int +main () +{ +openpty (); + ; + 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_util_openpty=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -cat >>confdefs.h <<_ACEOF -#define PTYCHAR1 "$pch1" +ac_cv_lib_util_openpty=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_util_openpty" >&5 +echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 +if test $ac_cv_lib_util_openpty = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_OPENPTY 1 _ACEOF + LIBS="$LIBS -lutil" +fi + +fi +done fi -if test x$pch2 != x; then -cat >>confdefs.h <<_ACEOF -#define PTYCHAR2 "$pch2" + + +echo "$as_me:$LINENO: checking for tty group" >&5 +echo $ECHO_N "checking for tty group... $ECHO_C" >&6 +if test "${tty_group+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + tty_group=no +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include +#include +#include + +main() +{ + struct stat st; + struct group *gr; + char *tty; + gr = getgrnam("tty"); + tty = ttyname(0); + if (gr != 0 + && tty != 0 + && (stat(tty, &st)) == 0 + && st.st_gid == gr->gr_gid) + return 0; + else + return 1; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./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 + tty_group=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +tty_group=no +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $tty_group" >&5 +echo "${ECHO_T}$tty_group" >&6 +if test x$tty_group = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define TTY_GID_SUPPORT 1 _ACEOF fi if test x$support_xft = xyes; then - LIBS="$LIBS `pkg-config xft --libs`" - CFLAGS="$CFLAGS `pkg-config xft --cflags`" - CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`" + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then + LIBS="$LIBS `$PKG_CONFIG xft --libs`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" + else + # Extract the first word of "xft-config", so it can be a program name with args. +set dummy xft-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_XFT_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $XFT_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_XFT_CONFIG="$XFT_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_XFT_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_XFT_CONFIG" && ac_cv_path_XFT_CONFIG="no" + ;; +esac +fi +XFT_CONFIG=$ac_cv_path_XFT_CONFIG + +if test -n "$XFT_CONFIG"; then + echo "$as_me:$LINENO: result: $XFT_CONFIG" >&5 +echo "${ECHO_T}$XFT_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test $XFT_CONFIG != no; then + LIBS="$LIBS `$XFT_CONFIG --libs`" + CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" + fi + fi for ac_header in X11/Xft/Xft.h @@ -11860,13 +12960,6 @@ _ACEOF fi -if test x$support_menubar = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define MENUBAR 1 -_ACEOF - -fi if test x$support_frills = xyes; then cat >>confdefs.h <<\_ACEOF @@ -11874,13 +12967,6 @@ _ACEOF fi -if test x$support_24bit = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define PREFER_24BIT 1 -_ACEOF - -fi if test x$support_mousewheel = xyes; then cat >>confdefs.h <<\_ACEOF @@ -11895,27 +12981,6 @@ _ACEOF fi -if test x$support_utmp = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define UTMP_SUPPORT 1 -_ACEOF - -fi -if test x$support_wtmp = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define WTMP_SUPPORT 1 -_ACEOF - -fi -if test x$support_lastlog = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define LASTLOG_SUPPORT 1 -_ACEOF - -fi if test x$support_xim = xyes -o x$multichar_set = xyes; then if test x$rxvt_cv_func_xlocale = xyes; then @@ -11971,13 +13036,6 @@ _ACEOF fi -if test x$support_cursor_blink = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define CURSOR_BLINK 1 -_ACEOF - -fi if test x$support_text_blink = xyes; then cat >>confdefs.h <<\_ACEOF @@ -12042,39 +13100,252 @@ esac done +IF_PERL=\# +if test x$support_perl = xyes; then + # Extract the first word of "perl5", so it can be a program name with args. +set dummy perl5; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PERL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PERL in + [\\/]* | ?:[\\/]*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done -CFLAGS=${CFLAGS--O} -LDFLAGS=${LDFLAGS--O} + ;; +esac +fi +PERL=$ac_cv_path_PERL -CPPFLAGS="$CPPFLAGS" +if test -n "$PERL"; then + echo "$as_me:$LINENO: result: $PERL" >&5 +echo "${ECHO_T}$PERL" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + # Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PERL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PERL in + [\\/]* | ?:[\\/]*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + ;; +esac +fi +PERL=$ac_cv_path_PERL +if test -n "$PERL"; then + echo "$as_me:$LINENO: result: $PERL" >&5 +echo "${ECHO_T}$PERL" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + echo "$as_me:$LINENO: checking for $PERL suitability" >&5 +echo $ECHO_N "checking for $PERL suitability... $ECHO_C" >&6 + if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then + save_CXXFLAGS="$CXXFLAGS" + save_LIBS="$LIBS" + CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" + LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" + 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$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then - DLIB=`echo $DLIB | sed "$R_TRANSLATE"` - LIBS=`echo $LIBS | sed "$R_TRANSLATE"` - X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` - X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` - XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` -fi +#include +#include +#include +int +main () +{ + PerlInterpreter *perl = perl_alloc (); + ; + 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 + rxvt_perl_link=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +rxvt_perl_link=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CXXFLAGS="$save_CXXFLAGS" + LIBS="$save_LIBS" -if test x$support_addstrings = xno; then + if test x$rxvt_perl_link = xyes; then + echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6 cat >>confdefs.h <<\_ACEOF -#define NO_STRINGS 1 +#define ENABLE_PERL 1 +_ACEOF + + IF_PERL= + PERL_O=rxvtperl.o + PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" + PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" + PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" + else + { { echo "$as_me:$LINENO: error: no, unable to link" >&5 +echo "$as_me: error: no, unable to link" >&2;} + { (exit 1); exit 1; }; } + fi + else + { { echo "$as_me:$LINENO: error: no working perl found, or perl not version >= 5.8" >&5 +echo "$as_me: error: no working perl found, or perl not version >= 5.8" >&2;} + { (exit 1); exit 1; }; } + fi +fi + + + + + + + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include +#include + +int +main () +{ + + PerlInterpreter *perl = perl_alloc (); + + ; + 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 + rxvt_perl_link=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +rxvt_perl_link=no fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test x$support_perl = xyes; then + support_frills=yes +fi + + + + + + + + +if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then + DLIB=`echo $DLIB | sed "$R_TRANSLATE"` + LIBS=`echo $LIBS | sed "$R_TRANSLATE"` + X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` + X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` + XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` +fi + + -MCOMMON=./autoconf/Make.common test "$program_prefix" != NONE && @@ -12160,7 +13431,7 @@ include_time_h="/* #include */" fi - ac_config_files="$ac_config_files autoconf/Make.common Makefile doc/Makefile src/Makefile src/rxvtlib.h" + ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile src/rxvtlib.h" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -12687,12 +13958,11 @@ do case "$ac_config_target" in # Handling of arguments. - "autoconf/Make.common" ) CONFIG_FILES="$CONFIG_FILES autoconf/Make.common" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/rxvtlib.h" ) CONFIG_FILES="$CONFIG_FILES src/rxvtlib.h" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:autoconf/config.h.in" ;; + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.h.in" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; @@ -12803,21 +14073,18 @@ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@AWK@,$AWK,;t t -s,@LINKER@,$LINKER,;t t -s,@CXXCPP@,$CXXCPP,;t t s,@EGREP@,$EGREP,;t t +s,@LINKER@,$LINKER,;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 s,@LN@,$LN,;t t s,@SED@,$SED,;t t s,@ECHO@,$ECHO,;t t s,@CMP@,$CMP,;t t -s,@TBL@,$TBL,;t t s,@TIC@,$TIC,;t t +s,@CXXCPP@,$CXXCPP,;t t s,@X_CFLAGS@,$X_CFLAGS,;t t s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t s,@X_LIBS@,$X_LIBS,;t t @@ -12831,6 +14098,14 @@ s,@rxvt_uint32_typedef@,$rxvt_uint32_typedef,;t t s,@rxvt_intp_define@,$rxvt_intp_define,;t t s,@rxvt_u_intp_define@,$rxvt_u_intp_define,;t t +s,@PKG_CONFIG@,$PKG_CONFIG,;t t +s,@XFT_CONFIG@,$XFT_CONFIG,;t t +s,@PERL@,$PERL,;t t +s,@PERLLIB@,$PERLLIB,;t t +s,@PERLFLAGS@,$PERLFLAGS,;t t +s,@PERLPRIVLIBEXP@,$PERLPRIVLIBEXP,;t t +s,@IF_PERL@,$IF_PERL,;t t +s,@PERL_O@,$PERL_O,;t t s,@DEBUG@,$DEBUG,;t t s,@DINCLUDE@,$DINCLUDE,;t t s,@DLIB@,$DLIB,;t t @@ -12849,8 +14124,6 @@ s,@include_time_h@,$include_time_h,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t -/@MCOMMON@/r $MCOMMON -s,@MCOMMON@,,;t t CEOF _ACEOF @@ -13353,37 +14626,10 @@ Compiler flags: $CFLAGS Linker: $LINKER" -if test "$MALLOC_TYPE" = S; then - echo " malloc support: system default" -fi -if test "$MALLOC_TYPE" = G; then - echo " malloc support: Gray Watson's dmalloc" -fi -if test "$MALLOC_TYPE" = D; then - echo " malloc support: Doug Lea's malloc" -fi - if test x$support_xpm = xyes; then echo " Xpm library: $XPM_LIBS" fi -echo " -The following are set in config.h -" -echo " pty/tty type: "$rxvt_cv_ptys -if test x$support_utmp != xyes; then - echo " utmp support: disabled" - echo -else - echo " utmp support: enabled - utmp file: $rxvt_cv_path_utmp - utmpx file: $rxvt_cv_path_utmpx - 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" - echo -fi if test x$term != x; then echo " set TERM to: $term" fi @@ -13396,12 +14642,8 @@ 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 ." - echo ". the appropriate PTYS_ARE_* is defined in config.h ." - echo ".----------------------------------------------------------------." -fi +echo " embedded perl: $support_perl" +echo if test x$support_xpm = xneedsmanualspecification; then echo ".----------------------------------------------------------------." echo ". WARNING: --enable-xpm-background was specified however the ." @@ -13420,17 +14662,6 @@ echo ".----------------------------------------------------------------." fi -echo " *** Optionally 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 ". or read ./README.configure ." -echo ". ." -echo ". The script ./reconf gives a reasonable baseline, try it if ." -echo ". you do not want to read documentation and still want some ." -echo ". useful features. ." -echo ".----------------------------------------------------------------." +echo "*** Optionally check src/feature.h for further, rarely used options ***" echo