From e1ac649f6206abc3d7d724e9fa3dbdd986b79eaf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 20 Nov 2007 22:03:01 +0000 Subject: [PATCH] add gstreamer libraries to EXTRALIBS_MEDIA which is only used for GUI programs, but not for wxBase (which avoids dependency on a whole bunch of GUI libraries in console applications) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@50114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 4 ++-- configure.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 3be639a2a9..93571ad384 100755 --- a/configure +++ b/configure @@ -46154,7 +46154,7 @@ fi esac CPPFLAGS="$GST_CFLAGS $CPPFLAGS" - LIBS="$GST_LIBS $LIBS" + EXTRALIBS_MEDIA="$GST_LIBS" cat >>confdefs.h <<\_ACEOF #define wxUSE_GSTREAMER 1 @@ -46327,7 +46327,7 @@ EXTRALIBS_XML="$EXPAT_LINK" EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_ODBC="$ODBC_LINK" if test "$wxUSE_GUI" = "yes"; then - EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT` + EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT $EXTRALIBS_MEDIA` fi if test "$wxUSE_OPENGL" = "yes"; then EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS" diff --git a/configure.in b/configure.in index 4ab364efb8..94b03cef35 100644 --- a/configure.in +++ b/configure.in @@ -7682,7 +7682,7 @@ if test "$wxUSE_MEDIACTRL" = "yes"; then esac CPPFLAGS="$GST_CFLAGS $CPPFLAGS" - LIBS="$GST_LIBS $LIBS" + EXTRALIBS_MEDIA="$GST_LIBS" AC_DEFINE(wxUSE_GSTREAMER) else @@ -7906,7 +7906,7 @@ EXTRALIBS_XML="$EXPAT_LINK" EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_ODBC="$ODBC_LINK" if test "$wxUSE_GUI" = "yes"; then - EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT` + EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT $EXTRALIBS_MEDIA` fi if test "$wxUSE_OPENGL" = "yes"; then EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"