diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2019-06-27 11:18:24 +0200 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2019-06-27 11:18:24 +0200 |
| commit | 669ebdcaf9ce82a3ca66db97813348e7b5b42cf5 (patch) | |
| tree | 9d2bb09de9bacc3c4f912c6f8bf1b31048ceb7c6 | |
| parent | dad0a788fcef32e934aad7987d9f202c07b554f6 (diff) | |
| download | libgphoto2-669ebdcaf9ce82a3ca66db97813348e7b5b42cf5.tar.gz | |
try conditional build of camlib
| -rw-r--r-- | camlibs/lumix/Makefile-files | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/camlibs/lumix/Makefile-files b/camlibs/lumix/Makefile-files index d15ef34c2..b037d6158 100644 --- a/camlibs/lumix/Makefile-files +++ b/camlibs/lumix/Makefile-files @@ -3,7 +3,11 @@ EXTRA_DIST += lumix/README.lumix lumix/ChangeLog noinst_DATA += lumix/README.lumix +if BUILD_LUMIX EXTRA_LTLIBRARIES += lumix.la +else +EXTRA_DIST += lumix/lumix.c +endif lumix_la_SOURCES = lumix/lumix.c lumix_la_CFLAGS = $(AM_CFLAGS) $(NO_UNUSED_CFLAGS) $(CFLAGS) $(LIBXML2_CFLAGS) $(LIBCURL_CFLAGS) diff --git a/configure.ac b/configure.ac index d16a89a59..0bcf25a44 100644 --- a/configure.ac +++ b/configure.ac @@ -289,6 +289,8 @@ GP_CHECK_LIBRARY([LIBCURL],[libcurl],[>= 7.1], ) GP_CONFIG_MSG([CURL support for Lumix Wifi],[${have_LIBCURL}]) +AM_CONDITIONAL([BUILD_LUMIX], [test -n "$have_LIBCURL" && test "X$have_LIBCURL" != "Xno" && test -n "$have_LIBXML2" && test "X$have_LIBXML2" != "Xno"]) + dnl --------------------------------------------------------------------------- dnl check for libgd dnl they call it "gdlib" ... confusing. |