Module Name: othersrc Committed By: lukem Date: Fri May 22 01:16:29 UTC 2009
Modified Files: othersrc/usr.bin/tnftp: configure Log Message: regen for recent fixes To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 othersrc/usr.bin/tnftp/configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: othersrc/usr.bin/tnftp/configure diff -u othersrc/usr.bin/tnftp/configure:1.30 othersrc/usr.bin/tnftp/configure:1.31 --- othersrc/usr.bin/tnftp/configure:1.30 Wed May 20 13:45:49 2009 +++ othersrc/usr.bin/tnftp/configure Fri May 22 01:16:29 2009 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.16 . +# From configure.ac Revision: 1.17 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.63 for tnftp 20090520. # @@ -3655,94 +3655,6 @@ { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking for library containing el_init" >&5 -$as_echo_n "checking for library containing el_init... " >&6; } -if test "${ac_cv_search_el_init+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any 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 el_init (); -int -main () -{ -return el_init (); - ; - return 0; -} -_ACEOF -for ac_lib in '' edit; 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 - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_el_init=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_el_init+set}" = set; then - break -fi -done -if test "${ac_cv_search_el_init+set}" = set; then - : -else - ac_cv_search_el_init=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_el_init" >&5 -$as_echo "$ac_cv_search_el_init" >&6; } -ac_res=$ac_cv_search_el_init -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - have_libedit=yes -else - have_libedit=no -fi fi @@ -4129,6 +4041,16 @@ # include <stdlib.h> # include <string.h> #endif +#if defined(TIME_WITH_SYS_TIME) +# include <sys/time.h> +# include <time.h> +#else +# if defined(HAVE_SYS_TIME_H) +# include <sys/time.h> +# else +# include <time.h> +# endif +#endif #if defined(HAVE_LIBGEN_H) # include <libgen.h> #endif