diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-05-05 01:52:41 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-05-05 01:52:51 +0200 |
| commit | b1d8519f1ef88d5c80e80a93428e2208ea2bb2cd (patch) | |
| tree | 103627994a9975ac4a4227f47d81ded920ea8e38 | |
| parent | 4c3ead55e5914a94e6377b577c9ab5b915f0ece7 (diff) | |
| download | digikam-b1d8519f1ef88d5c80e80a93428e2208ea2bb2cd.tar.gz digikam-b1d8519f1ef88d5c80e80a93428e2208ea2bb2cd.zip | |
Fix libgphoto2 state on the final configure statement
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 0b8453460a96874978cc9703ce0b1a27b6accd67)
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | digikam/configure.in.bot | 2 | ||||
| -rw-r--r-- | digikam/configure.in.in | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/configure.in b/configure.in index ba56c42a..4d3ddb7b 100644 --- a/configure.in +++ b/configure.in @@ -628,7 +628,7 @@ else echo "-- using internal libsqlite3...... YES" fi -if test -z "$GPHOTO_CONFIG" ; then +if test "x$have_libgphoto2" != "xyes"; then echo "-- libgphoto2 library found....... NO" echo "" echo "digiKam needs libgphoto2 library development package." diff --git a/digikam/configure.in.bot b/digikam/configure.in.bot index 39be9fc8..8a34d97b 100644 --- a/digikam/configure.in.bot +++ b/digikam/configure.in.bot @@ -24,7 +24,7 @@ else echo "-- using internal libsqlite3...... YES" fi -if test -z "$GPHOTO_CONFIG" ; then +if test "x$have_libgphoto2" != "xyes"; then echo "-- libgphoto2 library found....... NO" echo "" echo "digiKam needs libgphoto2 library development package." diff --git a/digikam/configure.in.in b/digikam/configure.in.in index bff2fd95..9a64dcac 100644 --- a/digikam/configure.in.in +++ b/digikam/configure.in.in @@ -125,7 +125,7 @@ AC_SUBST(LCMS_LIBS) #------------------------------------------------------------------ KDE_PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.5, - [have_libgphoto2=yes, have_gphoto25=yes], have_libgphoto2=no) + [have_libgphoto2=yes; have_gphoto25=yes], have_libgphoto2=no) if test "x$have_libgphoto2" = "xno"; then KDE_PKG_CHECK_MODULES(GPHOTO2, libgphoto2, have_libgphoto2=yes, have_libgphoto2=no) @@ -140,6 +140,7 @@ if test "x$have_libgphoto2" = "xno"; then AC_SUBST(GPHOTO_CFLAGS) LIB_GPHOTO="`$GPHOTO_CONFIG --libs` `$GPHOTO_PORT_CONFIG --libs`" AC_SUBST(LIB_GPHOTO) + have_libgphoto2=yes else AC_MSG_WARN([gPhoto2 not found.]) DO_NOT_COMPILE="digikam $DO_NOT_COMPILE" |