From d64189f81a0f81ea9e385421a4eb877da6fb6dc2 Mon Sep 17 00:00:00 2001
From: Christian Schaller <uraeus@gnome.org>
Date: Sun, 23 Feb 2003 19:58:50 +0000
Subject: add FreeBSD patches from Andrew Turner and add missing ivorbis m4 to
 cvs, also disable ivorbis plugin as the test mis...

Original commit message from CVS:
add FreeBSD patches from Andrew Turner and add missing ivorbis m4 to cvs, also disable ivorbis plugin as the test mistakes ordinary vorbis for tremor
---
 m4/gst-ivorbis.m4 | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 m4/lrint.m4       |  2 +-
 m4/lrintf.m4      |  2 +-
 3 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 m4/gst-ivorbis.m4

(limited to 'm4')

diff --git a/m4/gst-ivorbis.m4 b/m4/gst-ivorbis.m4
new file mode 100644
index 00000000..9acbe291
--- /dev/null
+++ b/m4/gst-ivorbis.m4
@@ -0,0 +1,73 @@
+# Configure paths for Tremor
+
+dnl XIPH_PATH_IVORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for libivorbis, and define IVORBIS_CFLAGS and IVORBIS_LIBS
+dnl
+AC_DEFUN(XIPH_PATH_IVORBIS,
+[dnl 
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(ivorbis,[  --with-ivorbis=PFX   Prefix where libivorbis is installed (optional)], ivorbis_prefix="$withval", ivorbis_prefix="")
+AC_ARG_WITH(ivorbis-libraries,[  --with-ivorbis-libraries=DIR   Directory where libivorbis library is installed (optional)], ivorbis_libraries="$withval", ivorbis_libraries="")
+AC_ARG_WITH(ivorbis-includes,[  --with-ivorbis-includes=DIR   Directory where libivorbis header files are installed (optional)], ivorbis_includes="$withval", ivorbis_includes="")
+AC_ARG_ENABLE(ivorbistest, [  --disable-ivorbistest       Do not try to compile and run a test Ivorbis program],, enable_ivorbistest=yes)
+
+  if test "x$ivorbis_libraries" != "x" ; then
+    IVORBIS_LIBS="-L$ivorbis_libraries"
+  elif test "x$ivorbis_prefix" != "x" ; then
+    IVORBIS_LIBS="-L$ivorbis_prefix/lib"
+  elif test "x$prefix" != "xNONE"; then
+    IVORBIS_LIBS="-L$prefix/lib"
+  fi
+
+  IVORBIS_LIBS="$IVORBIS_LIBS -lvorbisidec -lm"
+
+  if test "x$ivorbis_includes" != "x" ; then
+    IVORBIS_CFLAGS="-I$ivorbis_includes"
+  elif test "x$ivorbis_prefix" != "x" ; then
+    IVORBIS_CFLAGS="-I$ivorbis_prefix/include"
+  elif test "x$prefix" != "xNONE"; then
+    IVORBIS_CFLAGS="-I$prefix/include"
+  fi
+
+  AC_MSG_CHECKING(for Tremor)
+  no_ivorbis=""
+
+  if test "x$enable_ivorbistest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $IVORBIS_CFLAGS $OGG_CFLAGS"
+    LIBS="$LIBS $IVORBIS_LIBS $OGG_LIBS"
+dnl
+dnl Now check if the installed Tremor is sufficiently new.
+dnl
+      rm -f conf.ivorbistest
+      AC_TRY_COMPILE([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <tremor/codec.h>
+
+int main ()
+{
+}
+
+],, no_ivorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_ivorbis" = "x" ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])     
+  else
+     AC_MSG_RESULT(no)
+     IVORBIS_CFLAGS=""
+     IVORBIS_LIBS=""
+     IVORBISFILE_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(IVORBIS_CFLAGS)
+  AC_SUBST(IVORBIS_LIBS)
+  AC_SUBST(IVORBISFILE_LIBS)
+])
diff --git a/m4/lrint.m4 b/m4/lrint.m4
index c60665ce..7d72c73f 100644
--- a/m4/lrint.m4
+++ b/m4/lrint.m4
@@ -13,7 +13,7 @@ dnl
 AC_DEFUN([AC_C99_FUNC_LRINT],
 [AC_CACHE_CHECK(for lrint,
   ac_cv_c99_lrint,
-[AC_TRY_COMPILE([
+[AC_TRY_LINK([
 #define		_ISOC9X_SOURCE	1
 #define 	_ISOC99_SOURCE	1
 #define		__USE_ISOC99	1
diff --git a/m4/lrintf.m4 b/m4/lrintf.m4
index 4ea74b58..f9b76e36 100644
--- a/m4/lrintf.m4
+++ b/m4/lrintf.m4
@@ -13,7 +13,7 @@ dnl
 AC_DEFUN([AC_C99_FUNC_LRINTF],
 [AC_CACHE_CHECK(for lrintf,
   ac_cv_c99_lrintf,
-[AC_TRY_COMPILE([
+[AC_TRY_LINK([
 #define		_ISOC9X_SOURCE	1
 #define 	_ISOC99_SOURCE	1
 #define		__USE_ISOC99	1
-- 
cgit v1.2.3