From 1d4017df58d87822bca16690fcc0e1a5af00a3a5 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 11 Nov 2019 01:08:03 +0100 Subject: [PATCH] Regen --- Makefile.in | 3 +- aclocal.m4 | 1 + builds/Makefile.in | 3 +- configure | 90 +++++++++++++------------------ contrib/Makefile.in | 3 +- dist-build/Makefile.in | 3 +- msvc-scripts/Makefile.in | 3 +- src/Makefile.in | 3 +- src/libsodium/Makefile.in | 3 +- src/libsodium/include/Makefile.in | 3 +- test/Makefile.in | 3 +- test/default/Makefile.in | 3 +- 12 files changed, 59 insertions(+), 62 deletions(-) diff --git a/Makefile.in b/Makefile.in index 790faa71..b632e32b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -90,7 +90,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_add_fortify_source.m4 \ + $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ $(top_srcdir)/m4/ax_check_catchable_segv.m4 \ $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/ax_check_define.m4 \ diff --git a/aclocal.m4 b/aclocal.m4 index 1b7adae4..f91b570a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1189,6 +1189,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_add_fortify_source.m4]) m4_include([m4/ax_check_catchable_abrt.m4]) m4_include([m4/ax_check_catchable_segv.m4]) m4_include([m4/ax_check_compile_flag.m4]) diff --git a/builds/Makefile.in b/builds/Makefile.in index e6cf7cdb..db902f05 100644 --- a/builds/Makefile.in +++ b/builds/Makefile.in @@ -89,7 +89,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = builds ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_add_fortify_source.m4 \ + $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ $(top_srcdir)/m4/ax_check_catchable_segv.m4 \ $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/ax_check_define.m4 \ diff --git a/configure b/configure index 46e2e521..02086206 100755 --- a/configure +++ b/configure @@ -6904,79 +6904,65 @@ if test $ac_cv_defined___wasi__ != "no"; then : fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FORTIFY_SOURCE defined" >&5 -$as_echo_n "checking for _FORTIFY_SOURCE defined... " >&6; } -if ${ac_cv_defined__FORTIFY_SOURCE+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS" >&5 +$as_echo_n "checking whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main () { - #ifdef _FORTIFY_SOURCE - int ok; - #else - choke me - #endif + #ifndef _FORTIFY_SOURCE + return 0; + #else + this_is_an_error; + #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_defined__FORTIFY_SOURCE=yes -else - ac_cv_defined__FORTIFY_SOURCE=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_defined__FORTIFY_SOURCE" >&5 -$as_echo "$ac_cv_defined__FORTIFY_SOURCE" >&6; } -if test $ac_cv_defined__FORTIFY_SOURCE != "no"; then : -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -D_FORTIFY_SOURCE=2" >&5 -$as_echo_n "checking whether C compiler accepts -D_FORTIFY_SOURCE=2... " >&6; } -if ${ax_cv_check_cflags___D_FORTIFY_SOURCE_2+:} false; then : - $as_echo_n "(cached) " >&6 -else - - ax_check_save_flags=$CFLAGS - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ax_cv_check_cflags___D_FORTIFY_SOURCE_2=yes + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #define _FORTIFY_SOURCE 2 + #include + int main() { + const char *s = " "; + strcpy(s, "x"); + return strlen(s)-1; + } + + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + else - ax_cv_check_cflags___D_FORTIFY_SOURCE_2=no + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CFLAGS=$ax_check_save_flags -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___D_FORTIFY_SOURCE_2" >&5 -$as_echo "$ax_cv_check_cflags___D_FORTIFY_SOURCE_2" >&6; } -if test "x$ax_cv_check_cflags___D_FORTIFY_SOURCE_2" = xyes; then : - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" else - : -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fvisibility=hidden" >&5 $as_echo_n "checking whether C compiler accepts -fvisibility=hidden... " >&6; } diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 08ce51d5..f6b9e343 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -89,7 +89,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = contrib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_add_fortify_source.m4 \ + $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ $(top_srcdir)/m4/ax_check_catchable_segv.m4 \ $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/ax_check_define.m4 \ diff --git a/dist-build/Makefile.in b/dist-build/Makefile.in index b1ee185f..519d38fd 100644 --- a/dist-build/Makefile.in +++ b/dist-build/Makefile.in @@ -89,7 +89,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = dist-build ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_add_fortify_source.m4 \ + $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ $(top_srcdir)/m4/ax_check_catchable_segv.m4 \ $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/ax_check_define.m4 \ diff --git a/msvc-scripts/Makefile.in b/msvc-scripts/Makefile.in index 210acdf7..a0c1537b 100644 --- a/msvc-scripts/Makefile.in +++ b/msvc-scripts/Makefile.in @@ -89,7 +89,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = msvc-scripts ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_add_fortify_source.m4 \ + $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ $(top_srcdir)/m4/ax_check_catchable_segv.m4 \ $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/ax_check_define.m4 \ diff --git a/src/Makefile.in b/src/Makefile.in index d243b0df..b018aabc 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -89,7 +89,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_add_fortify_source.m4 \ + $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ $(top_srcdir)/m4/ax_check_catchable_segv.m4 \ $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/ax_check_define.m4 \ diff --git a/src/libsodium/Makefile.in b/src/libsodium/Makefile.in index 0958ad3c..8c3142a3 100644 --- a/src/libsodium/Makefile.in +++ b/src/libsodium/Makefile.in @@ -170,7 +170,8 @@ host_triplet = @host@ subdir = src/libsodium ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_add_fortify_source.m4 \ + $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ $(top_srcdir)/m4/ax_check_catchable_segv.m4 \ $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/ax_check_define.m4 \ diff --git a/src/libsodium/include/Makefile.in b/src/libsodium/include/Makefile.in index f74c4557..629b1e5f 100644 --- a/src/libsodium/include/Makefile.in +++ b/src/libsodium/include/Makefile.in @@ -90,7 +90,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/libsodium/include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_add_fortify_source.m4 \ + $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ $(top_srcdir)/m4/ax_check_catchable_segv.m4 \ $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/ax_check_define.m4 \ diff --git a/test/Makefile.in b/test/Makefile.in index 803acc6c..ea098b91 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -89,7 +89,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = test ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_add_fortify_source.m4 \ + $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ $(top_srcdir)/m4/ax_check_catchable_segv.m4 \ $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/ax_check_define.m4 \ diff --git a/test/default/Makefile.in b/test/default/Makefile.in index c508d3ae..93191e61 100644 --- a/test/default/Makefile.in +++ b/test/default/Makefile.in @@ -105,7 +105,8 @@ TESTS = $(am__EXEEXT_3) subdir = test/default ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_add_fortify_source.m4 \ + $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \ $(top_srcdir)/m4/ax_check_catchable_segv.m4 \ $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/ax_check_define.m4 \