added reference to gstreamer libraries, fix for issue #1038
see http://bugs.campware.org/view.php?id=1038
This commit is contained in:
parent
8397693da8
commit
3ed5809b10
4 changed files with 25 additions and 7 deletions
|
@ -20,8 +20,8 @@
|
||||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Author : $Author: fgerlits $
|
# Author : $Author: maroy $
|
||||||
# Version : $Revision: 1.36 $
|
# Version : $Revision: 1.37 $
|
||||||
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/Makefile.in,v $
|
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/Makefile.in,v $
|
||||||
#
|
#
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
|
@ -123,6 +123,9 @@ CURL_LIBS=`${USR_DIR}/bin/curl-config --libs`
|
||||||
GTKMM_CFLAGS=@GTKMM_CFLAGS@
|
GTKMM_CFLAGS=@GTKMM_CFLAGS@
|
||||||
GTKMM_LIBS=@GTKMM_LIBS@
|
GTKMM_LIBS=@GTKMM_LIBS@
|
||||||
|
|
||||||
|
GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@
|
||||||
|
GSTREAMER_LIBS=@GSTREAMER_LIBS@
|
||||||
|
|
||||||
ICU_CFLAGS=
|
ICU_CFLAGS=
|
||||||
ICU_LIBS=`${USR_DIR}/bin/icu-config --ldflags-toolutil --ldflags-icuio`
|
ICU_LIBS=`${USR_DIR}/bin/icu-config --ldflags-toolutil --ldflags-icuio`
|
||||||
|
|
||||||
|
@ -151,6 +154,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
|
||||||
${ICU_CFLAGS} \
|
${ICU_CFLAGS} \
|
||||||
${LIBXMLPP_CFLAGS} \
|
${LIBXMLPP_CFLAGS} \
|
||||||
${GTKMM_CFLAGS} \
|
${GTKMM_CFLAGS} \
|
||||||
|
${GSTREAMER_CFLAGS} \
|
||||||
-I${USR_INCLUDE_DIR} \
|
-I${USR_INCLUDE_DIR} \
|
||||||
-I${BOOST_INCLUDE_DIR} \
|
-I${BOOST_INCLUDE_DIR} \
|
||||||
-I${CORE_INCLUDE_DIR} \
|
-I${CORE_INCLUDE_DIR} \
|
||||||
|
@ -165,6 +169,7 @@ LDFLAGS = @LDFLAGS@ -pthread \
|
||||||
${LIBXMLPP_LIBS} \
|
${LIBXMLPP_LIBS} \
|
||||||
${CURL_LIBS} \
|
${CURL_LIBS} \
|
||||||
${GTKMM_LIBS} \
|
${GTKMM_LIBS} \
|
||||||
|
${GSTREAMER_LIBS} \
|
||||||
${TAGLIB_LIBS} \
|
${TAGLIB_LIBS} \
|
||||||
-L${USR_LIB_DIR} \
|
-L${USR_LIB_DIR} \
|
||||||
-L${HELIX_LIB_DIR} \
|
-L${HELIX_LIB_DIR} \
|
||||||
|
|
|
@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
dnl
|
dnl
|
||||||
dnl
|
dnl
|
||||||
dnl Author : $Author: maroy $
|
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 Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/configure.ac,v $
|
||||||
dnl-----------------------------------------------------------------------------
|
dnl-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ dnl-----------------------------------------------------------------------------
|
||||||
AC_INIT(gLiveSupport, 0.1, bugs@campware.org)
|
AC_INIT(gLiveSupport, 0.1, bugs@campware.org)
|
||||||
AC_PREREQ(2.59)
|
AC_PREREQ(2.59)
|
||||||
AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
|
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)
|
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_CFLAGS)
|
||||||
AC_SUBST(GTKMM_LIBS)
|
AC_SUBST(GTKMM_LIBS)
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8])
|
||||||
|
AC_SUBST(GSTREAMER_CFLAGS)
|
||||||
|
AC_SUBST(GSTREAMER_LIBS)
|
||||||
|
|
||||||
dnl-----------------------------------------------------------------------------
|
dnl-----------------------------------------------------------------------------
|
||||||
dnl enable compilaton for code coverage data
|
dnl enable compilaton for code coverage data
|
||||||
dnl-----------------------------------------------------------------------------
|
dnl-----------------------------------------------------------------------------
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Author : $Author: maroy $
|
# 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 $
|
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $
|
||||||
#
|
#
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
|
@ -67,6 +67,9 @@ LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@
|
||||||
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
||||||
LIBODBCXX_CFLAGS=@LIBODBCXX_CFLAGS@
|
LIBODBCXX_CFLAGS=@LIBODBCXX_CFLAGS@
|
||||||
LIBODBCXX_LIBS=@LIBODBCXX_LIBS@
|
LIBODBCXX_LIBS=@LIBODBCXX_LIBS@
|
||||||
|
GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@
|
||||||
|
GSTREAMER_LIBS=@GSTREAMER_LIBS@
|
||||||
|
|
||||||
|
|
||||||
CURL_LIBS=`${USR_DIR}/bin/curl-config --libs`
|
CURL_LIBS=`${USR_DIR}/bin/curl-config --libs`
|
||||||
|
|
||||||
|
@ -137,6 +140,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
|
||||||
-pedantic -Wall -Wno-long-long \
|
-pedantic -Wall -Wno-long-long \
|
||||||
${LIBXMLPP_CFLAGS} \
|
${LIBXMLPP_CFLAGS} \
|
||||||
${LIBODBCXX_CFLAGS} \
|
${LIBODBCXX_CFLAGS} \
|
||||||
|
${GSTREAMER_CFLAGS} \
|
||||||
${TAGLIB_CFLAGS} \
|
${TAGLIB_CFLAGS} \
|
||||||
-I${USR_INCLUDE_DIR} \
|
-I${USR_INCLUDE_DIR} \
|
||||||
-I${BOOST_INCLUDE_DIR} \
|
-I${BOOST_INCLUDE_DIR} \
|
||||||
|
@ -150,6 +154,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
|
||||||
LDFLAGS = @LDFLAGS@ -pthread \
|
LDFLAGS = @LDFLAGS@ -pthread \
|
||||||
${LIBXMLPP_LIBS} \
|
${LIBXMLPP_LIBS} \
|
||||||
${LIBODBCXX_LIBS} \
|
${LIBODBCXX_LIBS} \
|
||||||
|
${GSTREAMER_LIBS} \
|
||||||
${CURL_LIBS} \
|
${CURL_LIBS} \
|
||||||
${TAGLIB_LIBS} \
|
${TAGLIB_LIBS} \
|
||||||
-L${USR_LIB_DIR} \
|
-L${USR_LIB_DIR} \
|
||||||
|
|
|
@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
dnl
|
dnl
|
||||||
dnl
|
dnl
|
||||||
dnl Author : $Author: maroy $
|
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 Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/configure.ac,v $
|
||||||
dnl-----------------------------------------------------------------------------
|
dnl-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ dnl-----------------------------------------------------------------------------
|
||||||
AC_INIT(Scheduler, 0.1, bugs@campware.org)
|
AC_INIT(Scheduler, 0.1, bugs@campware.org)
|
||||||
AC_PREREQ(2.59)
|
AC_PREREQ(2.59)
|
||||||
AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
|
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)
|
AC_CONFIG_SRCDIR(../src/main.cxx)
|
||||||
|
|
||||||
|
@ -50,6 +50,10 @@ PKG_CHECK_MODULES(LIBODBCXX,[libodbc++])
|
||||||
AC_SUBST(LIBXMLPP_CFLAGS)
|
AC_SUBST(LIBXMLPP_CFLAGS)
|
||||||
AC_SUBST(LIBXMLPP_LIBS)
|
AC_SUBST(LIBXMLPP_LIBS)
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8])
|
||||||
|
AC_SUBST(GSTREAMER_CFLAGS)
|
||||||
|
AC_SUBST(GSTREAMER_LIBS)
|
||||||
|
|
||||||
dnl-----------------------------------------------------------------------------
|
dnl-----------------------------------------------------------------------------
|
||||||
dnl enable compilaton for code coverage data
|
dnl enable compilaton for code coverage data
|
||||||
dnl-----------------------------------------------------------------------------
|
dnl-----------------------------------------------------------------------------
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue