From 98b68da0a8e990aa2e5529ef5894c326962c05e0 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 23 Feb 2004 22:31:48 +0000 Subject: versioning gstreamer schemas and install location Original commit message from CVS: versioning gstreamer schemas and install location --- gst-libs/gst/gconf/Makefile.am | 9 ++++++--- gst-libs/gst/gconf/gconf.c | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'gst-libs') 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 */ -- cgit v1.2.1