moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

configure: do not hardcode libraries

Browse Source
This commit is contained in:
Giuseppe Scrivano 2011-08-11 12:20:25 +02:00
parent 54beb3f312
commit 6330e4f8b8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2011-08-11 Giuseppe Scrivano <gscrivano@gnu.org> 2011-08-11 Giuseppe Scrivano <gscrivano@gnu.org>
* configure.ac: Do not hardcode GNU TLS and OpenSSL libraries.
* bootstrap.conf (gnulib_modules): Include module iconv. * bootstrap.conf (gnulib_modules): Include module iconv.
* configure.ac: Allow --with-libgnutls-prefix and * configure.ac: Allow --with-libgnutls-prefix and

4
configure.ac
View File

@ -279,7 +279,7 @@ AS_IF([test x"$with_ssl" = xopenssl], [
then then
AC_MSG_NOTICE([compiling in support for SSL via OpenSSL]) AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
AC_LIBOBJ([openssl]) AC_LIBOBJ([openssl])
LIBS="-lopenssl $LIBS" LIBS="$LIBSSL $LIBS"
elif test x"$with_ssl" != x elif test x"$with_ssl" != x
then then
AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.]) AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
@ -303,7 +303,7 @@ AS_IF([test x"$with_ssl" = xopenssl], [
then then
AC_MSG_NOTICE([compiling in support for SSL via GnuTLS]) AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
AC_LIBOBJ([gnutls]) AC_LIBOBJ([gnutls])
LIBS="-lgnutls $LIBS" LIBS="$LIBGNUTLS $LIBS"
else else
AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.]) AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])
fi fi