rhythmbox r5691 - in trunk: . doc/reference rhythmdb shell

[jmatthew svn gnome org]

Author: jmatthew
Date: Tue Apr 29 11:17:13 2008
New Revision: 5691
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5691&view=rev

Log:
2008-04-29  Jonathan Matthew  <jonathan d14n org>

	patch by: Paul Drain  <paul operationaldynamics com>

	* configure.ac:
	* doc/reference/Makefile.am:
	* rhythmdb/Makefile.am:
	* shell/rb-shell.c:
	Remove remnants of gda support.  Fixes #530389.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/doc/reference/Makefile.am
   trunk/rhythmdb/Makefile.am
   trunk/shell/rb-shell.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Apr 29 11:17:13 2008
@@ -228,29 +228,19 @@
 
 dnl Database
 AC_ARG_WITH(database,
-              AC_HELP_STRING([--with-database=tree|libgda],
+              AC_HELP_STRING([--with-database=tree],
 			     [Select the database to use (default tree)]),,
 	      with_database=tree)
 AM_CONDITIONAL(USE_TREEDB, test x"$with_database" = xtree)
-AM_CONDITIONAL(USE_GDADB, test x"$with_database" = xlibgda)
 
-GDA_CFLAGS=""
-GDA_LIBS=""
 case "x$with_database" in
   "xtree")
     AC_DEFINE(WITH_RHYTHMDB_TREE, 1, [Define if you are using the RhythmDB tree database])
     ;;
-  "xlibgda")
-    AC_DEFINE(WITH_RHYTHMDB_GDA, 1, [Define if you are using the RhythmDB sqlite/libgda database])
-    dnl FIXME: check for sqlite, too?
-    PKG_CHECK_MODULES(GDA, libgda > 1.0.3)
-    ;;
   *)
     AC_MSG_ERROR([Unknown database selected])
     ;;
 esac
-AC_SUBST(GDA_CFLAGS)
-AC_SUBST(GDA_LIBS)
 
 dnl Database debugging
 AC_ARG_WITH(rhythmdb-debug,
@@ -1106,8 +1096,6 @@
 AC_MSG_NOTICE([Rhythmbox was configured with the following options:])
 if test x"$with_database" = xtree; then
 	AC_MSG_NOTICE([** Tree database is enabled])
-elif test x"$with_database" = xlibgda; then
-	AC_MSG_NOTICE([** libgda/sqlite database is enabled])
 else
 	AC_MSG_ERROR([Unknown database!])
 fi

Modified: trunk/doc/reference/Makefile.am
==============================================================================
--- trunk/doc/reference/Makefile.am	(original)
+++ trunk/doc/reference/Makefile.am	Tue Apr 29 11:17:13 2008
@@ -36,7 +36,6 @@
 	mkdtemp.h \
 	rb-cut-and-paste-code.h \
 	rb-marshal.h \
-	rhythmdb-gda.h \
 	rhythmdb-private.h \
 	sexy-tooltip.h \
 	sexy-icon-entry.h \

Modified: trunk/rhythmdb/Makefile.am
==============================================================================
--- trunk/rhythmdb/Makefile.am	(original)
+++ trunk/rhythmdb/Makefile.am	Tue Apr 29 11:17:13 2008
@@ -4,8 +4,7 @@
 
 librhythmdb_la_LDFLAGS = -export-dynamic
 librhythmdb_la_LIBADD = 				\
-	$(GIO_LIBS)					\
-	$(GDA_LIBS)
+	$(GIO_LIBS)					
 
 INCLUDES = 						\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
@@ -15,7 +14,6 @@
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/metadata			\
 	-I$(top_builddir)/lib                           \
-	$(GDA_CFLAGS)					\
 	$(RHYTHMBOX_CFLAGS)				\
 	$(GIO_CFLAGS)					\
 	$(NO_STRICT_ALIASING_CFLAGS)
@@ -41,8 +39,3 @@
 if USE_TREEDB
 librhythmdb_la_SOURCES += rhythmdb-tree.h rhythmdb-tree.c
 endif
-
-if USE_GDADB
-librhythmdb_la_SOURCES += rhythmdb-gda.h rhythmdb-gda.c
-endif
-

Modified: trunk/shell/rb-shell.c
==============================================================================
--- trunk/shell/rb-shell.c	(original)
+++ trunk/shell/rb-shell.c	Tue Apr 29 11:17:13 2008
@@ -56,8 +56,6 @@
 #include "rb-dialog.h"
 #ifdef WITH_RHYTHMDB_TREE
 #include "rhythmdb-tree.h"
-#elif defined(WITH_RHYTHMDB_GDA)
-#include "rhythmdb-gda.h"
 #else
 #error "no database specified. configure broken?"
 #endif