summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdgard Lima <edgard.lima@indt.org.br>2005-09-20 18:49:05 +0000
committerEdgard Lima <edgard.lima@indt.org.br>2005-09-20 18:49:05 +0000
commit5e87884c7666b2ca5c1384c60db66b87cb1dabe1 (patch)
tree40cf3ce434ba04a42f595971c648ef095aaeb647
parentd8025d0b03281890d7e78842753f859151ec3696 (diff)
downloadgst-plugins-bad-5e87884c7666b2ca5c1384c60db66b87cb1dabe1.tar.gz
gst-plugins-bad-5e87884c7666b2ca5c1384c60db66b87cb1dabe1.tar.bz2
gst-plugins-bad-5e87884c7666b2ca5c1384c60db66b87cb1dabe1.zip
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.
-rw-r--r--ChangeLog23
m---------common0
-rw-r--r--configure.ac2
-rw-r--r--ext/sdl/Makefile.am2
4 files changed, 18 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index c5e49d51..453903da 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
-Subproject 13022c3cb4558d201e2ddf3e65d2e36b16eedc4
+Subproject cd4da6a319d9f92d28f7b8a3b412577e6de50b6
diff --git a/configure.ac b/configure.ac
index 377d5c0f..0bea3542 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 dbe91c4c..de49525f 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 \