From 56c2cc0f83ce93de97714b119e478960d5dbb02e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 26 Feb 2011 20:21:25 +0000 Subject: [PATCH] curl: add configure check and hook up to build system --- configure.ac | 13 +++++++++++++ ext/Makefile.am | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/configure.ac b/configure.ac index b88f328561..27e2013c18 100644 --- a/configure.ac +++ b/configure.ac @@ -653,6 +653,17 @@ AG_GST_CHECK_FEATURE(COG, [Cog plugin], cog, [ AC_SUBST(COG_LIBS) ]) +dnl *** Curl *** +translit(dnm, m, l) AM_CONDITIONAL(USE_CURL, true) +AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [ + PKG_CHECK_MODULES(CURL, libcurl >= 7.21.0, HAVE_CURL="yes", [ + HAVE_CURL="no" + AC_MSG_RESULT(no) + ]) + AC_SUBST(CURL_CFLAGS) + AC_SUBST(CURL_LIBS) +]) + dnl *** dc1394 *** translit(dnm, m, l) AM_CONDITIONAL(USE_DC1394, true) AG_GST_CHECK_FEATURE(DC1394, [libdc1394], dc1394, [ @@ -1592,6 +1603,7 @@ AM_CONDITIONAL(USE_BZ2, false) AM_CONDITIONAL(USE_CDAUDIO, false) AM_CONDITIONAL(USE_CELT, false) AM_CONDITIONAL(USE_COG, false) +AM_CONDITIONAL(USE_CURL, false) AM_CONDITIONAL(USE_DC1394, false) AM_CONDITIONAL(USE_DIRECTFB, false) AM_CONDITIONAL(USE_DIRAC, false) @@ -1828,6 +1840,7 @@ ext/bz2/Makefile ext/cdaudio/Makefile ext/celt/Makefile ext/cog/Makefile +ext/curl/Makefile ext/dc1394/Makefile ext/dirac/Makefile ext/directfb/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index 9b670d4dbb..f9b55ea522 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -64,6 +64,12 @@ else COG_DIR= endif +if USE_CURL +CURL_DIR=curl +else +CURL_DIR= +endif + if USE_DC1394 DC1394_DIR=dc1394 else @@ -379,6 +385,7 @@ SUBDIRS=\ $(CDAUDIO_DIR) \ $(CELT_DIR) \ $(COG_DIR) \ + $(CURL_DIR) \ $(DC1394_DIR) \ $(DIRAC_DIR) \ $(DIRECTFB_DIR) \