Imported Upstream version 1.1.3upstream/1.1.3

1 files changed, 61 insertions, 46 deletions

diff --git a/configure b/configure
index cb16f63..57f5b81 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GStreamer 1.1.2.
+# Generated by GNU Autoconf 2.69 for GStreamer 1.1.3.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GStreamer'
 PACKAGE_TARNAME='gstreamer'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='GStreamer 1.1.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='GStreamer 1.1.3'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer'
 PACKAGE_URL=''
 
@@ -753,7 +753,7 @@ XML_CATALOG
 XSLTPROC
 HAVE_PS2PDF
 HAVE_JADETEX
-HAVE_XSLTPROC
+HAVE_DOCBOOK2HTML
 HAVE_DOCBOOK2PS
 HAVE_INTROSPECTION_FALSE
 HAVE_INTROSPECTION_TRUE
@@ -1638,7 +1638,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GStreamer 1.1.2 to adapt to many kinds of systems.
+\`configure' configures GStreamer 1.1.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1709,7 +1709,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GStreamer 1.1.2:";;
+     short | recursive ) echo "Configuration of GStreamer 1.1.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1891,7 +1891,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GStreamer configure 1.1.2
+GStreamer configure 1.1.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2664,7 +2664,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GStreamer $as_me 1.1.2, which was
+It was created by GStreamer $as_me 1.1.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3645,7 +3645,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gstreamer'
- VERSION='1.1.2'
+ VERSION='1.1.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3814,9 +3814,9 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
-  PACKAGE_VERSION_MAJOR=$(echo 1.1.2 | cut -d'.' -f1)
-  PACKAGE_VERSION_MINOR=$(echo 1.1.2 | cut -d'.' -f2)
-  PACKAGE_VERSION_MICRO=$(echo 1.1.2 | cut -d'.' -f3)
+  PACKAGE_VERSION_MAJOR=$(echo 1.1.3 | cut -d'.' -f1)
+  PACKAGE_VERSION_MINOR=$(echo 1.1.3 | cut -d'.' -f2)
+  PACKAGE_VERSION_MICRO=$(echo 1.1.3 | cut -d'.' -f3)
 
 
 
@@ -3827,7 +3827,7 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5
 $as_echo_n "checking nano version... " >&6; }
 
-  NANO=$(echo 1.1.2 | cut -d'.' -f4)
+  NANO=$(echo 1.1.3 | cut -d'.' -f4)
 
   if test x"$NANO" = x || test "x$NANO" = "x0" ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5
@@ -8420,10 +8420,10 @@ fi
 done
 
 
-  GST_CURRENT=102
+  GST_CURRENT=103
   GST_REVISION=0
-  GST_AGE=102
-  GST_LIBVERSION=102:0:102
+  GST_AGE=103
+  GST_LIBVERSION=103:0:103
 
 
 
@@ -21800,15 +21800,15 @@ $as_echo "no" >&6; }
 fi
 
 
-    # Extract the first word of "xsltproc", so it can be a program name with args.
-set dummy xsltproc; ac_word=$2
+    # Extract the first word of "docbook2html", so it can be a program name with args.
+set dummy docbook2html; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HAVE_XSLTPROC+:} false; then :
+if ${ac_cv_prog_HAVE_DOCBOOK2HTML+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$HAVE_XSLTPROC"; then
-  ac_cv_prog_HAVE_XSLTPROC="$HAVE_XSLTPROC" # Let the user override the test.
+  if test -n "$HAVE_DOCBOOK2HTML"; then
+  ac_cv_prog_HAVE_DOCBOOK2HTML="$HAVE_DOCBOOK2HTML" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -21817,7 +21817,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_HAVE_XSLTPROC="yes"
+    ac_cv_prog_HAVE_DOCBOOK2HTML="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -21825,13 +21825,13 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_HAVE_XSLTPROC" && ac_cv_prog_HAVE_XSLTPROC="no"
+  test -z "$ac_cv_prog_HAVE_DOCBOOK2HTML" && ac_cv_prog_HAVE_DOCBOOK2HTML="no"
 fi
 fi
-HAVE_XSLTPROC=$ac_cv_prog_HAVE_XSLTPROC
-if test -n "$HAVE_XSLTPROC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_XSLTPROC" >&5
-$as_echo "$HAVE_XSLTPROC" >&6; }
+HAVE_DOCBOOK2HTML=$ac_cv_prog_HAVE_DOCBOOK2HTML
+if test -n "$HAVE_DOCBOOK2HTML"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_DOCBOOK2HTML" >&5
+$as_echo "$HAVE_DOCBOOK2HTML" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -21915,6 +21915,33 @@ fi
 
 
 
+    # -V option appeared in 0.6.10
+    docbook2html_min_version=0.6.10
+    if test "x$HAVE_DOCBOOK2HTML" != "xno"; then
+      docbook2html_version=`docbook2html --version`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking docbook2html version ($docbook2html_version) >= $docbook2html_min_version" >&5
+$as_echo_n "checking docbook2html version ($docbook2html_version) >= $docbook2html_min_version... " >&6; }
+      if perl -w <<EOF
+        (\$min_version_major, \$min_version_minor, \$min_version_micro ) = "$docbook2html_min_version" =~ /(\d+)\.(\d+)\.(\d+)/;
+        (\$docbook2html_version_major, \$docbook2html_version_minor, \$docbook2html_version_micro ) = "$docbook2html_version" =~ /(\d+)\.(\d+)\.(\d+)/;
+        exit (((\$docbook2html_version_major > \$min_version_major) ||
+  	     ((\$docbook2html_version_major == \$min_version_major) &&
+  	      (\$docbook2html_version_minor >= \$min_version_minor)) ||
+  	     ((\$docbook2html_version_major == \$min_version_major) &&
+  	      (\$docbook2html_version_minor >= \$min_version_minor) &&
+  	      (\$docbook2html_version_micro >= \$min_version_micro)))
+  	     ? 0 : 1);
+EOF
+      then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        HAVE_DOCBOOK2HTML=no
+      fi
+    fi
+
 
   XSLTPROC_FLAGS=--nonet
   DOCBOOK_ROOT=
@@ -21922,19 +21949,7 @@ fi
   TYPE_UC=XML
   DOCBOOK_VERSION=4.1.2
 
-  if test -n "$XML_CATALOG_FILES"; then
-    oldIFS=$IFS
-    IFS=' '
-    for xml_catalog_file in $XML_CATALOG_FILES; do
-      if test -f $xml_catalog_file; then
-        XML_CATALOG=$xml_catalog_file
-        CAT_ENTRY_START='<!--'
-        CAT_ENTRY_END='-->'
-        break
-      fi
-    done
-    IFS=$oldIFS
-  elif test ! -f /etc/xml/catalog; then
+  if test ! -f /etc/xml/catalog; then
     for i in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/sgml/docbook/xsl-stylesheets/ /usr/local/share/xsl/docbook ;
     do
       if test -d "$i"; then
@@ -22212,7 +22227,7 @@ fi
 
 
 
-        if test "x$HAVE_XSLTPROC" = "xyes" && \
+        if test "x$HAVE_DOCBOOK2HTML" = "xyes" && \
        test "x$enable_docbook" = "xyes" && \
        test "x$HAVE_XMLLINT" = "xyes"; then
       DOC_HTML=yes
@@ -25215,7 +25230,7 @@ fi
 
         GLIB_EXTRA_CFLAGS="$GLIB_EXTRA_CFLAGS -DG_THREADS_MANDATORY"
 
-    if test "x$PACKAGE_VERSION_NANO" = "x1" -o "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1"; then
+    if test "x$PACKAGE_VERSION_NANO" = "x1"; then
     GLIB_EXTRA_CFLAGS="$GLIB_EXTRA_CFLAGS -DG_DISABLE_DEPRECATED"
   fi
 
@@ -25228,7 +25243,7 @@ fi
 
 
   if test "x$enable_gobject_cast_checks" = "xauto"; then
-        if test "x$PACKAGE_VERSION_NANO" = "x1" -o "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1"; then
+        if test "x$PACKAGE_VERSION_NANO" = "x1"; then
       enable_gobject_cast_checks=yes
     else
       enable_gobject_cast_checks=no
@@ -25248,7 +25263,7 @@ fi
 
 
   if test "x$enable_glib_assertions" = "xauto"; then
-        if test "x$PACKAGE_VERSION_NANO" = "x1" -o "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1"; then
+        if test "x$PACKAGE_VERSION_NANO" = "x1"; then
       enable_glib_assertions=yes
     else
       enable_glib_assertions=no
@@ -27521,7 +27536,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GStreamer $as_me 1.1.2, which was
+This file was extended by GStreamer $as_me 1.1.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27587,7 +27602,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GStreamer config.status 1.1.2
+GStreamer config.status 1.1.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"