From 5e87884c7666b2ca5c1384c60db66b87cb1dabe1 Mon Sep 17 00:00:00 2001
From: Edgard Lima <edgard.lima@indt.org.br>
Date: Tue, 20 Sep 2005 18:49:05 +0000
Subject: [PATCH] Fixed configure.ac and ext/sdl/Makefile.am for sdl port to
 0.9.

Original commit message from CVS:
Fixed configure.ac and ext/sdl/Makefile.am for sdl port to 0.9.
---
 ChangeLog           | 23 +++++++++++++++--------
 common              |  2 +-
 configure.ac        |  2 ++
 ext/sdl/Makefile.am |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c5e49d5..453903d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,21 @@
-=== release 0.9.1 ===
+
+2005-09-20  Edgard Lima  <edgard.lima@indt.org.br>
+
+        * configure.ac:
+        * ext/sdl/Makefile.am:
+        Fixed Makefile.am - removed hard coded flags from Makefile.am.
+	Added AC_PATH_XTRA to configure.ac to be used by Makefile.am.
 
 2005-09-19  Edgard Lima  <edgard.lima@indt.org.br>
 
-	* Makefile.am 
-	* configure.ac
-	* ext/sdl/Makefile.am
-	* ext/sdl/sdlvideosink.c
-	* ext/sdl/sdlvideosink.h
-	* PORTED_09
-	Ported to 0.9.
+        * Makefile.am:
+        * configure.ac:
+        * ext/sdl/Makefile.am:
+        * ext/sdl/sdlvideosink.c:
+        * PORTED_09:
+        Ported to 0.9.
+
+=== release 0.9.1 ===
 
 2005-09-08  Flavio Oliveira  <flavio.oliveira@indt.org.br>
 
diff --git a/common b/common
index 13022c3..cd4da6a 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 13022c3cb4558d201e2ddf3e65d2e36b16eedc4a
+Subproject commit cd4da6a319d9f92d28f7b8a3b412577e6de50b64
diff --git a/configure.ac b/configure.ac
index 377d5c0..0bea354 100644
--- a/configure.ac
+++ b/configure.ac
@@ -369,6 +369,8 @@ dnl Check for X11
 dnl now try to find the HEADER
 AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no")
 
+AC_PATH_XTRA
+
 if test "x$HAVE_X" = "xno"
 then
   AC_MSG_NOTICE([cannot find X11 development files])
diff --git a/ext/sdl/Makefile.am b/ext/sdl/Makefile.am
index dbe91c4..de49525 100644
--- a/ext/sdl/Makefile.am
+++ b/ext/sdl/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstsdlvideosink.la
 
 libgstsdlvideosink_la_SOURCES =  sdlvideosink.c
 libgstsdlvideosink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(SDL_CFLAGS)
-libgstsdlvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -L/usr/X11R6/lib/
+libgstsdlvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
 libgstsdlvideosink_la_LIBADD = $(SDL_LIBS) \
         $(top_builddir)/../gst-plugins-base/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
         $(top_builddir)/../gst-plugins-base/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
-- 
2.7.4