Regen
This commit is contained in:
parent
ad9cb57a4e
commit
1d4017df58
@ -90,7 +90,8 @@ build_triplet = @build@
|
|||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
subdir = .
|
subdir = .
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
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_catchable_segv.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_define.m4 \
|
$(top_srcdir)/m4/ax_check_define.m4 \
|
||||||
|
1
aclocal.m4
vendored
1
aclocal.m4
vendored
@ -1189,6 +1189,7 @@ AC_SUBST([am__tar])
|
|||||||
AC_SUBST([am__untar])
|
AC_SUBST([am__untar])
|
||||||
]) # _AM_PROG_TAR
|
]) # _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_abrt.m4])
|
||||||
m4_include([m4/ax_check_catchable_segv.m4])
|
m4_include([m4/ax_check_catchable_segv.m4])
|
||||||
m4_include([m4/ax_check_compile_flag.m4])
|
m4_include([m4/ax_check_compile_flag.m4])
|
||||||
|
@ -89,7 +89,8 @@ build_triplet = @build@
|
|||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
subdir = builds
|
subdir = builds
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
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_catchable_segv.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_define.m4 \
|
$(top_srcdir)/m4/ax_check_define.m4 \
|
||||||
|
90
configure
vendored
90
configure
vendored
@ -6904,79 +6904,65 @@ if test $ac_cv_defined___wasi__ != "no"; then :
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FORTIFY_SOURCE defined" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS" >&5
|
||||||
$as_echo_n "checking for _FORTIFY_SOURCE defined... " >&6; }
|
$as_echo_n "checking whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS... " >&6; }
|
||||||
if ${ac_cv_defined__FORTIFY_SOURCE+:} false; then :
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifdef _FORTIFY_SOURCE
|
#ifndef _FORTIFY_SOURCE
|
||||||
int ok;
|
return 0;
|
||||||
#else
|
#else
|
||||||
choke me
|
this_is_an_error;
|
||||||
#endif
|
#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 <time.h>
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
|
|
||||||
;
|
;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
_ACEOF
|
_ACEOF
|
||||||
if ac_fn_c_try_link "$LINENO"; then :
|
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 <string.h>
|
||||||
|
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
|
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
|
fi
|
||||||
rm -f core conftest.err conftest.$ac_objext \
|
rm -f core conftest.err conftest.$ac_objext \
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
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
|
else
|
||||||
:
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||||
|
$as_echo "no" >&6; }
|
||||||
|
|
||||||
fi
|
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 "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fvisibility=hidden" >&5
|
||||||
$as_echo_n "checking whether C compiler accepts -fvisibility=hidden... " >&6; }
|
$as_echo_n "checking whether C compiler accepts -fvisibility=hidden... " >&6; }
|
||||||
|
@ -89,7 +89,8 @@ build_triplet = @build@
|
|||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
subdir = contrib
|
subdir = contrib
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
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_catchable_segv.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_define.m4 \
|
$(top_srcdir)/m4/ax_check_define.m4 \
|
||||||
|
@ -89,7 +89,8 @@ build_triplet = @build@
|
|||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
subdir = dist-build
|
subdir = dist-build
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
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_catchable_segv.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_define.m4 \
|
$(top_srcdir)/m4/ax_check_define.m4 \
|
||||||
|
@ -89,7 +89,8 @@ build_triplet = @build@
|
|||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
subdir = msvc-scripts
|
subdir = msvc-scripts
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
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_catchable_segv.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_define.m4 \
|
$(top_srcdir)/m4/ax_check_define.m4 \
|
||||||
|
@ -89,7 +89,8 @@ build_triplet = @build@
|
|||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
subdir = src
|
subdir = src
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
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_catchable_segv.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_define.m4 \
|
$(top_srcdir)/m4/ax_check_define.m4 \
|
||||||
|
@ -170,7 +170,8 @@ host_triplet = @host@
|
|||||||
|
|
||||||
subdir = src/libsodium
|
subdir = src/libsodium
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
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_catchable_segv.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_define.m4 \
|
$(top_srcdir)/m4/ax_check_define.m4 \
|
||||||
|
@ -90,7 +90,8 @@ build_triplet = @build@
|
|||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
subdir = src/libsodium/include
|
subdir = src/libsodium/include
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
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_catchable_segv.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_define.m4 \
|
$(top_srcdir)/m4/ax_check_define.m4 \
|
||||||
|
@ -89,7 +89,8 @@ build_triplet = @build@
|
|||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
subdir = test
|
subdir = test
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
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_catchable_segv.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_define.m4 \
|
$(top_srcdir)/m4/ax_check_define.m4 \
|
||||||
|
@ -105,7 +105,8 @@ TESTS = $(am__EXEEXT_3)
|
|||||||
|
|
||||||
subdir = test/default
|
subdir = test/default
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
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_catchable_segv.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
||||||
$(top_srcdir)/m4/ax_check_define.m4 \
|
$(top_srcdir)/m4/ax_check_define.m4 \
|
||||||
|
Loading…
Reference in New Issue
Block a user