gphoto2-cdk.patch

   1 --- gphoto2-2.5.14/configure.ac.orig    2017-07-19 17:05:04.747246216 +0200
   2 +++ gphoto2-2.5.14/configure.ac 2017-07-19 17:24:56.143899271 +0200
   3 @@ -141,8 +141,8 @@
   4  if $try_cdk; then
   5          CPPFLAGS_save="$CPPFLAGS"
   6          CPPFLAGS="-I$cdk_prefix/include $CPPFLAGS"
   7 -        AC_CHECK_HEADER([cdk/cdk.h], [
   8 -                have_cdk=:
   9 +        AC_CHECK_HEADERS([cdk/cdk.h cdk.h], [have_cdk=:])
  10 +        if $have_cdk; then
  11                  AC_PATH_PROG([CDK_CONFIG], [cdk5-config])
  12                  if test -n "${CDK_CONFIG}"; then
  13                          CDK_CFLAGS=`$CDK_CONFIG --cflags`
  14 @@ -160,7 +160,7 @@
  15                          cdk_msg="yes (but without fscale)"
  16                  ])
  17                  LDFLAGS="$LDFLAGS_save"
  18 -        ])
  19 +       fi
  20          CPPFLAGS="$CPPFLAGS_save"
  21  fi
  22  AM_CONDITIONAL([HAVE_CDK], [$have_cdk])
  23 --- gphoto2-2.5.14/gphoto2/gphoto2-cmd-config.c.orig    2015-08-01 13:20:27.000000000 +0200
  24 +++ gphoto2-2.5.14/gphoto2/gphoto2-cmd-config.c 2017-07-19 16:49:28.570590242 +0200
  25 @@ -29,7 +29,12 @@
  26
  27  #include <gphoto2/gphoto2-widget.h>
  28
  29 +#ifdef HAVE_CDK_H
  30 +#include <cdk.h>
  31 +#elif defined(HAVE_CDK_CDK_H)
  32  #include <cdk/cdk.h>
  33 +#endif
  34 +
  35
  36  #ifndef MAX
  37  # define MAX(a, b) ((a) > (b) ? (a) : (b))