more define fixes

Original commit message from CVS:
more define fixes

diff --git a/check/gst-libs/controller.c b/check/gst-libs/controller.c
index affeec5..cd83e2b 100644 (file)
--- a/check/gst-libs/controller.c
+++ b/check/gst-libs/controller.c
@@ -208,7 +208,7 @@ GST_PLUGIN_DEFINE_STATIC (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "gst-test",
     "controller test plugin - several unit test support elements",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN);
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
 
 /*
 static void __attribute__ ((constructor))

diff --git a/check/gst/gstplugin.c b/check/gst/gstplugin.c
index 7278069..8362dfd 100644 (file)
--- a/check/gst/gstplugin.c
+++ b/check/gst/gstplugin.c
@@ -40,8 +40,8 @@ static GstPluginDesc plugin_desc = {
   VERSION,
   GST_LICENSE,
   PACKAGE,
-  GST_PACKAGE,
-  GST_ORIGIN,
+  GST_PACKAGE_NAME,
+  GST_PACKAGE_ORIGIN,
 
   GST_PADDING_INIT
 };
@@ -150,8 +150,8 @@ GST_START_TEST (test_find_plugin)
   fail_unless_equals_string (plugin->desc.version, VERSION);
   fail_unless_equals_string (plugin->desc.license, "LGPL");
   fail_unless_equals_string (plugin->desc.source, "gstreamer");
-  fail_unless_equals_string (plugin->desc.package, GST_PACKAGE);
-  fail_unless_equals_string (plugin->desc.origin, GST_ORIGIN);
+  fail_unless_equals_string (plugin->desc.package, GST_PACKAGE_NAME);
+  fail_unless_equals_string (plugin->desc.origin, GST_PACKAGE_ORIGIN);
 
   gst_object_unref (plugin);
 }

diff --git a/configure.ac b/configure.ac
index 7ed2016..8dc6e97 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -405,7 +405,7 @@ dnl *** FIXME: name this part
 
 dnl set license and copyright notice
 GST_LICENSE="LGPL"
-AC_DEFINE(GST_LICENSE, "$GST_LICENSE", [GStreamer license])
+AC_DEFINE_UNQUOTED(GST_LICENSE, "$GST_LICENSE", [GStreamer license])
 AC_SUBST(GST_LICENSE)
 
 dnl define LIBDIR so we can inform people where we live

diff --git a/tests/check/gst/gstplugin.c b/tests/check/gst/gstplugin.c
index 7278069..8362dfd 100644 (file)
--- a/tests/check/gst/gstplugin.c
+++ b/tests/check/gst/gstplugin.c
@@ -40,8 +40,8 @@ static GstPluginDesc plugin_desc = {
   VERSION,
   GST_LICENSE,
   PACKAGE,
-  GST_PACKAGE,
-  GST_ORIGIN,
+  GST_PACKAGE_NAME,
+  GST_PACKAGE_ORIGIN,
 
   GST_PADDING_INIT
 };
@@ -150,8 +150,8 @@ GST_START_TEST (test_find_plugin)
   fail_unless_equals_string (plugin->desc.version, VERSION);
   fail_unless_equals_string (plugin->desc.license, "LGPL");
   fail_unless_equals_string (plugin->desc.source, "gstreamer");
-  fail_unless_equals_string (plugin->desc.package, GST_PACKAGE);
-  fail_unless_equals_string (plugin->desc.origin, GST_ORIGIN);
+  fail_unless_equals_string (plugin->desc.package, GST_PACKAGE_NAME);
+  fail_unless_equals_string (plugin->desc.origin, GST_PACKAGE_ORIGIN);
 
   gst_object_unref (plugin);
 }

diff --git a/tests/check/libs/controller.c b/tests/check/libs/controller.c
index affeec5..cd83e2b 100644 (file)
--- a/tests/check/libs/controller.c
+++ b/tests/check/libs/controller.c
@@ -208,7 +208,7 @@ GST_PLUGIN_DEFINE_STATIC (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "gst-test",
     "controller test plugin - several unit test support elements",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN);
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
 
 /*
 static void __attribute__ ((constructor))