[xiph-commits] r3480 - browser_plugin/trunk

[j at svn.annodex.net]

Author: j
Date: 2008-02-16 20:39:07 -0800 (Sat, 16 Feb 2008)
New Revision: 3480

Modified:
   browser_plugin/trunk/configure.ac
Log:
cleanup build deps, all done via liboggplay

Modified: browser_plugin/trunk/configure.ac
===================================================================
--- browser_plugin/trunk/configure.ac	2008-02-17 04:24:51 UTC (rev 3479)
+++ browser_plugin/trunk/configure.ac	2008-02-17 04:39:07 UTC (rev 3480)
@@ -41,78 +41,12 @@
 esac
 
 dnl
-dnl  Detect oggz
-dnl
-
-dnl Minimum required version of liboggz
-browser_plugin_OGGZ="0.9.5"
-
-PKG_CHECK_MODULES(OGGZ, oggz > "$browser_plugin_OGGZ", HAVE_OGGZ="yes", HAVE_OGGZ="no")
-
-if test "$HAVE_OGGZ" = "yes" ; then
-  AC_DEFINE(HAVE_OGGZ, [], [Define if have liboggz])
-  AC_SUBST(OGGZ_CFLAGS)
-  AC_SUBST(OGGZ_LIBS)
-else
-  PKG_CHECK_MODULES(OGGZ, oggz, HAVE_OGGZ="old")
-
-  if test "$HAVE_OGGZ" = "old" ; then
-    AC_MSG_ERROR([
-*** The version of liboggz installed on your system is too old. You need
-*** liboggz version greater than $browser_plugin_OGGZ to build the plugin.
-])
-  else
-    AC_MSG_ERROR([
-*** liboggz-$browser_plugin_OGGZ or greater does not seem to exist on your system.
-*** Please install it and run this ./configure again.
-])
-  fi
-fi
-
-dnl
-dnl  Detect libfishsound
-dnl
-
-dnl Minimum required version of libfishsound
-browser_plugin_FISHSOUND="0.7.0"
-
-PKG_CHECK_MODULES(FISHSOUND, fishsound > "$browser_plugin_FISHSOUND", HAVE_FISHSOUND="yes", HAVE_FISHSOUND="no")
-
-if test "$HAVE_FISHSOUND" = "yes" ; then
-  AC_DEFINE(HAVE_FISHSOUND, [], [Define if have libfishsound])
-  AC_SUBST(FISHSOUND_CFLAGS)
-  AC_SUBST(FISHSOUND_LIBS)
-else
-  PKG_CHECK_MODULES(FISHSOUND, fishsound, HAVE_FISHSOUND="old")
-
-  if test "$HAVE_FISHSOUND" = "old" ; then
-    AC_MSG_ERROR([
-*** The version of libfishsound installed on your system is too old. You need
-*** at least libfishsound version $browser_plugin_FISHSOUND to build firefox plugin.
-])
-  else
-    AC_MSG_ERROR([
-*** libfishsound-$browser_plugin_FISHSOUND or greater does not seem to exist on your system.
-*** Please install it and run this ./configure again.
-])
-  fi
-fi
-
-dnl
-dnl  Detect libtheora
-dnl
-PKG_CHECK_MODULES(THEORA, theora)
-AC_SUBST(THEORA_CFLAGS)
-AC_SUBST(THEORA_LIBS)
-
-dnl
 dnl  Detect liboggplay
 dnl
 PKG_CHECK_MODULES(LIBOGGPLAY, oggplay)
 AC_SUBST(LIBOGGPLAY_CFLAGS)
 AC_SUBST(LIBOGGPLAY_LIBS)
 
-
 dnl
 dnl Detect Imlib2 (needed for the linux plugin)
 dnl
@@ -150,8 +84,6 @@
 AC_SUBST(XPIDL)
 AC_SUBST(XPIDL_INCLUDE)
 
-
-
 dnl
 dnl Detect GTK (needed for the linux plugin)
 dnl
@@ -159,7 +91,6 @@
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTL_CFLAGS)
 
-
 dnl
 dnl  Detect pthreads libraries
 dnl
@@ -240,16 +171,11 @@
 *** misconfigured on your system:
 ])
 
-if test "x$HAVE_OGGZ" != xyes ; then
+if test "x$HAVE_OGGPLAY" != xyes ; then
     AC_MSG_RESULT(
-[*** liboggz, available from http://www.annodex.net/])
+[*** liboggplay, available from http://svn.annodex.net/liboggplay/trunk])
 fi
 
-if test "x$HAVE_FISHSOUND" != xyes ; then
-    AC_MSG_RESULT(
-[*** libfishsound, available from http://www.annodex.net/])
-fi
-
 AC_MSG_RESULT(
 [*** If you install the required libraries from source, you
 *** need to inform the dynamic linker of their location. If