summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-05-05 01:52:41 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-05-05 01:52:41 +0200
commit0b8453460a96874978cc9703ce0b1a27b6accd67 (patch)
treececdecdb0fee5ed83d38b10ebb4f2296e7c9d27b
parent6134b7ce07f97363a4efe1d87cbac0e3c9b71067 (diff)
downloaddigikam-0b8453460a96874978cc9703ce0b1a27b6accd67.tar.gz
digikam-0b8453460a96874978cc9703ce0b1a27b6accd67.zip
Fix libgphoto2 state on the final configure statement
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--configure.in2
-rw-r--r--digikam/configure.in.bot2
-rw-r--r--digikam/configure.in.in3
3 files changed, 4 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index ba56c42..4d3ddb7 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 39be9fc..8a34d97 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 bff2fd9..9a64dca 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"