From 595f219a17a4981c86b47b224167eb4a341db507 Mon Sep 17 00:00:00 2001 From: Darshit Shah Date: Fri, 24 Jul 2015 23:42:20 +0530 Subject: [PATCH] Fix configure options for metalink * configure.ac: Ensure metalink support can be properly disabled --- configure.ac | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index f701e2a3..2f62605e 100644 --- a/configure.ac +++ b/configure.ac @@ -71,10 +71,13 @@ AC_ARG_WITH([ssl], [AS_HELP_STRING([--with-ssl={gnutls,openssl}], [specify SSL backend. GNU TLS is the default.])]) -dnl Zlib: Configure use iof zlib for compression +dnl Zlib: Configure use of zlib for compression AC_ARG_WITH([zlib], [AS_HELP_STRING([--without-zlib], [disable zlib.])]) +dnl Metalink: Configure use of the Metalink library +AC_ARG_WITH([metalink], + [AS_HELP_STRING([--with-metalink], [enable support for metalinks.])]) dnl dnl Process features @@ -483,9 +486,9 @@ AS_IF([test x"$with_metalink" != xno], [ LIBS="$METALINK_LIBS $LIBS" CFLAGS="$METALINK_CFLAGS $CFLAGS" AC_DEFINE([HAVE_METALINK], [1], [Define if using metalink.]) - have_metalink=yes + with_metalink=yes ], [ - have_metalink=no + with_metalink=no ]) ]) @@ -738,7 +741,7 @@ AS_IF([test "X$enable_pcre" != "Xno"],[ dnl Needed by src/Makefile.am AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"]) AM_CONDITIONAL([WITH_SSL], [test "X$with_ssl" != "Xno"]) -AM_CONDITIONAL([METALINK_IS_ENABLED], [test "X$have_metalink" != "Xno"]) +AM_CONDITIONAL([METALINK_IS_ENABLED], [test "X$with_metalink" != "Xno"]) dnl dnl Create output @@ -767,6 +770,6 @@ AC_MSG_NOTICE([Summary of build options: Debugging: $ENABLE_DEBUG Assertions: $ENABLE_ASSERTION Valgrind: $VALGRIND_INFO - Metalink: $have_metalink + Metalink: $with_metalink GPGME: $have_gpg ])