mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-23 18:21:04 +00:00
versioning gstreamer schemas and install location
Original commit message from CVS: versioning gstreamer schemas and install location
This commit is contained in:
parent
78b3d9bcba
commit
31cb41bde7
3 changed files with 18 additions and 4 deletions
|
@ -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):
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
||||
|
|
Loading…
Reference in a new issue