From 3ed5809b1015e23f499f555f065688101029a0ac Mon Sep 17 00:00:00 2001 From: maroy Date: Wed, 1 Jun 2005 08:03:55 +0000 Subject: [PATCH] added reference to gstreamer libraries, fix for issue #1038 see http://bugs.campware.org/view.php?id=1038 --- livesupport/products/gLiveSupport/etc/Makefile.in | 9 +++++++-- livesupport/products/gLiveSupport/etc/configure.ac | 8 ++++++-- livesupport/products/scheduler/etc/Makefile.in | 7 ++++++- livesupport/products/scheduler/etc/configure.ac | 8 ++++++-- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/livesupport/products/gLiveSupport/etc/Makefile.in b/livesupport/products/gLiveSupport/etc/Makefile.in index 3f9aefee3..40faf500f 100644 --- a/livesupport/products/gLiveSupport/etc/Makefile.in +++ b/livesupport/products/gLiveSupport/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.36 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.37 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/Makefile.in,v $ # # @configure_input@ @@ -123,6 +123,9 @@ CURL_LIBS=`${USR_DIR}/bin/curl-config --libs` GTKMM_CFLAGS=@GTKMM_CFLAGS@ GTKMM_LIBS=@GTKMM_LIBS@ +GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@ +GSTREAMER_LIBS=@GSTREAMER_LIBS@ + ICU_CFLAGS= ICU_LIBS=`${USR_DIR}/bin/icu-config --ldflags-toolutil --ldflags-icuio` @@ -151,6 +154,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ ${ICU_CFLAGS} \ ${LIBXMLPP_CFLAGS} \ ${GTKMM_CFLAGS} \ + ${GSTREAMER_CFLAGS} \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ @@ -165,6 +169,7 @@ LDFLAGS = @LDFLAGS@ -pthread \ ${LIBXMLPP_LIBS} \ ${CURL_LIBS} \ ${GTKMM_LIBS} \ + ${GSTREAMER_LIBS} \ ${TAGLIB_LIBS} \ -L${USR_LIB_DIR} \ -L${HELIX_LIB_DIR} \ diff --git a/livesupport/products/gLiveSupport/etc/configure.ac b/livesupport/products/gLiveSupport/etc/configure.ac index df4b70575..94a6f4a6c 100644 --- a/livesupport/products/gLiveSupport/etc/configure.ac +++ b/livesupport/products/gLiveSupport/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.5 $ +dnl Version : $Revision: 1.6 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(gLiveSupport, 0.1, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.5 $) +AC_REVISION($Revision: 1.6 $) AC_CONFIG_SRCDIR(../src/main.cxx) @@ -53,6 +53,10 @@ PKG_CHECK_MODULES(GTKMM,[gtkmm-2.4 >= 2.4.0]) AC_SUBST(GTKMM_CFLAGS) AC_SUBST(GTKMM_LIBS) +PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8]) +AC_SUBST(GSTREAMER_CFLAGS) +AC_SUBST(GSTREAMER_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/products/scheduler/etc/Makefile.in b/livesupport/products/scheduler/etc/Makefile.in index 5381069e1..21c96d212 100644 --- a/livesupport/products/scheduler/etc/Makefile.in +++ b/livesupport/products/scheduler/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.55 $ +# Version : $Revision: 1.56 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -67,6 +67,9 @@ LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ LIBODBCXX_CFLAGS=@LIBODBCXX_CFLAGS@ LIBODBCXX_LIBS=@LIBODBCXX_LIBS@ +GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@ +GSTREAMER_LIBS=@GSTREAMER_LIBS@ + CURL_LIBS=`${USR_DIR}/bin/curl-config --libs` @@ -137,6 +140,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -pedantic -Wall -Wno-long-long \ ${LIBXMLPP_CFLAGS} \ ${LIBODBCXX_CFLAGS} \ + ${GSTREAMER_CFLAGS} \ ${TAGLIB_CFLAGS} \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ @@ -150,6 +154,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ LDFLAGS = @LDFLAGS@ -pthread \ ${LIBXMLPP_LIBS} \ ${LIBODBCXX_LIBS} \ + ${GSTREAMER_LIBS} \ ${CURL_LIBS} \ ${TAGLIB_LIBS} \ -L${USR_LIB_DIR} \ diff --git a/livesupport/products/scheduler/etc/configure.ac b/livesupport/products/scheduler/etc/configure.ac index 68933f63c..7d269dab5 100644 --- a/livesupport/products/scheduler/etc/configure.ac +++ b/livesupport/products/scheduler/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.7 $ +dnl Version : $Revision: 1.8 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Scheduler, 0.1, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.7 $) +AC_REVISION($Revision: 1.8 $) AC_CONFIG_SRCDIR(../src/main.cxx) @@ -50,6 +50,10 @@ PKG_CHECK_MODULES(LIBODBCXX,[libodbc++]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) +PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8]) +AC_SUBST(GSTREAMER_CFLAGS) +AC_SUBST(GSTREAMER_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl-----------------------------------------------------------------------------