X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=configure;h=841fe6701224ee3ea59b20e8e78e83291fd05451;hp=d98277aaa34369ddf0ac2aa22f75474b3e853945;hb=6e553442518e7cd93e779d2895cb4c26ba5ba793;hpb=37acaef1c378dac38ce880b037891a7e3af93193 diff --git a/configure b/configure index d98277a..841fe67 100755 --- a/configure +++ b/configure @@ -4486,54 +4486,6 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yywrap in -lfl" >&5 -$as_echo_n "checking for yywrap in -lfl... " >&6; } -if ${ac_cv_lib_fl_yywrap+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lfl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* 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 yywrap (); -int -main () -{ -return yywrap (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_fl_yywrap=yes -else - ac_cv_lib_fl_yywrap=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fl_yywrap" >&5 -$as_echo "$ac_cv_lib_fl_yywrap" >&6; } -if test "x$ac_cv_lib_fl_yywrap" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBFL 1 -_ACEOF - - LIBS="-lfl $LIBS" - -fi - -if test "$ac_cv_lib_fl_yywrap" != yes; then - as_fn_error $? "A compatible libfl is required" "$LINENO" 5 -fi ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa" @@ -4783,7 +4735,7 @@ else $as_echo "$as_me: WARNING: Disabling IPv6 support" >&2;} fi -ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile common.make stest/Makefile" ac_config_commands="$ac_config_commands default" @@ -5484,6 +5436,8 @@ do case $ac_config_target in "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "common.make") CONFIG_FILES="$CONFIG_FILES common.make" ;; + "stest/Makefile") CONFIG_FILES="$CONFIG_FILES stest/Makefile" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -6040,7 +5994,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in - "default":C) echo timestamp >stamp-h ;; + "default":C) echo timestamp >config.stamp ;; esac done # for ac_tag