* modules/codec/speex.c: fixed stupid bug in encoder.

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2169d643fe99207146578a3460581a6420cbaf5a..add1de23881235650c34525271195117baace37c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Autoconf settings for vlc
 dnl $Id$
  
-AC_INIT(vlc,0.7.2-test2)
+AC_INIT(vlc,0.7.2-test3)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Bond"
@@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.7.2-test2)
+AM_INIT_AUTOMAKE(vlc,0.7.2-test3)
 AM_CONFIG_HEADER(config.h)
 
 dnl
@@ -1593,7 +1593,7 @@ then
 
   if test "${enable_vcdx}" != "no"
   then
-    PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.21,
+    PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20,
      [enable_vcd="no"
       AC_DEFINE(HAVE_VCDX, [], 
       [Define for the VCD plugin using libcdio/libvcdinfo])
@@ -3408,27 +3408,42 @@ then
   dnl test for --with-goom-tree
   dnl
   if test "${with_goom_tree}" != "no" -a -n "${with_goom_tree}"; then
-    AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree})
+    AC_MSG_CHECKING(for libgoom2.a in ${with_goom_tree})
     real_goom_tree="`cd ${with_goom_tree} 2>/dev/null && pwd`"
     if test -z "${real_goom_tree}"; then
       dnl  The given directory can't be found
       AC_MSG_RESULT(no)
       AC_MSG_ERROR([cannot cd to ${with_goom_tree}])
     fi
-    if test -f "${real_goom_tree}/libgoom.a"; then
-      AC_MSG_RESULT(${real_goom_tree}/libgoom.a)
+    if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then
+      AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a)
       AX_ADD_BUILTINS([goom])
-      AX_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom])
-      AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree}])
+      AX_ADD_LDFLAGS([goom],[-L${real_goom_tree}/src/.libs -lgoom2])
+      AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE])
     else
-      dnl  The given libgoom wasn't built
+      dnl  The given libgoom2 wasn't built, try to look for the old goom
       AC_MSG_RESULT(no)
-      AC_MSG_ERROR([cannot find ${real_goom_tree}/libgoom.a, make sure you compiled goom in ${with_goom_tree}])
+      AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree})
+      if test -f "${real_goom_tree}/libgoom.a"; then
+        AC_MSG_RESULT(${real_goom_tree}/libgoom.a)
+        AX_ADD_BUILTINS([goom])
+        AX_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom])
+        AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM])
+      else
+        dnl  The given libgoom wasn't built
+        AC_MSG_RESULT(no)
+        AC_MSG_ERROR([cannot find ${real_goom_tree}/src/.libs/libgoom2.a, make sure you compiled goom in ${with_goom_tree}])
+      fi
     fi
   else
-    dnl  The --with-goom-tree isn't specified wasn't built
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR([You have to specify a tree with --with-goom-tree])
+    AC_CHECK_HEADERS(goom/goom.h, [
+      AC_CHECK_LIB(goom2, goom_init, [
+        AX_ADD_PLUGINS([goom])
+        AX_ADD_LDFLAGS([goom],[-lgoom2])
+      ],[
+        AC_MSG_ERROR([Could not find goom on your system: you may get it from http://www.ios-software.com/.])
+      ])
+    ])
   fi
 fi