Rename DATADIR to GST_DATADIR to avoid build problems

Original commit message from CVS:
* configure.ac:
* gst/gstpreset.c:
Rename DATADIR to GST_DATADIR to avoid build problems
on win32. Patch By: David Schleef <ds@schleef.org>
Fixes: #536857

diff --git a/ChangeLog b/ChangeLog
index 3a58dab..9d57710 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-11  Jan Schmidt  <jan.schmidt@sun.com>
+
+       * configure.ac:
+       * gst/gstpreset.c:
+       Rename DATADIR to GST_DATADIR to avoid build problems
+       on win32. Patch By: David Schleef <ds@schleef.org>
+       Fixes: #536857
+
 2008-06-05  Sebastian Dröge  <slomo@circular-chaos.org>
 
        * configure.ac:

diff --git a/common b/common
index 68fb019..46ec7df 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 68fb019d4044b9878aef4ca223fc13c19ffc7d0c
+Subproject commit 46ec7dfc1c09ff550ed6b7a4e0d3f2b2ac7d3ee8

diff --git a/configure.ac b/configure.ac
index fcb01b2..3a54789 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -524,11 +524,11 @@ GST_LICENSE="LGPL"
 AC_DEFINE_UNQUOTED(GST_LICENSE, "$GST_LICENSE", [GStreamer license])
 AC_SUBST(GST_LICENSE)
 
-dnl define LIBDIR, DATADIR so we can inform people where we live
+dnl define LIBDIR, GST_DATADIR so we can inform people where we live
 AS_AC_EXPAND(LIBDIR, $libdir)
 AC_DEFINE_UNQUOTED(LIBDIR, "$LIBDIR", [library dir])
 AS_AC_EXPAND(DATADIR, $datadir)
-AC_DEFINE_UNQUOTED(DATADIR, "$DATADIR", [data dir])
+AC_DEFINE_UNQUOTED(GST_DATADIR, "$DATADIR", [data dir])
 
 dnl set location of plugin directory
 AG_GST_SET_PLUGINDIR

diff --git a/gst/gstpreset.c b/gst/gstpreset.c
index b32aa3f..775535e 100644 (file)
--- a/gst/gstpreset.c
+++ b/gst/gstpreset.c
@@ -149,8 +149,8 @@ preset_get_paths (GstPreset * preset, const gchar ** preset_user_path,
     if (!(preset_path = g_type_get_qdata (type, preset_system_path_quark))) {
       gchar *preset_dir;
 
-      /* system presets in '$DATADIR/gstreamer-0.10/presets/GstAudioPanorama.prs' */
-      preset_dir = g_build_filename (DATADIR, "gstreamer-" GST_MAJORMINOR,
+      /* system presets in '$GST_DATADIR/gstreamer-0.10/presets/GstAudioPanorama.prs' */
+      preset_dir = g_build_filename (GST_DATADIR, "gstreamer-" GST_MAJORMINOR,
           "presets", NULL);
       GST_INFO_OBJECT (preset, "system_preset_dir: '%s'", preset_dir);
       preset_path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s.prs",