Skip to content

Commit 35297b6

Browse files
madeyemadeye
committed
clean up
1 parent cd3e20f commit 35297b6

File tree

16 files changed

+67
-23
lines changed

16 files changed

+67
-23
lines changed

‎Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
6363
$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/inet_ntop.m4 \
6464
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
6565
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
66-
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \
67-
$(top_srcdir)/m4/polarssl.m4 $(top_srcdir)/m4/mbedtls.m4 \
66+
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mbedtls.m4 \
67+
$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/polarssl.m4 \
6868
$(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac
6969
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
7070
$(ACLOCAL_M4)

‎aclocal.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -1170,6 +1170,6 @@ m4_include([m4/ltoptions.m4])
11701170
m4_include([m4/ltsugar.m4])
11711171
m4_include([m4/ltversion.m4])
11721172
m4_include([m4/lt~obsolete.m4])
1173+
m4_include([m4/mbedtls.m4])
11731174
m4_include([m4/openssl.m4])
11741175
m4_include([m4/polarssl.m4])
1175-
m4_include([m4/mbedtls.m4])

‎config.h.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -304,15 +304,15 @@
304304
/* Use Apple CommonCrypto library */
305305
#undef USE_CRYPTO_APPLECC
306306

307+
/* Use mbed TLS library */
308+
#undef USE_CRYPTO_MBEDTLS
309+
307310
/* Use OpenSSL library */
308311
#undef USE_CRYPTO_OPENSSL
309312

310313
/* Use PolarSSL library */
311314
#undef USE_CRYPTO_POLARSSL
312315

313-
/* Use mbed TLS library */
314-
#undef USE_CRYPTO_MBEDTLS
315-
316316
/* Version number of package */
317317
#undef VERSION
318318

‎configure

+6-6
Original file line numberDiff line numberDiff line change
@@ -13176,7 +13176,7 @@ fi
1317613176

1317713177
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbedtls_cipher_setup in -lmbedcrypto" >&5
1317813178
$as_echo_n "checking for mbedtls_cipher_setup in -lmbedcrypto... " >&6; }
13179-
if ${ac_cv_lib_mbedtls_mbedtls_cipher_setup+:} false; then :
13179+
if ${ac_cv_lib_mbedcrypto_mbedtls_cipher_setup+:} false; then :
1318013180
$as_echo_n "(cached) " >&6
1318113181
else
1318213182
ac_check_lib_save_LIBS=$LIBS
@@ -13200,17 +13200,17 @@ return mbedtls_cipher_setup ();
1320013200
}
1320113201
_ACEOF
1320213202
if ac_fn_c_try_link "$LINENO"; then :
13203-
ac_cv_lib_mbedtls_mbedtls_cipher_setup=yes
13203+
ac_cv_lib_mbedcrypto_mbedtls_cipher_setup=yes
1320413204
else
13205-
ac_cv_lib_mbedtls_mbedtls_cipher_setup=no
13205+
ac_cv_lib_mbedcrypto_mbedtls_cipher_setup=no
1320613206
fi
1320713207
rm -f core conftest.err conftest.$ac_objext \
1320813208
conftest$ac_exeext conftest.$ac_ext
1320913209
LIBS=$ac_check_lib_save_LIBS
1321013210
fi
13211-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mbedtls_mbedtls_cipher_setup" >&5
13212-
$as_echo "$ac_cv_lib_mbedtls_mbedtls_cipher_setup" >&6; }
13213-
if test "x$ac_cv_lib_mbedtls_mbedtls_cipher_setup" = xyes; then :
13211+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mbedcrypto_mbedtls_cipher_setup" >&5
13212+
$as_echo "$ac_cv_lib_mbedcrypto_mbedtls_cipher_setup" >&6; }
13213+
if test "x$ac_cv_lib_mbedcrypto_mbedtls_cipher_setup" = xyes; then :
1321413214
LIBS="-lmbedcrypto $LIBS"
1321513215
else
1321613216
as_fn_error $? "mbed TLS libraries not found." "$LINENO" 5

