--- rxvt-unicode/configure 2011/12/18 02:23:11 1.150 +++ rxvt-unicode/configure 2012/01/21 12:44:11 1.153 @@ -619,10 +619,10 @@ LINKER EGREP GREP +CPP INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -CPP ac_ct_CXX CXXFLAGS CXX @@ -2740,8 +2740,8 @@ -VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` -DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +VERSION=`sed -n -e 's/^.* VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +DATE=`sed -n -e 's/^.* DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` echo "" echo "configuring for rxvt $VERSION" @@ -3796,6 +3796,101 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3933,101 +4028,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - - done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } @@ -4414,6 +4414,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +LINKER="$CXX" if test x$GCC = xyes && test x$GXX = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working libsupc++" >&5 $as_echo_n "checking for working libsupc++... " >&6; } @@ -4421,7 +4422,6 @@ save_LIBS="$LIBS" CXX="$CC" LIBS="$LIBS -lsupc++" - LINKER="$CC" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4437,12 +4437,12 @@ if ac_fn_cxx_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } + LINKER="$CC" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, making everything bigger and slower" >&5 $as_echo "no, making everything bigger and slower" >&6; } LIBS="$save_LIBS" - LINKER="$save_CXX" fi @@ -4479,14 +4479,6 @@ CFLAGS="$CXXFLAGS" fi -case $host in - *-*-solaris* ) - -$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h - - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setlocale" >&5 $as_echo_n "checking for library containing setlocale... " >&6; } if test "${ac_cv_search_setlocale+set}" = set; then : @@ -6514,7 +6506,6 @@ sys/strredir.h \ stdint.h \ wchar.h \ - cwchar \ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -6755,6 +6746,14 @@ done +case $host in + *-*-solaris*) + +$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h + + ;; +esac + for ac_header in utmp.h do : @@ -6898,18 +6897,6 @@ fi -ac_fn_cxx_check_member "$LINENO" "struct utmpx" "ut_session" "ac_cv_member_struct_utmpx_ut_session" " -#include -#include - -" -if test "x$ac_cv_member_struct_utmpx_ut_session" = x""yes; then : - -$as_echo "#define HAVE_UTMPX_SESSION 1" >>confdefs.h - -fi - - fi done @@ -7043,7 +7030,7 @@ else if test "$cross_compiling" != yes; then - for file in "/var/log/lastlog"; do + for file in "/var/log/lastlog" "/var/adm/lastlog"; do if test -f "$file"; then pt_cv_path_lastlog=$file break @@ -7209,70 +7196,102 @@ LIBS=$save_LIBS CFLAGS=$save_CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working plain setlocale" >&5 -$as_echo_n "checking for working plain setlocale... " >&6; } -if test "${rxvt_cv_func_setlocale+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working nl_langinfo" >&5 +$as_echo_n "checking for working nl_langinfo... " >&6; } +if test "${rxvt_cv_func_nl_langinfo+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#include int main () { -setlocale(LC_CTYPE, ""); +nl_langinfo(CODESET); ; return 0; } _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : - rxvt_cv_func_setlocale=yes + rxvt_cv_func_nl_langinfo=yes else - rxvt_cv_func_setlocale=no + rxvt_cv_func_nl_langinfo=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rxvt_cv_func_setlocale" >&5 -$as_echo "$rxvt_cv_func_setlocale" >&6; } -if test x$rxvt_cv_func_setlocale = xyes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rxvt_cv_func_nl_langinfo" >&5 +$as_echo "$rxvt_cv_func_nl_langinfo" >&6; } +if test x$rxvt_cv_func_nl_langinfo = xyes; then -$as_echo "#define HAVE_SETLOCALE 1" >>confdefs.h +$as_echo "#define HAVE_NL_LANGINFO 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working nl_langinfo" >&5 -$as_echo_n "checking for working nl_langinfo... " >&6; } -if test "${rxvt_cv_func_nl_langinfo+set}" = set; then : + +case $host in + *-*-solaris*) + +$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sendmsg" >&5 +$as_echo_n "checking for library containing sendmsg... " >&6; } +if test "${ac_cv_search_sendmsg+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sendmsg (); int main () { -nl_langinfo(CODESET); +return sendmsg (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - rxvt_cv_func_nl_langinfo=yes -else - rxvt_cv_func_nl_langinfo=no +for ac_lib in '' socket; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_search_sendmsg=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext + if test "${ac_cv_search_sendmsg+set}" = set; then : + break fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rxvt_cv_func_nl_langinfo" >&5 -$as_echo "$rxvt_cv_func_nl_langinfo" >&6; } -if test x$rxvt_cv_func_nl_langinfo = xyes; then +done +if test "${ac_cv_search_sendmsg+set}" = set; then : -$as_echo "#define HAVE_NL_LANGINFO 1" >>confdefs.h +else + ac_cv_search_sendmsg=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sendmsg" >&5 +$as_echo "$ac_cv_search_sendmsg" >&6; } +ac_res=$ac_cv_search_sendmsg +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi + ;; +esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix-compliant filehandle passing ability" >&5 $as_echo_n "checking for unix-compliant filehandle passing ability... " >&6; } @@ -7282,7 +7301,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include // broken bsds (is that redundant?) need this +#include // broken bsds (is that redundant?) need this #include #include #include @@ -7344,7 +7363,6 @@ util.h \ libutil.h \ sys/ioctl.h \ - sys/stropts.h \ stropts.h \ do :