From a916520e6c55ec09d49e03f12e09bfe7ebf39800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Fri, 9 Jun 2006 17:38:20 +0000
Subject: [PATCH] configure.ac: Check for X before using X_CFLAGS in the check
 for opengl (#343866).

Original commit message from CVS:
* configure.ac:
Check for X before using X_CFLAGS in the check for opengl (#343866).
* ext/musepack/Makefile.am:
* ext/wavpack/Makefile.am:
* gst/speed/Makefile.am:
Add missing GST_LIBS, fixes build on cygwin (#343866).
---
 ChangeLog                | 10 ++++++++++
 configure.ac             |  1 +
 ext/musepack/Makefile.am |  2 +-
 ext/wavpack/Makefile.am  |  2 +-
 gst/speed/Makefile.am    |  2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 960ffb47ba..32bf3768e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-09  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* configure.ac:
+	  Check for X before using X_CFLAGS in the check for opengl (#343866).
+	  
+	* ext/musepack/Makefile.am:
+	* ext/wavpack/Makefile.am:
+	* gst/speed/Makefile.am:
+	  Add missing GST_LIBS, fixes build on cygwin (#343866).
+
 2006-06-06  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 81972668a8..cc1f90b2ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,6 +222,7 @@ dnl *** sys plug-ins ***
 
 dnl OpenGL
 translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true)
+GST_CHECK_X
 save_CPPFLAGS="$CPPFLAGS"
 save_LIBS="$LIBS"
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
diff --git a/ext/musepack/Makefile.am b/ext/musepack/Makefile.am
index 21cd31e89e..597c4a3868 100644
--- a/ext/musepack/Makefile.am
+++ b/ext/musepack/Makefile.am
@@ -4,7 +4,7 @@ libgstmusepack_la_SOURCES = \
 	gstmusepackdec.c \
 	gstmusepackreader.c
 libgstmusepack_la_CFLAGS = $(MUSEPACK_CFLAGS) $(GST_CFLAGS)
-libgstmusepack_la_LIBADD = $(MUSEPACK_LIBS) 
+libgstmusepack_la_LIBADD = $(MUSEPACK_LIBS) $(GST_LIBS)
 libgstmusepack_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = \
diff --git a/ext/wavpack/Makefile.am b/ext/wavpack/Makefile.am
index 6660a726d4..3a3fae3baa 100644
--- a/ext/wavpack/Makefile.am
+++ b/ext/wavpack/Makefile.am
@@ -7,7 +7,7 @@ libgstwavpack_la_SOURCES =	gstwavpack.c \
 				gstwavpackdec.c
 
 libgstwavpack_la_CFLAGS = $(GST_CFLAGS) $(WAVPACK_CFLAGS)
-libgstwavpack_la_LIBADD = $(WAVPACK_LIBS)
+libgstwavpack_la_LIBADD = $(GST_LIBS) $(WAVPACK_LIBS)
 libgstwavpack_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstwavpackparse.h gstwavpackdec.h gstwavpackcommon.h
diff --git a/gst/speed/Makefile.am b/gst/speed/Makefile.am
index d2b757258e..00846d2877 100644
--- a/gst/speed/Makefile.am
+++ b/gst/speed/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstspeed.la
 
 libgstspeed_la_SOURCES = gstspeed.c
 libgstspeed_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstspeed_la_LIBADD =
+libgstspeed_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS)
 libgstspeed_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstspeed.h