diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2019-06-26 14:18:56 +0200 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2019-06-26 14:18:56 +0200 |
| commit | c7750565a74471c5ec146bd61d51e48ec3acf460 (patch) | |
| tree | 59b022d22942d7feb036766cb2c2341892271963 | |
| parent | 74f3535099aa8957046bef72c446dabc74b44e11 (diff) | |
| download | libgphoto2-c7750565a74471c5ec146bd61d51e48ec3acf460.tar.gz | |
autoconf magic for detecting libcurl, added to lumix Makefile-files
| -rw-r--r-- | camlibs/lumix/Makefile-files | 4 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/camlibs/lumix/Makefile-files b/camlibs/lumix/Makefile-files index abc00f041..d15ef34c2 100644 --- a/camlibs/lumix/Makefile-files +++ b/camlibs/lumix/Makefile-files @@ -6,7 +6,7 @@ noinst_DATA += lumix/README.lumix EXTRA_LTLIBRARIES += lumix.la lumix_la_SOURCES = lumix/lumix.c -lumix_la_CFLAGS = $(AM_CFLAGS) $(NO_UNUSED_CFLAGS) $(CFLAGS) +lumix_la_CFLAGS = $(AM_CFLAGS) $(NO_UNUSED_CFLAGS) $(CFLAGS) $(LIBXML2_CFLAGS) $(LIBCURL_CFLAGS) lumix_la_LDFLAGS = $(camlib_ldflags) lumix_la_DEPENDENCIES = $(camlib_dependencies) -lumix_la_LIBADD = $(camlib_libadd) -lcurl -lxml2 +lumix_la_LIBADD = $(camlib_libadd) $(LIBCURL_LIBS) $(LIBXML2_LIBS) diff --git a/configure.ac b/configure.ac index 691ccf27a..d16a89a59 100644 --- a/configure.ac +++ b/configure.ac @@ -282,6 +282,13 @@ GP_CHECK_LIBRARY([LIBXML2],[libxml-2.0],[>= 2.0], ) GP_CONFIG_MSG([XML support for Olympus E series],[${have_LIBXML2}]) +GP_CHECK_LIBRARY([LIBCURL],[libcurl],[>= 7.1], + [curl/curl.h],[curl_easy_init],[],[], + [default-on], + [https://www.curl.org] +) +GP_CONFIG_MSG([CURL support for Lumix Wifi],[${have_LIBCURL}]) + dnl --------------------------------------------------------------------------- dnl check for libgd dnl they call it "gdlib" ... confusing. |