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 /libgphoto2/gphoto2-version.c | |
| parent | 94c0fdb0e15b1309ab3de81de8da5d7ca3912ca4 (diff) | |
| download | libgphoto2-59dbd89143316ae7df9716e6cce59876549648f9.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 'libgphoto2/gphoto2-version.c')
| -rw-r--r-- | libgphoto2/gphoto2-version.c | 45 |
1 files changed, 37 insertions, 8 deletions
diff --git a/libgphoto2/gphoto2-version.c b/libgphoto2/gphoto2-version.c index bacf06a34..6cf16254c 100644 --- a/libgphoto2/gphoto2-version.c +++ b/libgphoto2/gphoto2-version.c @@ -34,12 +34,23 @@ const char **gp_library_version(GPVersionVerbosity verbose) static const char *shrt[] = { PACKAGE_VERSION, -#ifdef INCOMPLETE_CAMLIB_SET - "INCOMPLETE CAMLIB SET (" - INCOMPLETE_CAMLIB_SET +#if GP_CAMLIB_SET_IS_NONSTANDARD + "NON-STANDARD CAMLIB SET" + " (" + GP_CAMLIB_SET +#ifdef GP_CAMLIB_SET_SKIPPING + " SKIPPING " + GP_CAMLIB_SET_SKIPPING +#endif ")", #else - "all camlibs", + "standard camlibs" +#ifdef GP_CAMLIB_SET_SKIPPING + " (SKIPPING " + GP_CAMLIB_SET_SKIPPING + ")" +#endif + , #endif #ifdef HAVE_CC HAVE_CC, @@ -61,12 +72,30 @@ const char **gp_library_version(GPVersionVerbosity verbose) static const char *verb[] = { PACKAGE_VERSION, -#ifdef INCOMPLETE_CAMLIB_SET - "INCOMPLETE CAMLIB SET (" - INCOMPLETE_CAMLIB_SET +#if GP_CAMLIB_SET_IS_NONSTANDARD + "NON-STANDARD CAMLIB SET" +#ifdef GP_CAMLIB_SET_SKIPPING + " SKIPPING SOME" +#endif + " (" + GP_CAMLIB_SET +#ifdef GP_CAMLIB_SET_SKIPPING + " SKIPPING " + GP_CAMLIB_SET_SKIPPING +#endif ")", #else - "all camlibs", + "standard camlib set" +#ifdef GP_CAMLIB_SET_SKIPPING + " SKIPPING SOME" +#endif + " (" + GP_CAMLIB_SET +#ifdef GP_CAMLIB_SET_SKIPPING + " SKIPPING " + GP_CAMLIB_SET_SKIPPING +#endif + ")", #endif #ifdef HAVE_CC HAVE_CC " (C compiler used)", |