From 4f2c1d8d3dc8d16ae18abda8726ba16a1b1ba218 Mon Sep 17 00:00:00 2001
From: Karl Heyes <karl@xiph.org>
Date: Sun, 22 Aug 2004 00:17:38 +0000
Subject: [PATCH] update library check

svn path=/icecast/trunk/m4/; revision=7605
---
 m4/speex.m4 | 103 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 58 insertions(+), 45 deletions(-)

diff --git a/m4/speex.m4 b/m4/speex.m4
index 51fa4c3b..54ae55a7 100644
--- a/m4/speex.m4
+++ b/m4/speex.m4
@@ -19,52 +19,65 @@ AC_ARG_WITH(speex,
     speex_prefix="$withval",
     speex_prefix="$SPEEX_PREFIX"
     )
-if test "x$speex_prefix" = "x"; then
-    if test "x$prefix" = "xNONE"; then
-        speex_prefix="/usr/local"
-    else
-        speex_prefix="$prefix"
-    fi
-fi
-
-SPEEX_CFLAGS="$OGG_CFLAGS"
-SPEEX_LDFLAGS="$OGG_LDFLAGS"
-if test "x$speex_prefix" != "x$ogg_prefix"; then
-    XIPH_GCC_WARNING(-I"$speex_prefix/include",,
-            [SPEEX_CFLAGS="$SPEEX_CFLAGS -I$speex_prefix/include"
-            SPEEX_LDFLAGS="-L$speex_prefix/lib $SPEEX_LDFLAGS"
-            ])
-fi
-
-SPEEX_LIBS="-lspeex"
-
-ac_save_LIBS="$LIBS"
-ac_save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $SPEEX_LDFLAGS"
-LIBS="$LIBS $SPEEX_LIBS"
-xt_have_speex="yes"
-AC_MSG_CHECKING([for libspeex])
-AC_TRY_LINK_FUNC(ogg_stream_init, [AC_MSG_RESULT([ok])],
-        [LIBS="$LIBS $OGG_LIBS"
-        AC_TRY_LINK_FUNC(ogg_stream_init,
-            [SPEEX_LIBS="$SPEEX_LIBS $OGG_LIBS"],
-            [xt_have_speex="no"])
-        ])
-
-LIBS="$ac_save_LIBS"
-LDFLAGS="$ac_save_LDFLAGS"
-
-if test "x$xt_have_speex" = "xyes"
+if test "x$with_speex" = "xno"
 then
-    AC_MSG_RESULT([ok])
-    AC_DEFINE([HAVE_SPEEX],[1],[Define if Speex support is available])
+  AC_MSG_RESULT([Speex support disabled by request])
 else
-    ifelse([$2], , AC_MSG_ERROR([Unable to link to libspeex]), [$2])
-    SPEEX_CFLAGS=""
-    SPEEX_LDFLAGS=""
-    SPEEX_LIBS=""
+  if test "x$speex_prefix" = "x"; then
+      if test "x$prefix" = "xNONE"; then
+          speex_prefix="/usr/local"
+      else
+          speex_prefix="$prefix"
+      fi
+  fi
+
+  SPEEX_CFLAGS="$OGG_CFLAGS"
+  SPEEX_LDFLAGS="$OGG_LDFLAGS"
+  if test "x$speex_prefix" != "x$ogg_prefix"; then
+      XIPH_GCC_WARNING(-I"$speex_prefix/include",,
+              [SPEEX_CFLAGS="$SPEEX_CFLAGS -I$speex_prefix/include"
+              SPEEX_LDFLAGS="-L$speex_prefix/lib $SPEEX_LDFLAGS"
+              ])
+  fi
+
+  SPEEX_LIBS="-lspeex"
+
+  xt_save_LIBS="$LIBS"
+  xt_save_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $SPEEX_LDFLAGS"
+  LIBS="$LIBS $SPEEX_LIBS"
+  xt_have_speex="yes"
+  AC_MSG_CHECKING([for libspeex])
+  AC_TRY_LINK_FUNC(ogg_stream_init, [AC_MSG_RESULT([ok])],
+          [LIBS="$LIBS $OGG_LIBS"
+          AC_TRY_LINK_FUNC(ogg_stream_init,
+              [SPEEX_LIBS="$SPEEX_LIBS $OGG_LIBS"],
+              [xt_have_speex="no"])
+          ])
+  if test "x$xt_have_speex" = "xyes"
+  then
+      AC_LINK_IFELSE([AC_LANG_PROGRAM(
+                  [#include <speex/speex_header.h>],
+                  [void *p = speex_packet_to_header;])],
+              [],
+              [xt_have_speex="no"])
+  fi
+
+  LIBS="$xt_save_LIBS"
+  LDFLAGS="$xt_save_LDFLAGS"
+  
+  if test "x$xt_have_speex" = "xyes"
+  then
+      AC_MSG_RESULT([ok])
+      AC_DEFINE([HAVE_SPEEX],[1],[Define if Speex support is available])
+  else
+      ifelse([$2], , AC_MSG_ERROR([Unable to link to libspeex]), [$2])
+      SPEEX_CFLAGS=""
+      SPEEX_LDFLAGS=""
+      SPEEX_LIBS=""
+  fi
+  AC_SUBST(SPEEX_CFLAGS)
+  AC_SUBST(SPEEX_LDFLAGS)
+  AC_SUBST(SPEEX_LIBS)
 fi
-AC_SUBST(SPEEX_CFLAGS)
-AC_SUBST(SPEEX_LDFLAGS)
-AC_SUBST(SPEEX_LIBS)
 ])