[xiph-commits] r17070 - trunk/vorbis-tools

[giles at svn.xiph.org]

Author: giles
Date: 2010-03-25 21:50:44 -0700 (Thu, 25 Mar 2010)
New Revision: 17070

Modified:
   trunk/vorbis-tools/configure.ac
Log:
Require libvorbis 1.3.0 or later to build.

The oggenc program uses OV_ECTL_COUPLING_SET which appreared in
libvorbis 1.3.0. We could easily conditionalize this option,
but prefer to require that the two version upgrade in sync, so
instead the configure script checks for this version, or if
pkg-config isn't available, it checks for the symbol itself.

Note that the use of AC_CHECK_DECL() probably requires a more
recent autoconf version than the 2.53 dependency we declare,
but as usual the documentation provides no guidance as to when
this macro was added.


Modified: trunk/vorbis-tools/configure.ac
===================================================================
--- trunk/vorbis-tools/configure.ac	2010-03-26 04:49:08 UTC (rev 17069)
+++ trunk/vorbis-tools/configure.ac	2010-03-26 04:50:44 UTC (rev 17070)
@@ -133,7 +133,7 @@
 
 if test "x$HAVE_PKG_CONFIG" = "xyes"
 then
-  PKG_CHECK_MODULES(VORBIS, vorbis >= 1.1.1, HAVE_VORBIS=yes, HAVE_VORBIS=no)
+  PKG_CHECK_MODULES(VORBIS, vorbis >= 1.3.0, HAVE_VORBIS=yes, HAVE_VORBIS=no)
   dnl also set VORBISENC_LIBS since an examples needs it
   dnl the old .m4 sets this to a value to use on top of VORBIS_LIBS,
   dnl so we do the same here.
@@ -154,6 +154,12 @@
 then
   dnl fall back to the old school test
   XIPH_PATH_VORBIS(,AC_MSG_ERROR(Vorbis needed!))
+  AC_CHECK_DECL(OV_ECTL_COUPLING_SET, , , [#include <vorbis/vorbisenc.h>])
+  if test "x$ac_cv_have_decl_OV_ECTL_COUPLING_SET" = "xno"
+  then
+    AC_MSG_ERROR([Vorbis >= 1.3.0 required !])
+    HAVE_VORBIS=no
+  fi
 fi
 AM_CONDITIONAL(HAVE_OV_READ_FILTER, test "x$have_ov_read_filter" = "xyes")