[Gnash-commit] gnash ChangeLog configure.ac macros/boost.m4

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/19 22:21:14

Modified files:
        .              : ChangeLog configure.ac 
        macros         : boost.m4 

Log message:
        Path by Wil Mahan:
        
                * configure.ac, macros/boost.m4: add check for 
libboost-date-time
                  (see bug #18788).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2398&r2=1.2399
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.257&r2=1.258
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2398
retrieving revision 1.2399
diff -u -b -r1.2398 -r1.2399
--- ChangeLog   19 Feb 2007 21:45:40 -0000      1.2398
+++ ChangeLog   19 Feb 2007 22:21:13 -0000      1.2399
@@ -1,3 +1,8 @@
+2007-02-19 Wil Mahan <address@hidden>
+
+       * configure.ac, macros/boost.m4: add check for libboost-date-time
+         (see bug #18788).
+
 2007-02-19 Tomas Groth Christensen <address@hidden>
 
        * macros/ffmpeg.m4: The minimum LIBAVCODEC_VERSION is now 51.11.0.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -b -r1.257 -r1.258
--- configure.ac        15 Feb 2007 20:11:23 -0000      1.257
+++ configure.ac        19 Feb 2007 22:21:13 -0000      1.258
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.257 2007/02/15 20:11:23 rsavoye Exp $
+dnl $Id: configure.ac,v 1.258 2007/02/19 22:21:13 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1322,14 +1322,15 @@
   fi
 fi
 
-if test x"$BOOST_LIBS" != x; then
+if test x"$BOOST_LIBS" != x -a x"$boost_date_time" = xyes; then
     echo "        BOOST flags are: $BOOST_CFLAGS"
     echo "        BOOST libs are: $BOOST_LIBS"
 else
     echo "ERROR: No BOOST development package installed!\
  You need to have the BOOST development package installed\
- to compile, or install libboost-thread-dev (using apt-get)\
- or boost-devel (using yum)."
+ to compile, or install libboost-thread-dev and\
+ libboost-date-time-dev (using apt-get) or boost-devel\
+ (using yum)."
  nogo=true
 fi
 

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- macros/boost.m4     9 Jan 2007 00:43:43 -0000       1.28
+++ macros/boost.m4     19 Feb 2007 22:21:13 -0000      1.29
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: boost.m4,v 1.28 2007/01/09 00:43:43 rsavoye Exp $
+dnl $Id: boost.m4,v 1.29 2007/02/19 22:21:13 strk Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -142,6 +142,12 @@
   if test x"${ac_cv_path_boost_lib}" = x; then
     AC_SEARCH_LIBS(cleanup_slots, ${boostnames}, 
[ac_cv_path_boost_lib="${LIBS}"])
   fi
+
+  dnl In Debian, date-time is currently in a separate package,
+  dnl so check whether it's installed.
+  LIBS="$ac_cv_path_boost_lib $save_LIBS"
+  AC_CHECK_LIB(boost_date_time, main, [boost_date_time="yes"], 
[boost_date_time="no"])
+
   AC_LANG_POP(C++)
   
   dnl we don't want any boost libraries in LIBS, we prefer to kep it seperate.