[pacman-dev] [PATCH 3/4] Add configure.ac option for --with-curl

Dave Reisner d at falconindy.com
Sun Jan 2 20:13:23 EST 2011


To avoid breaking compilation, fetch defaults to 'no', and curl defaults
to 'check'.

Signed-off-by: Dave Reisner <d at falconindy.com>
---
 configure.ac |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5627fb7..3d536cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,7 +96,12 @@ AC_ARG_WITH(openssl,
 # Help line for libfetch
 AC_ARG_WITH(fetch,
 	AS_HELP_STRING([--with-fetch], [use libfetch as an internal downloader]),
-	[], [with_fetch=check])
+	[], [with_fetch=no])
+
+# Help line for libcurl
+AC_ARG_WITH(curl,
+	AS_HELP_STRING([--with-curl], [use libcurl as an internal downloader]),
+	[], [with_curl=check])
 
 # Help line for documentation
 AC_ARG_ENABLE(doc,
@@ -152,6 +157,18 @@ AS_IF([test "x$with_openssl" != "xno"],
 	AC_MSG_RESULT(no))
 AM_CONDITIONAL([HAVE_LIBSSL], [test "x$ac_cv_lib_ssl_MD5_Final" = "xyes"])
 
+# Enable or disable usage of libcurl
+AC_MSG_CHECKING(whether to link with libcurl)
+AS_IF([test "x$with_curl" != "xno"],
+	[AC_MSG_RESULT(yes)
+	AC_CHECK_LIB([curl], [curl_easy_perform], ,
+	[if test "x$with_curl" != "xcheck"; then
+		AC_MSG_FAILURE([--with-curl was given, but -lcurl was not found])
+	fi],
+	[-lcurl])],
+	AC_MSG_RESULT(no))
+AM_CONDITIONAL([HAVE_LIBCURL], [test "x$ac_cv_lib_curl_curl_easy_perform" = "xyes"])
+
 # Enable or disable usage of libfetch
 AC_MSG_CHECKING(whether to link with libfetch)
 AS_IF([test "x$with_fetch" != "xno"],
-- 
1.7.3.4



More information about the pacman-dev mailing list