--- rxvt-unicode/configure 2010/12/02 11:09:40 1.138 +++ rxvt-unicode/configure 2011/06/22 15:18:05 1.146 @@ -2541,7 +2541,7 @@ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -2686,7 +2686,7 @@ $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2719,7 +2719,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -3046,7 +3046,7 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3161,7 +3161,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3204,7 +3204,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3263,7 +3263,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3315,7 +3315,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3920,7 +3920,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -4666,6 +4666,7 @@ support_scroll_next=yes support_scroll_xterm=yes support_xim=yes +support_pixbuf=yes support_afterimage=yes support_xft=yes support_unicode3=no @@ -4697,6 +4698,7 @@ support_utmp=no support_wtmp=no support_xim=no + support_pixbuf=no support_afterimage=no support_xft=no support_unicode3=no @@ -4724,6 +4726,7 @@ support_utmp=yes support_wtmp=yes support_xim=yes + support_pixbuf=yes support_afterimage=yes support_xft=yes support_unicode3=yes @@ -5255,7 +5258,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=cpp @@ -5292,8 +5295,13 @@ done -ac_fn_cxx_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" +for ac_func in clock_gettime +do : + ac_fn_cxx_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" if test "x$ac_cv_func_clock_gettime" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_CLOCK_GETTIME 1 +_ACEOF else @@ -5388,10 +5396,16 @@ fi fi +done -ac_fn_cxx_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" +for ac_func in nanosleep +do : + ac_fn_cxx_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" if test "x$ac_cv_func_nanosleep" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NANOSLEEP 1 +_ACEOF else @@ -5456,15 +5470,18 @@ fi fi +done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ceil in -lm" >&5 -$as_echo_n "checking for ceil in -lm... " >&6; } -if test "${ac_cv_lib_m_ceil+set}" = set; then : +if test -z "$LIBEV_M4_AVOID_LIBM"; then + LIBM=m +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing floor" >&5 +$as_echo_n "checking for library containing floor... " >&6; } +if test "${ac_cv_search_floor+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5474,32 +5491,46 @@ #ifdef __cplusplus extern "C" #endif -char ceil (); +char floor (); int main () { -return ceil (); +return floor (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_m_ceil=yes -else - ac_cv_lib_m_ceil=no +for ac_lib in '' $LIBM; 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_floor=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if test "${ac_cv_search_floor+set}" = set; then : + break fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_ceil" >&5 -$as_echo "$ac_cv_lib_m_ceil" >&6; } -if test "x$ac_cv_lib_m_ceil" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF +done +if test "${ac_cv_search_floor+set}" = set; then : + +else + ac_cv_search_floor=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_floor" >&5 +$as_echo "$ac_cv_search_floor" >&6; } +ac_res=$ac_cv_search_floor +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - LIBS="-lm $LIBS" +$as_echo "#define HAVE_FLOOR 1" >>confdefs.h fi @@ -5564,7 +5595,7 @@ have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -6419,37 +6450,6 @@ done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPointer" >&5 -$as_echo_n "checking for XPointer... " >&6; } -if test "${rxvt_cv_xpointer+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -XPointer dummy; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - rxvt_cv_xpointer=yes -else - rxvt_cv_xpointer=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rxvt_cv_xpointer" >&5 -$as_echo "$rxvt_cv_xpointer" >&6; } -if test x$rxvt_cv_xpointer = xyes; then - -$as_echo "#define HAVE_XPOINTER 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB_ILLEGAL_ACCESS" >&5 $as_echo_n "checking for XLIB_ILLEGAL_ACCESS... " >&6; } if test "${rxvt_cv_xlib_illegal_access+set}" = set; then : @@ -6684,103 +6684,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 -{ $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 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +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,217 +6792,123 @@ 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; } 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:${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 -#include -main() + +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); + char **path, *list[] = { "/var/run/utmp", "/var/adm/utmp", "/etc/utmp", "/usr/etc/utmp", "/usr/adm/utmp", NULL }; + FILE *f = fopen("conftestval", "w"); + if (!f) return 1; #ifdef UTMP_FILE fprintf(f, "%s\n", UTMP_FILE); - exit(0); -#endif -#ifdef _PATH_UTMP +#elif defined(_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); - } +#else + for (path = list; *path; path++) { + struct stat st; + if (stat(*path, &st) == 0) { + fprintf(f, "%s\n", *path); + break; + } } - exit(0); +#endif + return fclose(f) != 0; } _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : @@ -7033,39 +6938,39 @@ $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:${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 + #include #ifdef HAVE_UTMP_H #include #endif -#include -main() + +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); + char **path, *list[] = { "/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp", NULL }; + FILE *f = fopen("conftestval", "w"); + if (!f) return 1; #ifdef WTMP_FILE fprintf(f, "%s\n", WTMP_FILE); - exit(0); -#endif -#ifdef _PATH_WTMP +#elif defined(_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); - } +#else + for (path = list; *path; path++) { + struct stat st; + if (stat(*path, &st) == 0) { + fprintf(f, "%s\n", *path); + break; + } } - exit(0); +#endif + return fclose(f) != 0; } _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : @@ -7094,38 +6999,38 @@ $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:${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 +#include + #ifdef HAVE_UTMPX_H #include #endif -#include -main() + +int main() { - char **w, *wtmplist[] = { - "/var/log/wtmpx", "/var/adm/wtmpx", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); + char **path, *list[] = { "/var/log/wtmpx", "/var/adm/wtmpx", NULL }; + FILE *f = fopen("conftestval", "w"); + if (!f) return 1; #ifdef WTMPX_FILE fprintf(f, "%s\n", WTMPX_FILE); - exit(0); -#endif -#ifdef _PATH_WTMPX +#elif defined(_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); - } +#else + for (path = list; *path; path++) { + struct stat st; + if (stat(*path, &st) == 0) { + fprintf(f, "%s\n", *path); + break; + } } - exit(0); +#endif + return fclose(f) != 0; } _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : @@ -7154,43 +7059,42 @@ $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:${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 + #include -#ifdef HAVE_UTMPX_H -#include -#elif defined(HAVE_UTMP_H) +#ifdef HAVE_UTMP_H #include #endif #ifdef HAVE_LASTLOG_H #include #endif -#include -main() + +int main() { - char **w, *lastloglist[] = { "/var/log/lastlog", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); + char **path, *list[] = { "/var/log/lastlog", NULL }; + FILE *f = fopen("conftestval", "w"); + if (!f) return 1; #ifdef LASTLOG_FILE fprintf(f, "%s\n", LASTLOG_FILE); - exit(0); -#endif -#ifdef _PATH_LASTLOG +#elif defined(_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); - } +#else + for (path = list; *path; path++) { + struct stat st; + if (stat(*path, &st) == 0) { + fprintf(f, "%s\n", *path); + break; + } } - exit(0); +#endif + return fclose(f) != 0; } _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : @@ -7219,37 +7123,38 @@ $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:${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 +#include + #ifdef HAVE_UTMPX_H #include #endif -#include -main() + +int main() { - char **w, *wtmplist[] = { "/var/log/lastlogx", "/var/adm/lastlogx", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); + char **path, *list[] = { "/var/log/lastlogx", "/var/adm/lastlogx", NULL }; + FILE *f = fopen("conftestval", "w"); + if (!f) return 1; #ifdef LASTLOGX_FILE fprintf(f, "%s\n", LASTLOGX_FILE); - exit(0); -#endif -#ifdef _PATH_LASTLOGX +#elif defined(_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); - } +#else + for (path = list; *path; path++) { + struct stat st; + if (stat(*path, &st) == 0) { + fprintf(f, "%s\n", *path); + break; + } } - exit(0); +#endif + return fclose(f) != 0; } _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : @@ -7286,21 +7191,24 @@ $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - : + : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include #include - main() { - char *p; - if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) - exit (XSupportsLocale() ? 0 : 1); - else - exit (1);} + int main() { + char *p; + if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) + exit (XSupportsLocale() ? 0 : 1); + else + exit (1); + } + _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : - rxvt_cv_func_xlocale=yes + rxvt_cv_func_xlocale=yes else rxvt_cv_func_xlocale=no fi @@ -7711,7 +7619,7 @@ #include #include -main() +int main() { struct stat st; struct group *gr; @@ -9004,7 +8912,7 @@ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -9319,7 +9227,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -9347,7 +9255,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -9374,7 +9282,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac