applications/tg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated tgl, update configure

Browse Source
This commit is contained in:
V V 2015-10-19 18:23:30 +03:00
parent fed99d9b18
commit 021e435e85
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure vendored
View File

@ -4094,9 +4094,9 @@ if test "${enable_openssl+set}" = set; then :
$as_echo "#define TGL_AVOID_OPENSSL 1" >>confdefs.h $as_echo "#define TGL_AVOID_OPENSSL 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcry_md_open in -lgcrypt" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcry_mpi_snatch in -lgcrypt" >&5
$as_echo_n "checking for gcry_md_open in -lgcrypt... " >&6; } $as_echo_n "checking for gcry_mpi_snatch in -lgcrypt... " >&6; }
if ${ac_cv_lib_gcrypt_gcry_md_open+:} false; then : if ${ac_cv_lib_gcrypt_gcry_mpi_snatch+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
@ -4110,33 +4110,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
char gcry_md_open (); char gcry_mpi_snatch ();
int int
main () main ()
{ {
return gcry_md_open (); return gcry_mpi_snatch ();
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_gcrypt_gcry_md_open=yes ac_cv_lib_gcrypt_gcry_mpi_snatch=yes
else else
ac_cv_lib_gcrypt_gcry_md_open=no ac_cv_lib_gcrypt_gcry_mpi_snatch=no
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
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcrypt_gcry_md_open" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcrypt_gcry_mpi_snatch" >&5
$as_echo "$ac_cv_lib_gcrypt_gcry_md_open" >&6; } $as_echo "$ac_cv_lib_gcrypt_gcry_mpi_snatch" >&6; }
if test "x$ac_cv_lib_gcrypt_gcry_md_open" = xyes; then : if test "x$ac_cv_lib_gcrypt_gcry_mpi_snatch" = xyes; then :
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGCRYPT 1 #define HAVE_LIBGCRYPT 1
_ACEOF _ACEOF
LIBS="-lgcrypt $LIBS" LIBS="-lgcrypt $LIBS"
else
as_fn_error $? "\"Need libgcrypt >= 1.60\"" "$LINENO" 5
fi fi
else else

2
configure.ac
View File

@ -38,7 +38,7 @@ AC_ARG_ENABLE(openssl,[ --disable-openssl disables OpenSSL, and don't link ag
[ [
if test "x$enableval" = "xno" ; then if test "x$enableval" = "xno" ; then
AC_DEFINE([TGL_AVOID_OPENSSL],[1],[avoid OpenSSL entirely, use libgcrypt instead (this can't read *.pub files, though.)]) AC_DEFINE([TGL_AVOID_OPENSSL],[1],[avoid OpenSSL entirely, use libgcrypt instead (this can't read *.pub files, though.)])
AC_CHECK_LIB([gcrypt], [gcry_md_open]) AC_CHECK_LIB([gcrypt], [gcry_mpi_snatch], [], [AC_MSG_ERROR(["Need libgcrypt >= 1.60"])])
else else
# Don't be annoying, so don't inform the user about --disable-openssl # Don't be annoying, so don't inform the user about --disable-openssl
AX_CHECK_OPENSSL(,[AC_MSG_ERROR([No openssl found.])]) AX_CHECK_OPENSSL(,[AC_MSG_ERROR([No openssl found.])])

2
tgl

@ -1 +1 @@
Subproject commit 76e2dc111a90a9622badae90ddaf962a26cf815e Subproject commit 5b725d288f59ada3f8905a73182fe57ae8c22986