From aedfc2e296d3bcc5009f87482329bf31cf6baa8d Mon Sep 17 00:00:00 2001 From: J. Ali Harlow Date: Tue, 6 Jan 2009 16:00:32 +0000 Subject: [PATCH] Make curl an optional dependancy --- configure.ac | 11 ++++++++++- src/main.c | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index dd40a0b..56f2ea0 100644 --- a/configure.ac +++ b/configure.ac @@ -122,7 +122,16 @@ fi AC_MSG_RESULT($have_gcc4) -PKG_CHECK_MODULES(CURL, [libcurl]) +AC_ARG_WITH([curl], + [AS_HELP_STRING([--without-curl], [disable support for curl])], + [], + [with_curl=yes]) + +CURL_CFLAGS= +CURL_LIBS= +AS_IF([test "x$with_curl" != xno], + [PKG_CHECK_MODULES(CURL, [libcurl]) + AC_DEFINE([HAVE_CURL], [1], [Define if you have curl])]) AC_SUBST(CURL_CFLAGS) AC_SUBST(CURL_LIBS) diff --git a/src/main.c b/src/main.c index 9ee2023..09bf2e3 100644 --- a/src/main.c +++ b/src/main.c @@ -19,6 +19,8 @@ #define _GNU_SOURCE +#include "config.h" + #include #include #include @@ -28,7 +30,9 @@ #include #include #include +#ifdef HAVE_CURL #include +#endif #include #include #include "razor.h" @@ -348,6 +352,9 @@ show_progress(void *clientp, static int download_if_missing(const char *url, const char *file) { +#ifndef HAVE_CURL + return 1; +#else CURL *curl; struct stat buf; char error[256]; @@ -398,6 +405,7 @@ download_if_missing(const char *url, const char *file) curl_easy_cleanup(curl); return 0; +#endif /* HAVE_CURL */ } #define YUM_URL "http://download.fedora.redhat.com" \ -- 1.7.1