c622305553
* Fix speex support so it will build with speex 1.0/1.1/1.2.
108 lines
3.7 KiB
Plaintext
108 lines
3.7 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.2 2007/05/08 15:16:37 naddy Exp $
|
|
--- configure.in.orig Fri Apr 6 15:23:11 2007
|
|
+++ configure.in Sat May 5 17:10:46 2007
|
|
@@ -120,7 +120,7 @@ AC_DEFUN([AC_CHECK_LIBFLAC],
|
|
|
|
])
|
|
if test "x$have_libFLAC" = "xyes"; then
|
|
- LIBFLAC="-lFLAC"
|
|
+ LIBFLAC="-lFLAC -lm"
|
|
AC_DEFINE(HAVE_LIBFLAC, 1,
|
|
[Define if you have libFLAC 1.1.1 or 1.1.2])
|
|
fi
|
|
@@ -136,11 +136,11 @@ AC_DEFUN([AC_CHECK_LIBFLAC113],
|
|
KDE_CHECK_HEADER(FLAC/metadata.h,
|
|
[
|
|
KDE_CHECK_LIB(FLAC,FLAC__stream_decoder_seek_absolute,
|
|
- have_libFLAC=yes,,[-lFLAC -logg])
|
|
+ have_libFLAC=yes,,[-lFLAC -logg -lm])
|
|
|
|
])
|
|
if test "x$have_libFLAC" = "xyes"; then
|
|
- LIBFLAC="-lFLAC -logg"
|
|
+ LIBFLAC="-lFLAC -logg -lm"
|
|
AC_DEFINE(HAVE_LIBFLAC113, 1,
|
|
[Define if you have libFLAC 1.1.3])
|
|
fi
|
|
@@ -156,11 +156,11 @@ AC_DEFUN([AC_CHECK_LIBOGGFLAC],
|
|
KDE_CHECK_HEADER(OggFLAC/seekable_stream_decoder.h,
|
|
[
|
|
KDE_CHECK_LIB(OggFLAC,OggFLAC__seekable_stream_decoder_process_single,
|
|
- have_libOggFLAC=yes,,[-lm -lOggFLAC -lFLAC])
|
|
+ have_libOggFLAC=yes,,[-lOggFLAC -lFLAC -logg -lm])
|
|
|
|
])
|
|
if test "x$have_libOggFLAC" = "xyes"; then
|
|
- LIBOGGFLAC="-lOggFLAC"
|
|
+ LIBOGGFLAC="-lOggFLAC -lFLAC -logg -lm"
|
|
AC_DEFINE(HAVE_LIBOGGFLAC, 1,
|
|
[Define if you have libOggFLAC (required for loading OggFLAC files)])
|
|
fi
|
|
@@ -179,13 +179,13 @@ AC_DEFUN([KDE_CHECK_OGGVORBIS],
|
|
[:], [have_oggvorbis=no])
|
|
|
|
KDE_CHECK_LIB(vorbis, vorbis_info_init,
|
|
- [:], [have_oggvorbis=no], -logg)
|
|
+ [:], [have_oggvorbis=no], -logg -lm)
|
|
|
|
KDE_CHECK_LIB(vorbisfile, ov_open,
|
|
- [:], [have_oggvorbis=no], -lvorbis -logg)
|
|
+ [:], [have_oggvorbis=no], -lvorbis -logg -lm)
|
|
|
|
if test "x$have_oggvorbis" = xyes; then
|
|
- VORBIS_LIBS="-lvorbis -logg"
|
|
+ VORBIS_LIBS="-lvorbis -logg -lm"
|
|
VORBISFILE_LIBS="-lvorbisfile"
|
|
|
|
# for akode/plugins/xiph_decoder/
|
|
@@ -257,8 +257,8 @@ kde_save_akode_libs="$LIBS"
|
|
LIBS="$all_libraries $USER_LDFLAGS"
|
|
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
|
|
AC_TRY_COMPILE([
|
|
- #include <speex.h>
|
|
- #include <speex_callbacks.h>
|
|
+ #include <speex/speex.h>
|
|
+ #include <speex/speex_callbacks.h>
|
|
#include <ogg/ogg.h>
|
|
],[
|
|
],[
|
|
@@ -267,7 +267,7 @@ AC_TRY_COMPILE([
|
|
AC_MSG_RESULT($have_libspeex)
|
|
if test x$have_libspeex = xyes; then
|
|
KDE_CHECK_LIB(speex,speex_decoder_ctl,,
|
|
- have_libspeex=no,[-lspeex -logg])
|
|
+ have_libspeex=no,[-lspeex -logg -lm])
|
|
fi
|
|
CFLAGS="$kde_save_akode_cflags"
|
|
LIBS="$kde_save_akode_libs"
|
|
@@ -278,10 +278,10 @@ kde_save_akode_libs="$LIBS"
|
|
LIBS="$all_libraries $USER_LDFLAGS"
|
|
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
|
|
AC_TRY_COMPILE([
|
|
- #include <speex.h>
|
|
- #include <speex_callbacks.h>
|
|
- #include <speex_echo.h>
|
|
- #include <speex_preprocess.h>
|
|
+ #include <speex/speex.h>
|
|
+ #include <speex/speex_callbacks.h>
|
|
+ #include <speex/speex_echo.h>
|
|
+ #include <speex/speex_preprocess.h>
|
|
#include <ogg/ogg.h>
|
|
],[
|
|
],[
|
|
@@ -290,12 +290,12 @@ AC_TRY_COMPILE([
|
|
AC_MSG_RESULT($have_libspeex11)
|
|
if test x$have_libspeex11 = xyes; then
|
|
KDE_CHECK_LIB(speex,speex_decode_int,,
|
|
- broken_libspeex11=yes,[-lspeex -logg])
|
|
+ broken_libspeex11=yes,[-lspeex -logg -lm])
|
|
fi
|
|
|
|
if test x$have_libspeex = xyes; then
|
|
AC_DEFINE(HAVE_SPEEX,1,[Define if you have speex installed])
|
|
- SPEEXLIBS="-lspeex -logg"
|
|
+ SPEEXLIBS="-lspeex -logg -lm"
|
|
fi
|
|
CFLAGS="$kde_save_akode_cflags"
|
|
LIBS="$kde_save_akode_libs"
|