From b2c01d68e3b8fd3eaacb4b4e41f480000cd01dc7 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Fri, 17 Dec 2004 01:10:30 +0000
Subject: [PATCH] configure.ac: look for musepack headers as musepack/*.h
 (fixes #159847)

Original commit message from CVS:
* configure.ac: look for musepack headers as musepack/*.h
(fixes #159847)
* ext/musepack/gstmusepackdec.h: use <musepack/*.h>
* ext/musepack/gstmusepackreader.h: same
---
 ChangeLog                        | 7 +++++++
 configure.ac                     | 7 ++-----
 ext/musepack/gstmusepackdec.h    | 2 +-
 ext/musepack/gstmusepackreader.h | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d64511f177..17d935d8ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-16  David Schleef  <ds@schleef.org>
+
+	* configure.ac: look for musepack headers as musepack/*.h
+	(fixes #159847)
+	* ext/musepack/gstmusepackdec.h: use <musepack/*.h>
+	* ext/musepack/gstmusepackreader.h: same
+
 2004-12-17  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst-libs/gst/riff/riff-read.c:
diff --git a/configure.ac b/configure.ac
index e64bea7910..156939ead6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1418,16 +1418,13 @@ dnl *** musepack ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_MUSEPACK, true)
 GST_CHECK_FEATURE(MUSEPACK, [musepackdec], musepack, [
   AC_LANG_CPLUSPLUS
-  OLD_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="-I/usr/include/musepack $CPPFLAGS"
-  AC_CHECK_HEADER(mpc_dec.h, [
+  AC_CHECK_HEADER([musepack/mpc_dec.h], [
     HAVE_MUSEPACK="yes"
     MUSEPACK_LIBS="-lmusepack"
-    MUSEPACK_CFLAGS="-I/usr/include/musepack"
+    MUSEPACK_CFLAGS=
     AC_SUBST(MUSEPACK_CFLAGS)
     AC_SUBST(MUSEPACK_LIBS)
     ], [HAVE_MUSEPACK="no"])
-  CPPFLAGS="$OLD_CPPFLAGS"
   AC_LANG_C
 ])
 
diff --git a/ext/musepack/gstmusepackdec.h b/ext/musepack/gstmusepackdec.h
index a562619255..8f2f59f60f 100644
--- a/ext/musepack/gstmusepackdec.h
+++ b/ext/musepack/gstmusepackdec.h
@@ -22,7 +22,7 @@
 
 #include <gst/gst.h>
 #include <gst/bytestream/bytestream.h>
-#include <mpc_dec.h>
+#include <musepack/mpc_dec.h>
 #include "gstmusepackreader.h"
 
 G_BEGIN_DECLS
diff --git a/ext/musepack/gstmusepackreader.h b/ext/musepack/gstmusepackreader.h
index e2e0bf216c..9010dc47b7 100644
--- a/ext/musepack/gstmusepackreader.h
+++ b/ext/musepack/gstmusepackreader.h
@@ -20,7 +20,7 @@
 #ifndef __GST_MUSEPACK_READER_H__
 #define __GST_MUSEPACK_READER_H__
 
-#include <mpc_dec.h>
+#include <musepack/mpc_dec.h>
 #include <gst/bytestream/bytestream.h>
 
 class GstMusepackReader : public MPC_reader {
-- 
2.34.1