[Gnash-commit] gnash ChangeLog configure.ac [release-0-8-0]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release-0-8-0
Changes by:     Sandro Santilli <strk>  07/06/06 14:50:36

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        backport:
                * configure.ac: If no --enable-media was specified, use the 
first
                  detected one in this order: ffmpeg/gst/mad. This is to allow
                  ./configure with no args to be more failsafe (useful on 'make
                  distcheck').

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.3451.2.23&r2=1.3451.2.24
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.331.4.2&r2=1.331.4.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3451.2.23
retrieving revision 1.3451.2.24
diff -u -b -r1.3451.2.23 -r1.3451.2.24
--- ChangeLog   6 Jun 2007 13:33:15 -0000       1.3451.2.23
+++ ChangeLog   6 Jun 2007 14:50:35 -0000       1.3451.2.24
@@ -1,5 +1,12 @@
 2007-06-06 Sandro Santilli <address@hidden>
 
+        * configure.ac: If no --enable-media was specified, use the first
+          detected one in this order: ffmpeg/gst/mad. This is to allow
+          ./configure with no args to be more failsafe (useful on 'make
+          distcheck'). 
+
+2007-06-06 Sandro Santilli <address@hidden>
+
        * testsuite/misc-ming.all/eventSoundTest1-Runner.cpp: don't test sound
          if sound is not supported.
        * testsuite/MovieTester.{cpp,h}: Don't abort if sound support wasn't

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.331.4.2
retrieving revision 1.331.4.3
diff -u -b -r1.331.4.2 -r1.331.4.3
--- configure.ac        6 Jun 2007 00:36:28 -0000       1.331.4.2
+++ configure.ac        6 Jun 2007 14:50:36 -0000       1.331.4.3
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.331.4.2 2007/06/06 00:36:28 rsavoye Exp $
+dnl $Id: configure.ac,v 1.331.4.3 2007/06/06 14:50:36 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -317,13 +317,26 @@
 dnl  Select media handler
 dnl --------------------------------------------------------
 
+media_handler_specified=false
 AC_ARG_ENABLE(media,
  AC_HELP_STRING([--enable-media=handler], [Enable media handling support using 
the specified handler: ffmpeg, mad, GST (Gstreamer) or none (no sound) 
[[ffmpeg]] ]),
  [case "${enableval}" in
-   GST|gst) media_handler=gst ;;
-   ffmpeg|FFMPEG) media_handler=ffmpeg  ;;
-   mad|MAD) media_handler=mad  ;;
-   no|NO|none) media_handler=none ;;
+   GST|gst)
+     media_handler=gst
+     media_handler_specified=true
+     ;;
+   ffmpeg|FFMPEG)
+     media_handler=ffmpeg 
+     media_handler_specified=true
+     ;;
+   mad|MAD)
+     media_handler=mad 
+     media_handler_specified=true
+     ;;
+   no|NO|none)
+     media_handler=none
+     media_handler_specified=true
+     ;;
    *) AC_MSG_ERROR([bad value ${enableval} for --enable-media option]) ;;
   esac],
  [media_handler=ffmpeg]
@@ -856,20 +869,38 @@
 
 if test x"$media_handler" = x"ffmpeg"; then
   GNASH_PATH_FFMPEG
-  # If the library is not found, this will be reported and nogo'd at the end.
-  # if test x"${ac_cv_path_ffmpeg_lib}" = x; then
-  #   AC_MSG_WARN([ffmpeg was specified as the media decoder but its library 
could not be found])
-  # fi
+  if test x"${media_handler_specified}" = xfalse; then
+     # If the library is not found, or its version is not ok, we'll try gst
+     if test x"${ac_cv_path_ffmpeg_lib}" = x -o x"${ffmpeg_version}" != xok; 
then
+       AC_MSG_WARN([No appropriate ffmpeg library found, will try using 
gstreamer.])
+       media_handler=gst
+     fi
+  fi
 fi
 
+if test "$media_handler" = "gst"; then
+  GNASH_PKG_FIND(gstreamer, [gst/gst.h], [gstreamer library], gst_init, [0.10])
+  if test x"${media_handler_specified}" = xfalse; then
+    # If the library is not found, or its version is not ok, we'll try mad
+    if test x"$GSTREAMER_LIBS" = x; then
+       AC_MSG_WARN([No appropriate gstreamer library found, will try using 
mad.])
+       media_handler=mad
+    fi
+  fi
+fi
+
+
 if test x"$media_handler" = x"mad"; then
   dnl Will set MAD_LIBS and MAD_CFLAGS.
   dnl Handles --with-mad-incl and --with-mad-lib
   GNASH_PKG_FIND(mad, [mad.h], [mad library], mad_copyright)
-  # If the library is not found, this will be reported and nogo'd at the end.
-  # if test x"${ac_cv_path_mad_lib}" = x ; then
-  #   AC_MSG_WARN([Libmad was specified as the media decoder, but it could not 
be found])
-  # fi
+  if test x"${media_handler_specified}" = xfalse; then
+    # If the library is not found, we'll disable media handling
+    if test x"${ac_cv_path_mad_lib}" = x ; then
+      AC_MSG_WARN([No libmad found, disabling media handlign.])
+      media_handler=none
+    fi
+  fi
 fi
 
 dnl I'm kinda lazy, get rid of this later... //Markus
@@ -895,10 +926,6 @@
   *)
 esac
 
-if test "$media_handler" = "gst"; then
-  GNASH_PKG_FIND(gstreamer, [gst/gst.h], [gstreamer library], gst_init, [0.10])
-fi
-
 dnl I'm kinda lazy, get rid of this later... //Markus
 AM_CONDITIONAL(HAVE_GST, test x$media_handler = xgst)