‎libcork/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
7676
$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/inet_ntop.m4 \
7777
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
7878
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
79-
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \
80-
$(top_srcdir)/m4/polarssl.m4 $(top_srcdir)/m4/mbedtls.m4 \
79+
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mbedtls.m4 \
80+
$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/polarssl.m4 \
8181
$(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac
8282
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
8383
$(ACLOCAL_M4)

‎libev/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
6060
$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/inet_ntop.m4 \
6161
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
6262
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
63-
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \
64-
$(top_srcdir)/m4/polarssl.m4 $(top_srcdir)/m4/mbedtls.m4 \
63+
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mbedtls.m4 \
64+
$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/polarssl.m4 \
6565
$(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac
6666
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
6767
$(ACLOCAL_M4)

‎libipset/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
7676
$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/inet_ntop.m4 \
7777
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
7878
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
79-
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \
80-
$(top_srcdir)/m4/polarssl.m4 $(top_srcdir)/m4/mbedtls.m4 \
79+
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mbedtls.m4 \
80+
$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/polarssl.m4 \
8181
$(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac
8282
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
8383
$(ACLOCAL_M4)

‎libsodium/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
6060
build-aux/ltmain.sh build-aux/missing
6161
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
6262
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
63+
$(top_srcdir)/m4/ax_check_define.m4 \
6364
$(top_srcdir)/m4/ax_check_link_flag.m4 \
6465
$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
6566
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

‎libsodium/configure

+39-1
Original file line numberDiff line numberDiff line change
@@ -4919,7 +4919,43 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
49194919
49204920
49214921
4922-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -D_FORTIFY_SOURCE=2" >&5
4922+
4923+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FORTIFY_SOURCE defined" >&5
4924+
$as_echo_n "checking for _FORTIFY_SOURCE defined... " >&6; }
4925+
if ${ac_cv_defined__FORTIFY_SOURCE+:} false; then :
4926+
$as_echo_n "(cached) " >&6
4927+
else
4928+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4929+
/* end confdefs.h. */
4930+
4931+
int
4932+
main ()
4933+
{
4934+
4935+
#ifdef _FORTIFY_SOURCE
4936+
int ok;
4937+
#else
4938+
choke me
4939+
#endif
4940+
4941+
;
4942+
return 0;
4943+
}
4944+
_ACEOF
4945+
if ac_fn_c_try_compile "$LINENO"; then :
4946+
ac_cv_defined__FORTIFY_SOURCE=yes
4947+
else
4948+
ac_cv_defined__FORTIFY_SOURCE=no
4949+
fi
4950+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4951+
fi
4952+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_defined__FORTIFY_SOURCE" >&5
4953+
$as_echo "$ac_cv_defined__FORTIFY_SOURCE" >&6; }
4954+
if test $ac_cv_defined__FORTIFY_SOURCE != "no"; then :
4955+
4956+
else
4957+
4958+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -D_FORTIFY_SOURCE=2" >&5
49234959
$as_echo_n "checking whether C compiler accepts -D_FORTIFY_SOURCE=2... " >&6; }
49244960
if ${ax_cv_check_cflags___D_FORTIFY_SOURCE_2+:} false; then :
49254961
$as_echo_n "(cached) " >&6
@@ -4955,6 +4991,8 @@ else
49554991
fi
49564992
49574993
4994+
fi
4995+
49584996
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fvisibility=hidden" >&5
49594997
$as_echo_n "checking whether C compiler accepts -fvisibility=hidden... " >&6; }
49604998
if ${ax_cv_check_cflags___fvisibility_hidden+:} false; then :

‎libsodium/dist-build/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ subdir = dist-build
5454
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
5555
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
5656
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
57+
$(top_srcdir)/m4/ax_check_define.m4 \
5758
$(top_srcdir)/m4/ax_check_link_flag.m4 \
5859
$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
5960
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

‎libsodium/msvc-scripts/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ subdir = msvc-scripts
5454
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
5555
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
5656
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
57+
$(top_srcdir)/m4/ax_check_define.m4 \
5758
$(top_srcdir)/m4/ax_check_link_flag.m4 \
5859
$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
5960
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

‎libsodium/src/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ subdir = src
5454
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
5555
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
5656
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
57+
$(top_srcdir)/m4/ax_check_define.m4 \
5758
$(top_srcdir)/m4/ax_check_link_flag.m4 \
5859
$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
5960
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

‎libsodium/src/libsodium/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ subdir = src/libsodium
127127
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
128128
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
129129
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
130+
$(top_srcdir)/m4/ax_check_define.m4 \
130131
$(top_srcdir)/m4/ax_check_link_flag.m4 \
131132
$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
132133
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

‎libsodium/src/libsodium/include/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
5656
$(srcdir)/Makefile.in
5757
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
5858
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
59+
$(top_srcdir)/m4/ax_check_define.m4 \
5960
$(top_srcdir)/m4/ax_check_link_flag.m4 \
6061
$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
6162
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

‎libudns/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
7676
$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/inet_ntop.m4 \
7777
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
7878
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
79-
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \
80-
$(top_srcdir)/m4/polarssl.m4 $(top_srcdir)/m4/mbedtls.m4 \
79+
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mbedtls.m4 \
80+
$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/polarssl.m4 \
8181
$(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac
8282
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
8383
$(ACLOCAL_M4)

‎src/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
6767
$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/inet_ntop.m4 \
6868
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
6969
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
70-
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \
71-
$(top_srcdir)/m4/polarssl.m4 $(top_srcdir)/m4/mbedtls.m4 \
70+
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mbedtls.m4 \
71+
$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/polarssl.m4 \
7272
$(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac
7373
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
7474
$(ACLOCAL_M4)

0 commit comments

Comments
 (0)