summaryrefslogtreecommitdiffstats
path: root/gst-libs
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-02-23 22:31:48 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-02-23 22:31:48 +0000
commit98b68da0a8e990aa2e5529ef5894c326962c05e0 (patch)
tree6e0bdf119e7e024c054fdfa16181a88f064039bf /gst-libs
parent47c01dd0989e38939ee7aa7e19dfcbbefe93a228 (diff)
downloadgst-plugins-bad-98b68da0a8e990aa2e5529ef5894c326962c05e0.tar.gz
gst-plugins-bad-98b68da0a8e990aa2e5529ef5894c326962c05e0.tar.bz2
gst-plugins-bad-98b68da0a8e990aa2e5529ef5894c326962c05e0.zip
versioning gstreamer schemas and install location
Original commit message from CVS: versioning gstreamer schemas and install location
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/gst/gconf/Makefile.am9
-rw-r--r--gst-libs/gst/gconf/gconf.c4
2 files changed, 9 insertions, 4 deletions
diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am
index faec6222..b7a409ef 100644
--- 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 541a086b..49511f90 100644
--- 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 */