gvfs r1559 - trunk

[hadess svn gnome org]

Author: hadess
Date: Wed Mar  5 17:36:40 2008
New Revision: 1559
URL: http://svn.gnome.org/viewvc/gvfs?rev=1559&view=rev

Log:
2008-03-05  Bastien Nocera  <hadess hadess net>

	* configure.ac: Disable gphoto2 building when
	HAL is disabled as well (Closes: #519872)



Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Mar  5 17:36:40 2008
@@ -283,7 +283,7 @@
 GPHOTO2_LIBS=
 GPHOTO2_CFLAGS=
 
-if test "x$enable_gphoto2" != "xno"; then
+if test "x$enable_gphoto2" != "xno" -a "x$msg_hal" = "xyes" ; then
   PKG_CHECK_EXISTS(libgphoto2, msg_gphoto2=yes)
 
   # Need OS tweaks in hal volume monitor backend