From 35297b6c228e398344d35246f0e961180d89b786 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sun, 2 Aug 2015 15:23:08 +0900 Subject: [PATCH] clean up --- Makefile.in | 4 +-- aclocal.m4 | 2 +- config.h.in | 6 ++-- configure | 12 +++---- libcork/Makefile.in | 4 +-- libev/Makefile.in | 4 +-- libipset/Makefile.in | 4 +-- libsodium/Makefile.in | 1 + libsodium/configure | 40 ++++++++++++++++++++- libsodium/dist-build/Makefile.in | 1 + libsodium/msvc-scripts/Makefile.in | 1 + libsodium/src/Makefile.in | 1 + libsodium/src/libsodium/Makefile.in | 1 + libsodium/src/libsodium/include/Makefile.in | 1 + libudns/Makefile.in | 4 +-- src/Makefile.in | 4 +-- 16 files changed, 67 insertions(+), 23 deletions(-) diff --git a/Makefile.in b/Makefile.in index 43266c6d..9e51f65c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -63,8 +63,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/inet_ntop.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \ - $(top_srcdir)/m4/polarssl.m4 $(top_srcdir)/m4/mbedtls.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mbedtls.m4 \ + $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/polarssl.m4 \ $(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/aclocal.m4 b/aclocal.m4 index 479e0806..fd53e841 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1170,6 +1170,6 @@ m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) m4_include([m4/ltversion.m4]) m4_include([m4/lt~obsolete.m4]) +m4_include([m4/mbedtls.m4]) m4_include([m4/openssl.m4]) m4_include([m4/polarssl.m4]) -m4_include([m4/mbedtls.m4]) diff --git a/config.h.in b/config.h.in index f5ab8d9c..04437463 100644 --- a/config.h.in +++ b/config.h.in @@ -304,15 +304,15 @@ /* Use Apple CommonCrypto library */ #undef USE_CRYPTO_APPLECC +/* Use mbed TLS library */ +#undef USE_CRYPTO_MBEDTLS + /* Use OpenSSL library */ #undef USE_CRYPTO_OPENSSL /* Use PolarSSL library */ #undef USE_CRYPTO_POLARSSL -/* Use mbed TLS library */ -#undef USE_CRYPTO_MBEDTLS - /* Version number of package */ #undef VERSION diff --git a/configure b/configure index 30553433..b3dfb3ae 100755 --- a/configure +++ b/configure @@ -13176,7 +13176,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbedtls_cipher_setup in -lmbedcrypto" >&5 $as_echo_n "checking for mbedtls_cipher_setup in -lmbedcrypto... " >&6; } -if ${ac_cv_lib_mbedtls_mbedtls_cipher_setup+:} false; then : +if ${ac_cv_lib_mbedcrypto_mbedtls_cipher_setup+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13200,17 +13200,17 @@ return mbedtls_cipher_setup (); } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mbedtls_mbedtls_cipher_setup=yes + ac_cv_lib_mbedcrypto_mbedtls_cipher_setup=yes else - ac_cv_lib_mbedtls_mbedtls_cipher_setup=no + ac_cv_lib_mbedcrypto_mbedtls_cipher_setup=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_mbedtls_mbedtls_cipher_setup" >&5 -$as_echo "$ac_cv_lib_mbedtls_mbedtls_cipher_setup" >&6; } -if test "x$ac_cv_lib_mbedtls_mbedtls_cipher_setup" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mbedcrypto_mbedtls_cipher_setup" >&5 +$as_echo "$ac_cv_lib_mbedcrypto_mbedtls_cipher_setup" >&6; } +if test "x$ac_cv_lib_mbedcrypto_mbedtls_cipher_setup" = xyes; then : LIBS="-lmbedcrypto $LIBS" else as_fn_error $? "mbed TLS libraries not found." "$LINENO" 5 diff --git a/libcork/Makefile.in b/libcork/Makefile.in index 92244d3e..570931d0 100644 --- a/libcork/Makefile.in +++ b/libcork/Makefile.in @@ -76,8 +76,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/inet_ntop.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \ - $(top_srcdir)/m4/polarssl.m4 $(top_srcdir)/m4/mbedtls.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mbedtls.m4 \ + $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/polarssl.m4 \ $(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/libev/Makefile.in b/libev/Makefile.in index 4f0e2995..2b3118a1 100644 --- a/libev/Makefile.in +++ b/libev/Makefile.in @@ -60,8 +60,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/inet_ntop.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \ - $(top_srcdir)/m4/polarssl.m4 $(top_srcdir)/m4/mbedtls.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mbedtls.m4 \ + $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/polarssl.m4 \ $(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/libipset/Makefile.in b/libipset/Makefile.in index e21e69be..de289583 100644 --- a/libipset/Makefile.in +++ b/libipset/Makefile.in @@ -76,8 +76,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/inet_ntop.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \ - $(top_srcdir)/m4/polarssl.m4 $(top_srcdir)/m4/mbedtls.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mbedtls.m4 \ + $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/polarssl.m4 \ $(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/libsodium/Makefile.in b/libsodium/Makefile.in index 8f27636d..c9f77f29 100644 --- a/libsodium/Makefile.in +++ b/libsodium/Makefile.in @@ -60,6 +60,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ build-aux/ltmain.sh build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/libsodium/configure b/libsodium/configure index fddc4ee7..12ae049e 100755 --- a/libsodium/configure +++ b/libsodium/configure @@ -4919,7 +4919,43 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -D_FORTIFY_SOURCE=2" >&5 + +{ $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 +/* end confdefs.h. */ + +int +main () +{ + + #ifdef _FORTIFY_SOURCE + int ok; + #else + choke me + #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 @@ -4955,6 +4991,8 @@ else fi +fi + { $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; } if ${ax_cv_check_cflags___fvisibility_hidden+:} false; then : diff --git a/libsodium/dist-build/Makefile.in b/libsodium/dist-build/Makefile.in index 0c954f50..85699082 100644 --- a/libsodium/dist-build/Makefile.in +++ b/libsodium/dist-build/Makefile.in @@ -54,6 +54,7 @@ subdir = dist-build DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/libsodium/msvc-scripts/Makefile.in b/libsodium/msvc-scripts/Makefile.in index ea944ef0..af002dbc 100644 --- a/libsodium/msvc-scripts/Makefile.in +++ b/libsodium/msvc-scripts/Makefile.in @@ -54,6 +54,7 @@ subdir = msvc-scripts DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/libsodium/src/Makefile.in b/libsodium/src/Makefile.in index 5a38ab42..bc5d8e42 100644 --- a/libsodium/src/Makefile.in +++ b/libsodium/src/Makefile.in @@ -54,6 +54,7 @@ subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/libsodium/src/libsodium/Makefile.in b/libsodium/src/libsodium/Makefile.in index 7fa4a6d6..267d3ed6 100644 --- a/libsodium/src/libsodium/Makefile.in +++ b/libsodium/src/libsodium/Makefile.in @@ -127,6 +127,7 @@ subdir = src/libsodium DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/libsodium/src/libsodium/include/Makefile.in b/libsodium/src/libsodium/include/Makefile.in index bb4768c3..83d4d679 100644 --- a/libsodium/src/libsodium/include/Makefile.in +++ b/libsodium/src/libsodium/include/Makefile.in @@ -56,6 +56,7 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_define.m4 \ $(top_srcdir)/m4/ax_check_link_flag.m4 \ $(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/libudns/Makefile.in b/libudns/Makefile.in index 4db660ff..24517277 100644 --- a/libudns/Makefile.in +++ b/libudns/Makefile.in @@ -76,8 +76,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/inet_ntop.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \ - $(top_srcdir)/m4/polarssl.m4 $(top_srcdir)/m4/mbedtls.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mbedtls.m4 \ + $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/polarssl.m4 \ $(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/src/Makefile.in b/src/Makefile.in index 9f7561c2..257c9d1f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -67,8 +67,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/inet_ntop.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \ - $(top_srcdir)/m4/polarssl.m4 $(top_srcdir)/m4/mbedtls.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mbedtls.m4 \ + $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/polarssl.m4 \ $(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4)