summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kellner <gicmo@src.gnome.org>2008-05-21 08:44:12 +0000
committerChristian Kellner <gicmo@src.gnome.org>2008-05-21 08:44:12 +0000
commit9f0d06decd9d7582a49824d555f9121246160b96 (patch)
tree4a8a9374d24272d1306b95a1ca20a2ac7ee5d34b
parent141483915c3daa1a54eaf453599ca4414ceab9a5 (diff)
downloadgvfs-9f0d06decd9d7582a49824d555f9121246160b96.tar.gz
Check for gphoto2 >= 2.4.0. Fixes #531702
svn path=/trunk/; revision=1771
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 77c14c39..4dee5dde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-21 Christian Kellner <gicmo@gnome.org>
+
+ * configure.ac:
+ Check for gphoto2 versions greaten then 2.4.0. Patch from
+ Tom Parker <palfrey@tevp.net>. Fixes #531702
+
2008-05-20 Christian Kellner <gicmo@gnome.org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 8225c837..ad5bf84a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -306,7 +306,7 @@ if test "x$enable_gphoto2" != "xno" -a "x$msg_hal" = "xyes" ; then
if test "x$msg_gphoto2" == "xyes"; then
if test "x$use_gphoto2" == "xyes"; then
- PKG_CHECK_MODULES(GPHOTO2, libgphoto2)
+ PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0)
AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
else
AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])