rhythmbox r6065 - trunk

[teuf svn gnome org]

Author: teuf
Date: Mon Nov 17 10:14:59 2008
New Revision: 6065
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6065&view=rev

Log:
Don't disable the ipod plugin when hal isn't available

Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Nov 17 10:14:59 2008
@@ -124,13 +124,7 @@
 	  AC_MSG_ERROR([iPod explicitly requested but libgpod couldn't be found])
 	fi
 	if test "x$have_libgpod" = "xyes"; then
-          if test "x$with_hal" = xyes && test "x$enable_hal" = xno; then
-	     AC_MSG_ERROR([iPod explicitly requested but HAL not found or too old])
-	  fi
-          if test "x$enable_hal" = xyes; then
-	     AC_DEFINE(WITH_IPOD_SUPPORT, 1, [Define if iPod support is enabled])
-	     use_ipod=yes
-	  fi
+	  use_ipod=yes
 	  AC_SUBST(IPOD_CFLAGS)
 	  AC_SUBST(IPOD_LIBS)
 	fi
@@ -138,7 +132,6 @@
 AM_CONDITIONAL(USE_IPOD, test x"$use_ipod" = xyes)
 
 dnl mtp support
-
 AC_ARG_WITH(mtp,
             AC_HELP_STRING([--with-mtp],
 			   [Enable MTP support]),,