various fixes

Original commit message from CVS:
various fixes

diff --git a/ChangeLog b/ChangeLog
index 8499d15..491e66b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2004-02-12  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+       * configure.ac:
+          fix gcov help output
+          move calls to and use new GST_CHECK_DISABLE_SUBSYSTEM
+       * docs/random/release:
+          some updated releasing notes
+       * gstreamer.spec.in:
+          more updates
+
+2004-02-12  Thomas Vander Stichele  <thomas at apestaart dot org>
+
        * docs/faq/faq.xml:
        * docs/manual/manual.xml:
        * docs/pwg/pwg.xml:

diff --git a/common b/common
index 59d3c43..d7fa140 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 59d3c4334b32261908261a163b4633532293492d
+Subproject commit d7fa1407cff7d2054ba22ac6824eba4086fdd047

diff --git a/configure.ac b/configure.ac
index 7abdcde..47294cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,18 @@ if test "x$GST_CVS" = "xyes"; then
   AC_DEFINE(GST_LEVEL_DEFAULT, GST_LEVEL_ERROR, [Default errorlevel to use])
 fi
 
+dnl subsystems - can influence other decisions so needs to be high up
+GST_CHECK_SUBSYSTEM_DISABLE(GST_DEBUG,[debugging subsystem])
+GST_CHECK_SUBSYSTEM_DISABLE(LOADSAVE,[pipeline XML load/save])
+GST_CHECK_SUBSYSTEM_DISABLE(PARSE,[command-line parser])
+GST_CHECK_SUBSYSTEM_DISABLE(TRACE,[tracing subsystem])
+GST_CHECK_SUBSYSTEM_DISABLE(ALLOC_TRACE,[allocation tracing])
+GST_CHECK_SUBSYSTEM_DISABLE(REGISTRY,[plugin registry])
+GST_CHECK_SUBSYSTEM_DISABLE(ENUMTYPES,[enum types])
+GST_CHECK_SUBSYSTEM_DISABLE(INDEX,[index])
+GST_CHECK_SUBSYSTEM_DISABLE(PLUGIN,[plugin])
+GST_CHECK_SUBSYSTEM_DISABLE(URI,[uri handlers])
+
 dnl ##############################
 dnl # Do automated configuration #
 dnl ##############################
@@ -168,7 +180,7 @@ if test x$HAVE_CPU_PPC = xyes ; then
 fi
 
 AC_ARG_ENABLE(gcov,
-  [--enable-gcov         compile with coverage profiling instrumentation (gcc only)],
+  AC_HELP_STRING([--enable-gcov],[compile with coverage profiling instrumentation (gcc only)]),
   enable_gcov=$enableval,enable_gcov=no)
 if test x$enable_gcov = xyes ; then
   AS_COMPILER_FLAG(["-fprofile-arcs"],
@@ -208,16 +220,16 @@ GST_PKG_DEPS="glib-2.0, gobject-2.0, gmodule-2.0, gthread-2.0"
 AC_SUBST(GST_PKG_DEPS)
   
 dnl === libxml 2 ===
-if test "x$GST_DISABLE_LOADSAVE" = "xtrue" && test "x$GST_DISABLE_REGISTRY" = "xtrue"
+if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes"
 then
+  AC_MSG_NOTICE([Registry and load/save are disabled, not checking for libxml2])
+else
   dnl Minimum required version of libxml2
   LIBXML2_REQ="2.4.9"
   AC_SUBST(LIBXML2_REQ)
 
   dnl check for libxml2
   GST_LIBXML2_CHECK()
-else
-  AC_MSG_NOTICE([Registry and load/save are disabled, not checking for libxml2])
 fi
 
 dnl popt checks
@@ -400,28 +412,6 @@ AC_HELP_STRING([--disable-debug],[disable addition of -g debugging info]),
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
 esac],
 [USE_DEBUG=yes]) dnl Default value
-translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_GST_DEBUG, true)
-GST_SUBSYSTEM_DISABLE(GST_DEBUG,[debugging subsystem])
-
-translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_LOADSAVE, true)
-GST_SUBSYSTEM_DISABLE(LOADSAVE,[pipeline XML load/save])
-translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_PARSE, true)
-GST_SUBSYSTEM_DISABLE(PARSE,[command-line parser])
-translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_TRACE, true)
-GST_SUBSYSTEM_DISABLE(TRACE,[tracing subsystem])
-translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_ALLOC_TRACE, true)
-GST_SUBSYSTEM_DISABLE(ALLOC_TRACE,[allocation tracing])
-
-translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_REGISTRY, true)
-GST_SUBSYSTEM_DISABLE(REGISTRY,[plugin registry])
-translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_ENUMTYPES, true)
-GST_SUBSYSTEM_DISABLE(ENUMTYPES,[enum types])
-translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_INDEX, true)
-GST_SUBSYSTEM_DISABLE(INDEX,[index])
-translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_PLUGIN, true)
-GST_SUBSYSTEM_DISABLE(PLUGIN,[plugin])
-translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_URI, true)
-GST_SUBSYSTEM_DISABLE(URI,[uri handlers])
 
 dnl ################################################
 dnl # Set defines according to variables set above #

diff --git a/docs/random/release b/docs/random/release
index 5b7df67..e45ecff 100644 (file)
--- a/docs/random/release
+++ b/docs/random/release
@@ -82,23 +82,20 @@ TODO :
     lynx -dump http://gstreamer.net/releases/$(module)/$(version) > NEWS
     or
     links -dump "http://gstreamer.net/releases/$(module)/$(version)" > NEWS
+    (FIXME: still need to remove the menu from this manually, maybe make
+    some xslt instead to do this ?)
 
   - update web site docs
     - release-specific docs should go in CVS
     - change docs/current symlink
   - remove the nano version number in configure.ac, AS_VERSION
   - tag tree
-    - policy is at http://gstreamer.net/dev/cvs.php
-    - we stopped adding CODENAMES to cvs
-      --> all of this is not done anymore
-      - decide on a tag name : RELEASE-(VERSION)
-      - tag; for example for 0.6.3 :
+    for example for 0.6.3 :
            cvs tag RELEASE-0_6_3
-  - add tag 
   - roll the tarball, build rpms
-  - FIXME: update status table cvs status and then click on the release link
-           http://gstreamer.net/admin.php is the portal to all of this
-           where to get the password, what should we do here ?
+  - run "make upload" from gstreamer/docs to get the new docs online
+  - change www/src/htdocs/entities.gst with the new version numbers
+  - add a news item to the news.xml
 
 Post-Release Period
 -------------------

diff --git a/gstreamer.spec.in b/gstreamer.spec.in
index a5ae9f3..52f3ecb 100644 (file)
--- a/gstreamer.spec.in
+++ b/gstreamer.spec.in
@@ -190,6 +190,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gstreamer-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-control-%{majorminor}.pc
                                                                                 
+%{_datadir}/gstreamer-%{majorminor}/doc
 %{_datadir}/gtk-doc/html/gstreamer-%{majorminor}/*
 %{_datadir}/gtk-doc/html/gstreamer-libs-%{majorminor}/*