gnome-media r3821 - trunk

[jhaitsma svn gnome org]

Author: jhaitsma
Date: Mon Mar 24 20:52:39 2008
New Revision: 3821
URL: http://svn.gnome.org/viewvc/gnome-media?rev=3821&view=rev

Log:
2008-03-24  Jaap A. Haitsma  <jaap haitsma org>

	reviewed by: Marc-Andre Lureau

	* configure.in: Disable gnome-cd and cddb-slave by default
	(Closes: #524097)



Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Mar 24 20:52:39 2008
@@ -69,7 +69,7 @@
 
 # Check for the CDDBSlave2 modules
 PROGRAMS_CDDBSLAVE=""
-AC_ARG_ENABLE([cddbslave],AC_HELP_STRING([--enable-cddbslave], [ enable gnome cd database ]), ,enable_cddbslave=yes)
+AC_ARG_ENABLE([cddbslave],AC_HELP_STRING([--enable-cddbslave], [ enable gnome cd database ]), ,enable_cddbslave=no)
 if test "x$enable_cddbslave" == "xyes"; then
   PKG_CHECK_MODULES(CDDBSLAVE, 	glib-2.0 >= 1.3.7		\
 				gmodule-2.0 >= 1.3.7 		\
@@ -315,7 +315,7 @@
 
 PROGRAMS_GNOME_CD=""
 HAVE_GNOMECD=no
-AC_ARG_ENABLE([gnomecd],AC_HELP_STRING([--enable-gnomecd], [ enable gnome cd player  ]), ,enable_gnomecd=yes)
+AC_ARG_ENABLE([gnomecd],AC_HELP_STRING([--enable-gnomecd], [ enable gnome cd player  ]), ,enable_gnomecd=no)
 if test "x$enable_gnomecd" == "xyes"; then
   PKG_CHECK_MODULES(GNOMECD, \
     gstreamer-$GST_MAJORMINOR >= $GST_REQ \
@@ -547,14 +547,19 @@
 echo "Architecture:           ${CDROM_HOST}"
 echo "Source code location:   ${srcdir}"
 echo "Compiler:               ${CC}"
-echo "System CDRom header:    ${cdrom_header}"
-echo "Default CD device:      ${default_cd_device}"
+echo ""
+echo "cddb-slave:             $enable_cddbslave"
+echo "gnome-cd:               $enable_gnomecd"
+if test x$enable_gnomecd == xyes; then
+  echo "System CDRom header:    ${cdrom_header}"
+  echo "Default CD device:      ${default_cd_device}"
+  echo "OS supports close tray: ${close_tray}"
+fi
 if test x$PROGRAMS_GSTMIXER != x; then
   echo "GStreamer mixer:        yes"
 else
   echo "GStreamer mixer:        no"
 fi
-echo "OS supports close tray: ${close_tray}"
 if test x$PROGRAMS_GSTPROPS != x; then
   echo "GStreamer capplet:      yes"
 else