versioning gstreamer schemas and install location

Original commit message from CVS:
versioning gstreamer schemas and install location

diff --git a/ChangeLog b/ChangeLog
index 660b08a..5407423 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-23  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * configure.ac:
+       * gconf/Makefile.am:
+       * gconf/gstreamer.schemas:
+       * gst-libs/gst/gconf/Makefile.am:
+       * gst-libs/gst/gconf/gconf.c:
+          version gconf schemas and install locations
+
 2004-02-23  Benjamin Otte  <otte@gnome.org>
 
        * ext/xine/xineinput.c: (gst_xine_input_dispose):

diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am
index faec622..b7a409e 100644 (file)
--- a/gst-libs/gst/gconf/Makefile.am
+++ b/gst-libs/gst/gconf/Makefile.am
@@ -9,11 +9,14 @@ libgstgconf_@GST_MAJORMINOR@include_HEADERS = gconf.h
 
 noinst_PROGRAMS = test-gconf
 
-test_gconf_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
+# add define for GST_GCONF_DIR
+DIR_CFLAGS=-DGST_GCONF_DIR=\"/system/gstreamer-@GST_MAJORMINOR@\"
+
+test_gconf_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
 test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconf-@GST_MAJORMINOR@.la
 
-libgstgconf_@GST_MAJORMINOR@_la_LIBADD = $(GCONF_LIBS) $(GST_LIBS)
-libgstgconf_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
+libgstgconf_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(GCONF_LIBS)
+libgstgconf_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
 libgstgconf_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@
 
 EXTRA_DIST = gstreamer-gconf.pc.in gstreamer-gconf-uninstalled.pc.in

diff --git a/gst-libs/gst/gconf/gconf.c b/gst-libs/gst/gconf/gconf.c
index 541a086..49511f9 100644 (file)
--- a/gst-libs/gst/gconf/gconf.c
+++ b/gst-libs/gst/gconf/gconf.c
@@ -27,7 +27,9 @@
 
 #include "gconf.h"
 
-#define GST_GCONF_DIR "/system/gstreamer"
+#ifndef GST_GCONF_DIR
+#error "GST_GCONF_DIR is not defined !"
+#endif
 
 static GConfClient *_gst_gconf_client = NULL; /* GConf connection */