darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try conditional build of camlib

Browse Source
This commit is contained in:
Marcus Meissner
2019-06-27 11:18:24 +02:00
parent dad0a788fc
commit 669ebdcaf9
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
camlibs/lumix/Makefile-files
View File

@@ -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)

2
configure.ac
View File

@@ -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.