--- rxvt-unicode/configure 2011/03/27 00:15:40 1.144 +++ rxvt-unicode/configure 2011/12/18 02:23:11 1.150 @@ -603,6 +603,8 @@ AFTERIMAGE_LIBS AFTERIMAGE_CFLAGS afterimage_config +STARTUP_NOTIFICATION_LIBS +STARTUP_NOTIFICATION_CFLAGS PIXBUF_LIBS PIXBUF_CFLAGS PKG_CONFIG @@ -693,6 +695,7 @@ enable_afterimage with_afterimage_config enable_pixbuf +enable_startup_notification enable_transparency enable_fading enable_rxvt_scroll @@ -1366,8 +1369,9 @@ --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-afterimage enable integration with libAfterImage for background images + --enable-afterimage enable integration with libAfterImage for background images (deprecated) --enable-pixbuf enable integration with gdk-pixbuf for background images + --enable-startup-notification enable freedesktop startup notification support --enable-transparency enable transparent backgrounds --enable-fading enable colors fading when off focus --enable-rxvt-scroll enable rxvt style scrollbar @@ -4667,7 +4671,7 @@ support_scroll_xterm=yes support_xim=yes support_pixbuf=yes -support_afterimage=yes +support_startup_notification=yes support_xft=yes support_unicode3=no support_combining=yes @@ -4699,7 +4703,7 @@ support_wtmp=no support_xim=no support_pixbuf=no - support_afterimage=no + support_startup_notification=no support_xft=no support_unicode3=no support_combining=no @@ -4727,7 +4731,7 @@ support_wtmp=yes support_xim=yes support_pixbuf=yes - support_afterimage=yes + support_startup_notification=yes support_xft=yes support_unicode3=yes support_combining=yes @@ -4741,32 +4745,32 @@ fi -ASSERTIONS=no +support_assertions=no # Check whether --enable-assert was given. if test "${enable_assert+set}" = set; then : enableval=$enable_assert; if test x$enableval = xyes; then - ASSERTIONS=yes + support_assertions=yes fi fi -if test x$ASSERTIONS = xno; then +if test x$support_assertions = xno; then $as_echo "#define NDEBUG 1" >>confdefs.h fi -WARNINGS=no +support_warnings=no # Check whether --enable-warnings was given. if test "${enable_warnings+set}" = set; then : enableval=$enable_warnings; if test x$enableval = xyes; then - WARNINGS=yes + support_warnings=yes fi fi if test x$GXX = xyes; then - if test $WARNINGS = yes; then + if test $support_warnings = yes; then save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" + CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4860,6 +4864,14 @@ fi +# Check whether --enable-startup-notification was given. +if test "${enable_startup_notification+set}" = set; then : + enableval=$enable_startup_notification; if test x$enableval = xyes -o x$enableval = xno; then + support_startup_notification=$enableval + fi +fi + + # Check whether --enable-transparency was given. if test "${enable_transparency+set}" = set; then : enableval=$enable_transparency; if test x$enableval = xyes -o x$enableval = xno; then @@ -6340,9 +6352,77 @@ +STARTUP_NOTIFICATION_CFLAGS= +STARTUP_NOTIFICATION_LIBS= + +if test x$support_startup_notification = xyes; then + support_startup_notification=no + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification" >&5 +$as_echo_n "checking for libstartup-notification... " >&6; } + if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then + STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`" + STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`" + support_startup_notification=yes + fi + + if test x$support_startup_notification = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + +$as_echo "#define HAVE_STARTUP_NOTIFICATION 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi +fi + + + + AFTERIMAGE_CFLAGS= AFTERIMAGE_LIBS= -AFTERIMAGE_VERSION= if test x$support_afterimage = xyes; then support_afterimage=no @@ -6393,18 +6473,15 @@ if test "x$afterimage_config" != "xno" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libAfterImage version >= 1.15" >&5 $as_echo_n "checking for libAfterImage version >= 1.15... " >&6; } - xAFTERIMAGE_VERSION=`$afterimage_config --version` - if test -n "$xAFTERIMAGE_VERSION" ; then - xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` - xAFTERIMAGE_LIBS=`$afterimage_config --libs` - if test "x$xAFTERIMAGE_LIBS" != "x"; then - libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .` - libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .` + AFTERIMAGE_VERSION=`$afterimage_config --version` + if test -n "$AFTERIMAGE_VERSION" ; then + AFTERIMAGE_CFLAGS=`$afterimage_config --cflags` + AFTERIMAGE_LIBS=`$afterimage_config --libs` + if test "x$AFTERIMAGE_LIBS" != "x"; then + libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .` + libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .` if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then support_afterimage=yes - AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS" - AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS" - AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION" fi fi fi @@ -6421,6 +6498,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + AFTERIMAGE_CFLAGS= + AFTERIMAGE_LIBS= fi fi fi @@ -6684,103 +6763,102 @@ cat >>confdefs.h <<_ACEOF #define HAVE_UTMP_H 1 _ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utmp" >&5 -$as_echo_n "checking for struct utmp... " >&6; } -if test "${pt_cv_struct_utmp+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + ac_fn_cxx_check_type "$LINENO" "struct utmp" "ac_cv_type_struct_utmp" " #include #include -int -main () -{ -struct utmp ut; - ; - return 0; -} + +" +if test "x$ac_cv_type_struct_utmp" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_UTMP 1 _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_utmp=yes -else - pt_cv_struct_utmp=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmp" >&5 -$as_echo "$pt_cv_struct_utmp" >&6; } -if test x$pt_cv_struct_utmp = xyes; then -$as_echo "#define HAVE_STRUCT_UTMP 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_host in utmp struct" >&5 -$as_echo_n "checking for ut_host in utmp struct... " >&6; } -if test "${pt_cv_struct_utmp_host+set}" = set; then : + +# ac_fn_cxx_check_member LINENO AGGR MEMBER VAR INCLUDES +# ------------------------------------------------------ +# Tries to find if the field MEMBER exists in type AGGR, after including +# INCLUDES, setting cache variable VAR accordingly. +ac_fn_cxx_check_member () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if eval "test \"\${$4+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include +$5 int main () { -struct utmp ut; ut.ut_host; +static $2 ac_aggr; +if (ac_aggr.$3) +return 0; ; return 0; } _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_utmp_host=yes -else - pt_cv_struct_utmp_host=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmp_host" >&5 -$as_echo "$pt_cv_struct_utmp_host" >&6; } -if test x$pt_cv_struct_utmp_host = xyes; then - -$as_echo "#define HAVE_UTMP_HOST 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_pid in utmp struct" >&5 -$as_echo_n "checking for ut_pid in utmp struct... " >&6; } -if test "${pt_cv_struct_utmp_pid+set}" = set; then : - $as_echo_n "(cached) " >&6 + eval "$4=yes" else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include +$5 int main () { -struct utmp ut; ut.ut_pid; +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; ; return 0; } _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_utmp_pid=yes + eval "$4=yes" else - pt_cv_struct_utmp_pid=no + eval "$4=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmp_pid" >&5 -$as_echo "$pt_cv_struct_utmp_pid" >&6; } -if test x$pt_cv_struct_utmp_pid = xyes; then +eval ac_res=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_cxx_check_member +ac_fn_cxx_check_member "$LINENO" "struct utmp" "ut_host" "ac_cv_member_struct_utmp_ut_host" " +#include +#include + +" +if test "x$ac_cv_member_struct_utmp_ut_host" = x""yes; then : + +$as_echo "#define HAVE_UTMP_HOST 1" >>confdefs.h + +fi + + +ac_fn_cxx_check_member "$LINENO" "struct utmp" "ut_pid" "ac_cv_member_struct_utmp_ut_pid" " +#include +#include + +" +if test "x$ac_cv_member_struct_utmp_ut_pid" = x""yes; then : $as_echo "#define HAVE_UTMP_PID 1" >>confdefs.h fi + fi done @@ -6793,483 +6871,225 @@ cat >>confdefs.h <<_ACEOF #define HAVE_UTMPX_H 1 _ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utmpx" >&5 -$as_echo_n "checking for struct utmpx... " >&6; } -if test "${pt_cv_struct_utmpx+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + ac_fn_cxx_check_type "$LINENO" "struct utmpx" "ac_cv_type_struct_utmpx" " #include #include -int -main () -{ -struct utmpx ut; - ; - return 0; -} + +" +if test "x$ac_cv_type_struct_utmpx" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_UTMPX 1 _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_utmpx=yes -else - pt_cv_struct_utmpx=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmpx" >&5 -$as_echo "$pt_cv_struct_utmpx" >&6; } -if test x$pt_cv_struct_utmpx = xyes; then -$as_echo "#define HAVE_STRUCT_UTMPX 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for host in utmpx struct" >&5 -$as_echo_n "checking for host in utmpx struct... " >&6; } -if test "${pt_cv_struct_utmpx_host+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +ac_fn_cxx_check_member "$LINENO" "struct utmpx" "ut_host" "ac_cv_member_struct_utmpx_ut_host" " #include #include -int -main () -{ -struct utmpx utx; utx.ut_host; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_utmpx_host=yes -else - pt_cv_struct_utmpx_host=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmpx_host" >&5 -$as_echo "$pt_cv_struct_utmpx_host" >&6; } -if test x$pt_cv_struct_utmpx_host = xyes; then + +" +if test "x$ac_cv_member_struct_utmpx_ut_host" = x""yes; then : $as_echo "#define HAVE_UTMPX_HOST 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for session in utmpx struct" >&5 -$as_echo_n "checking for session in utmpx struct... " >&6; } -if test "${pt_cv_struct_utmpx_session+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + +ac_fn_cxx_check_member "$LINENO" "struct utmpx" "ut_session" "ac_cv_member_struct_utmpx_ut_session" " #include #include -int -main () -{ -struct utmpx utx; utx.ut_session; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_utmpx_session=yes -else - pt_cv_struct_utmpx_session=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmpx_session" >&5 -$as_echo "$pt_cv_struct_utmpx_session" >&6; } -if test x$pt_cv_struct_utmpx_session = xyes; then + +" +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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct lastlog" >&5 -$as_echo_n "checking for struct lastlog... " >&6; } -if test "${pt_cv_struct_lastlog+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +ac_fn_cxx_check_type "$LINENO" "struct lastlog" "ac_cv_type_struct_lastlog" " #include #include #ifdef HAVE_LASTLOG_H #include #endif -int -main () -{ -struct lastlog ll; - ; - return 0; -} +" +if test "x$ac_cv_type_struct_lastlog" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_LASTLOG 1 _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_lastlog=yes -else - pt_cv_struct_lastlog=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_lastlog" >&5 -$as_echo "$pt_cv_struct_lastlog" >&6; } -if test x$pt_cv_struct_lastlog = xyes; then -$as_echo "#define HAVE_STRUCT_LASTLOG 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct lastlogx" >&5 -$as_echo_n "checking for struct lastlogx... " >&6; } -if test "${pt_cv_struct_lastlogx+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + +ac_fn_cxx_check_type "$LINENO" "struct lastlogx" "ac_cv_type_struct_lastlogx" " #include #include #ifdef HAVE_LASTLOG_H #include #endif -int -main () -{ -struct lastlogx ll; - ; - return 0; -} +" +if test "x$ac_cv_type_struct_lastlogx" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_LASTLOGX 1 _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_lastlogx=yes -else - pt_cv_struct_lastlogx=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_lastlogx" >&5 -$as_echo "$pt_cv_struct_lastlogx" >&6; } -if test x$pt_cv_struct_lastlogx = xyes; then -$as_echo "#define HAVE_STRUCT_LASTLOGX 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where utmp is located" >&5 -$as_echo_n "checking where utmp is located... " >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of utmp" >&5 +$as_echo_n "checking for a fallback location of utmp... " >&6; } if test "${pt_cv_path_utmp+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define UTMP_FILE in config.h manually" >&5 -$as_echo "$as_me: WARNING: Define UTMP_FILE in config.h manually" >&2;} -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -#include -int main() -{ - char **u, *utmplist[] = { - "/var/run/utmp", "/var/adm/utmp", "/etc/utmp", "/usr/etc/utmp", "/usr/adm/utmp", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef UTMP_FILE - fprintf(f, "%s\n", UTMP_FILE); - exit(0); -#endif -#ifdef _PATH_UTMP - fprintf(f, "%s\n", _PATH_UTMP); - exit(0); -#endif - for (u = utmplist; *u; u++) { - if ((a = fopen(*u, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *u); - exit(0); - } - } - exit(0); -} -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - pt_cv_path_utmp=`cat conftestval` -else - pt_cv_path_utmp= -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +if test "$cross_compiling" != yes; then + for file in "/var/run/utmp" "/var/adm/utmp" "/etc/utmp" "/usr/etc/utmp" "/usr/adm/utmp"; do + if test -f "$file"; then + pt_cv_path_utmp=$file + break + fi + done +fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_utmp" >&5 $as_echo "$pt_cv_path_utmp" >&6; } if test x$pt_cv_path_utmp != x; then cat >>confdefs.h <<_ACEOF -#define UTMP_FILE "$pt_cv_path_utmp" +#define PT_UTMP_FILE "$pt_cv_path_utmp" _ACEOF +elif test "$cross_compiling" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_UTMP_FILE in config.h manually" >&5 +$as_echo "$as_me: WARNING: Define PT_UTMP_FILE in config.h manually" >&2;} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where wtmp is located" >&5 -$as_echo_n "checking where wtmp is located... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of wtmp" >&5 +$as_echo_n "checking for a fallback location of wtmp... " >&6; } if test "${pt_cv_path_wtmp+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define WTMP_FILE in config.h manually" >&5 -$as_echo "$as_me: WARNING: Define WTMP_FILE in config.h manually" >&2;} -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#ifdef HAVE_UTMP_H -#include -#endif -#include -int main() -{ - char **w, *wtmplist[] = { - "/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef WTMP_FILE - fprintf(f, "%s\n", WTMP_FILE); - exit(0); -#endif -#ifdef _PATH_WTMP - fprintf(f, "%s\n", _PATH_WTMP); - exit(0); -#endif - for (w = wtmplist; *w; w++) { - if ((a = fopen(*w, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *w); - exit(0); - } - } - exit(0); -} -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - pt_cv_path_wtmp=`cat conftestval` -else - pt_cv_path_wtmp= -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +if test "$cross_compiling" != yes; then + for file in "/var/log/wtmp" "/var/adm/wtmp" "/etc/wtmp" "/usr/etc/wtmp" "/usr/adm/wtmp"; do + if test -f "$file"; then + pt_cv_path_wtmp=$file + break + fi + done +fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_wtmp" >&5 $as_echo "$pt_cv_path_wtmp" >&6; } if test x$pt_cv_path_wtmp != x; then cat >>confdefs.h <<_ACEOF -#define WTMP_FILE "$pt_cv_path_wtmp" +#define PT_WTMP_FILE "$pt_cv_path_wtmp" _ACEOF +elif test "$cross_compiling" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_WTMP_FILE in config.h manually" >&5 +$as_echo "$as_me: WARNING: Define PT_WTMP_FILE in config.h manually" >&2;} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where wtmpx is located" >&5 -$as_echo_n "checking where wtmpx is located... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of wtmpx" >&5 +$as_echo_n "checking for a fallback location of wtmpx... " >&6; } if test "${pt_cv_path_wtmpx+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define WTMPX_FILE in config.h manually" >&5 -$as_echo "$as_me: WARNING: Define WTMPX_FILE in config.h manually" >&2;} -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#ifdef HAVE_UTMPX_H -#include -#endif -#include -int main() -{ - char **w, *wtmplist[] = { - "/var/log/wtmpx", "/var/adm/wtmpx", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef WTMPX_FILE - fprintf(f, "%s\n", WTMPX_FILE); - exit(0); -#endif -#ifdef _PATH_WTMPX - fprintf(f, "%s\n", _PATH_WTMPX); - exit(0); -#endif - for (w = wtmplist; *w; w++) { - if ((a = fopen(*w, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *w); - exit(0); - } - } - exit(0); -} -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - pt_cv_path_wtmpx=`cat conftestval` -else - pt_cv_path_wtmpx= -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +if test "$cross_compiling" != yes; then + for file in "/var/log/wtmpx" "/var/adm/wtmpx"; do + if test -f "$file"; then + pt_cv_path_wtmpx=$file + break + fi + done +fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_wtmpx" >&5 $as_echo "$pt_cv_path_wtmpx" >&6; } if test x$pt_cv_path_wtmpx != x; then cat >>confdefs.h <<_ACEOF -#define WTMPX_FILE "$pt_cv_path_wtmpx" +#define PT_WTMPX_FILE "$pt_cv_path_wtmpx" _ACEOF +elif test "$cross_compiling" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_WTMPX_FILE in config.h manually" >&5 +$as_echo "$as_me: WARNING: Define PT_WTMPX_FILE in config.h manually" >&2;} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where lastlog is located" >&5 -$as_echo_n "checking where lastlog is located... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of lastlog" >&5 +$as_echo_n "checking for a fallback location of lastlog... " >&6; } if test "${pt_cv_path_lastlog+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define LASTLOG_FILE in config.h manually" >&5 -$as_echo "$as_me: WARNING: Define LASTLOG_FILE in config.h manually" >&2;} -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#ifdef HAVE_UTMPX_H -#include -#elif defined(HAVE_UTMP_H) -#include -#endif -#ifdef HAVE_LASTLOG_H -#include -#endif -#include -int main() -{ - char **w, *lastloglist[] = { "/var/log/lastlog", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef LASTLOG_FILE - fprintf(f, "%s\n", LASTLOG_FILE); - exit(0); -#endif -#ifdef _PATH_LASTLOG - fprintf(f, "%s\n", _PATH_LASTLOG); - exit(0); -#endif - for (w = lastloglist; *w; w++) { - if ((a = fopen(*w, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *w); - exit(0); - } - } - exit(0); -} -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - pt_cv_path_lastlog=`cat conftestval` -else - pt_cv_path_lastlog= -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +if test "$cross_compiling" != yes; then + for file in "/var/log/lastlog"; do + if test -f "$file"; then + pt_cv_path_lastlog=$file + break + fi + done +fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_lastlog" >&5 $as_echo "$pt_cv_path_lastlog" >&6; } if test x$pt_cv_path_lastlog != x; then cat >>confdefs.h <<_ACEOF -#define LASTLOG_FILE "$pt_cv_path_lastlog" +#define PT_LASTLOG_FILE "$pt_cv_path_lastlog" _ACEOF +elif test "$cross_compiling" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_LASTLOG_FILE in config.h manually" >&5 +$as_echo "$as_me: WARNING: Define PT_LASTLOG_FILE in config.h manually" >&2;} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where lastlogx is located" >&5 -$as_echo_n "checking where lastlogx is located... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of lastlogx" >&5 +$as_echo_n "checking for a fallback location of lastlogx... " >&6; } if test "${pt_cv_path_lastlogx+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define LASTLOGX_FILE in config.h manually" >&5 -$as_echo "$as_me: WARNING: Define LASTLOGX_FILE in config.h manually" >&2;} -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#ifdef HAVE_UTMPX_H -#include -#endif -#include -int main() -{ - char **w, *wtmplist[] = { "/var/log/lastlogx", "/var/adm/lastlogx", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef LASTLOGX_FILE - fprintf(f, "%s\n", LASTLOGX_FILE); - exit(0); -#endif -#ifdef _PATH_LASTLOGX - fprintf(f, "%s\n", _PATH_LASTLOGX); - exit(0); -#endif - for (w = wtmplist; *w; w++) { - if ((a = fopen(*w, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *w); - exit(0); - } - } - exit(0); -} -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - pt_cv_path_lastlogx=`cat conftestval` -else - pt_cv_path_lastlogx= -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +if test "$cross_compiling" != yes; then + for file in "/var/log/lastlogx" "/var/adm/lastlogx"; do + if test -f "$file"; then + pt_cv_path_lastlogx=$file + break + fi + done +fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_lastlogx" >&5 $as_echo "$pt_cv_path_lastlogx" >&6; } if test x$pt_cv_path_lastlogx != x; then cat >>confdefs.h <<_ACEOF -#define LASTLOGX_FILE "$pt_cv_path_lastlogx" +#define PT_LASTLOGX_FILE "$pt_cv_path_lastlogx" _ACEOF +elif test "$cross_compiling" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_LASTLOGX_FILE in config.h manually" >&5 +$as_echo "$as_me: WARNING: Define PT_LASTLOGX_FILE in config.h manually" >&2;} fi @@ -7563,53 +7383,9 @@ done -have_clone=no - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 -$as_echo_n "checking for /dev/ptc... " >&6; } -if test -e /dev/ptc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define CLONE_DEVICE \"/dev/ptc\"" >>confdefs.h - - have_clone=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -case $host in - *-*-cygwin*) - have_clone=yes - -$as_echo "#define CLONE_DEVICE \"/dev/ptmx\"" >>confdefs.h - - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5 -$as_echo_n "checking for /dev/ptmx... " >&6; } - if test -e /dev/ptmx; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_DEV_PTMX 1" >>confdefs.h - - -$as_echo "#define CLONE_DEVICE \"/dev/ptmx\"" >>confdefs.h - - have_clone=yes - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "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 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIX98 ptys" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIX98 ptys" >&5 $as_echo_n "checking for UNIX98 ptys... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -7625,7 +7401,7 @@ $as_echo "#define UNIX98_PTY 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -7633,7 +7409,6 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -fi if test -z "$unix98_pty"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing openpty" >&5