diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-14 11:48:34 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-16 17:09:13 +0100 |
| commit | 59dbd89143316ae7df9716e6cce59876549648f9 (patch) | |
| tree | 7b87b56e125447782f7b45bf804873e84c419bf8 /camlibs/lumix/lumix.c | |
| parent | 94c0fdb0e15b1309ab3de81de8da5d7ca3912ca4 (diff) | |
| download | libgphoto2-issue-467-wip4.tar.gz | |
Set based camlib definition and --with-camlibs handlingissue-467-wip4
This uses proper set operations both for GP_CAMLIB and for handling
the --with-camlibs value. This allows all GP_CAMLIB definitions to
be present at autoreconf time (as m4 code) time but some being
conditional at the time of the configure run (in the sh code).
The ./configure output is still a bit verbose, but we can reduce that
verbosity later when we have found out that this works well on people's
different systems.
Fixes: https://github.com/gphoto/libgphoto2/issues/467
Diffstat (limited to 'camlibs/lumix/lumix.c')
| -rw-r--r-- | camlibs/lumix/lumix.c | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/camlibs/lumix/lumix.c b/camlibs/lumix/lumix.c index 3115b0648..5cb8ee450 100644 --- a/camlibs/lumix/lumix.c +++ b/camlibs/lumix/lumix.c @@ -27,17 +27,13 @@ #include <string.h> #include <errno.h> -#ifdef HAVE_LIBCURL -# include <curl/curl.h> -#endif +#include <curl/curl.h> #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -# include <libxml/tree.h> -# include <libxml/xmlmemory.h> -# include <libxml/xmlreader.h> -#endif +#include <libxml/parser.h> +#include <libxml/tree.h> +#include <libxml/xmlmemory.h> +#include <libxml/xmlreader.h> #include <sys/socket.h> @@ -87,7 +83,6 @@ # define N_(String) (String) #endif -#if defined(HAVE_LIBCURL) && defined(HAVE_LIBXML2) char* CDS_Control = ":60606/Server0/CDS_control"; int ReadoutMode = 2; // this should be picked up from the settings.... 0-> JPG; 1->RAW; 2 -> Thumbnails @@ -1919,19 +1914,6 @@ camera_init (Camera *camera, GPContext *context) return GP_ERROR_IO; } -#else -/* no XML2 or no CURL -> no camera here */ -int -camera_init (Camera *camera, GPContext *context) -{ - return GP_OK; -} - -int camera_abilities (CameraAbilitiesList *list) -{ - return GP_OK; -} -#endif int camera_id (CameraText *id) |