diff options
| author | Conrad Parker <conrad@users.sourceforge.net> | 2004-08-30 12:33:07 +0000 |
|---|---|---|
| committer | Conrad Parker <conrad@users.sourceforge.net> | 2004-08-30 12:33:07 +0000 |
| commit | 1c0343dcc2d3cb31b2a081c6c964c3e00fe2694e (patch) | |
| tree | 2be669655a285b885ce22ab9e80c77be02b1de8f /configure.ac | |
| parent | dbfdc663be0a6f86f9708f21871b2bedfb5b7fdc (diff) | |
| download | xine-lib-1c0343dcc2d3cb31b2a081c6c964c3e00fe2694e.tar.gz xine-lib-1c0343dcc2d3cb31b2a081c6c964c3e00fe2694e.tar.bz2 | |
add support for speex headers in new location (eg. <speex/speex.h>) for
libspeex-1.1.x:
- Retain compatability for <speex.h> etc. from libspeex-1.0.x
- Also try speex via pkg-config, and fall back to old AM_PATH_SPEEX
CVS patchset: 6920
CVS date: 2004/08/30 12:33:07
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index cdec66471..2a7d85d17 100644 --- a/configure.ac +++ b/configure.ac @@ -918,11 +918,26 @@ dnl --------------------------------------------- dnl Ogg/Speex libs. dnl --------------------------------------------- -AM_PATH_OGG( - [ AM_PATH_SPEEX(AC_DEFINE(HAVE_SPEEX,1,[Define this if you have speex]), - AC_MSG_RESULT([*** All OGG/SPEEX dependent parts will be disabled ***])) - ], - AC_MSG_RESULT([*** All of OGG/Speex dependent parts will be disabled ***])) +PKG_CHECK_MODULES(SPEEX, speex, no_speex="no", no_speex="yes") + +if test "x$no_speex" = "xyes" ; then + AM_PATH_OGG([ AM_PATH_SPEEX(no_speex="no")]) +fi + +if test "x$no_speex" = "xyes" ; then + AC_MSG_RESULT([*** All OGG/SPEEX dependent parts will be disabled ***]) +else + AC_DEFINE(HAVE_SPEEX,1,[Define this if you have speex]) + + dnl Test whether Speex headers are eg. <speex.h> or <speex/speex.h> + dnl Speex headers were moved in mid-2004; 1.0.x has backwards compatible headers, 1.1.x does not + AC_CHECK_HEADER([speex/speex.h], + AC_DEFINE(HAVE_SPEEX_SUBDIR, [1], [Define to 1 if speex headers are eg. <speex/speex.h>]) + ) + + AC_SUBST(SPEEX_CFLAGS) + AC_SUBST(SPEEX_LIBS) +fi AM_CONDITIONAL(HAVE_SPEEX, [test x"$no_ogg" != "xyes" -a x"$no_speex" != "xyes"]) |