From fdb75fdd2ac0e71af722ad6b3e97302ce2e46db6 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sat, 13 Dec 2008 13:57:19 +0000 Subject: [PATCH] Corrected some problems that emerged on the build server --- configure.ac | 9 ++------- src/gui/widgets/timeline-widget.cpp | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index b21e70b97..09f68cc21 100644 --- a/configure.ac +++ b/configure.ac @@ -101,11 +101,6 @@ AC_CHECK_HEADER([tr1/memory], , AC_MSG_ERROR([std::tr1 proposed standard extension for shared_ptr missing]) ) - -AC_CHECK_HEADER([boost/foreach.hpp], - , - AC_MSG_ERROR([boost::foreach missing (http://www.boost.org/)]) - ) AC_CHECK_HEADER([boost/shared_ptr.hpp], , @@ -128,7 +123,7 @@ AC_CHECK_HEADER([boost/regex.hpp], AC_LANG_POP([C++]) -PKG_CHECK_MODULES(LUMIERA_GUI_LIBS, [sigc++-2.0 >= 2.0.18]) +PKG_CHECK_MODULES(LUMIERA_COMMON_LIBS, [sigc++-2.0 >= 2.0.18]) ############## Internatinalization #GETTEXT_PACKAGE=gtk-lumiera @@ -170,7 +165,7 @@ AC_CHECK_LIB(Xv, XvQueryAdaptors, [LUMIERA_GUI_LIBS="$LUMIERA_GUI_LIBS -lXv"], # END X11 Dependancies - +AC_SUBST(LUMIERA_COMMON_LIBS) AC_SUBST(LUMIERA_PLUGIN_LIBS) AC_SUBST(LUMIERA_GUI_CFLAGS) AC_SUBST(LUMIERA_GUI_LIBS) diff --git a/src/gui/widgets/timeline-widget.cpp b/src/gui/widgets/timeline-widget.cpp index 3b7b74d8d..ec62d9e5f 100644 --- a/src/gui/widgets/timeline-widget.cpp +++ b/src/gui/widgets/timeline-widget.cpp @@ -299,7 +299,7 @@ TimelineWidget::create_timeline_tracks() BOOST_FOREACH(shared_ptr child, sequence->get_child_tracks()) - create_timeline_tracks_from_branch(sequence); + create_timeline_tracks_from_branch(child); } void