[xine-cvs] CVS: xine-lib configure.ac,1.274,1.275

[Conrad P. <co...@us...>]

Update of /cvsroot/xine/xine-lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18486

Modified Files:
	configure.ac 
Log Message:
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


Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/xine-lib/configure.ac,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- configure.ac	30 Aug 2004 00:55:18 -0000	1.274
+++ configure.ac	30 Aug 2004 12:33:07 -0000	1.275
@@ -918,11 +918,26 @@
 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"])