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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/10/03 16:22:58

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

Log message:
                * macros/boost.m4: Look for mutex.hpp instead of weak_ptr.hpp.
                * configure.ac: Print the packages to install to add Boost
                threads.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1020&r2=1.1021

Patches:
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/boost.m4     30 Sep 2006 15:56:30 -0000      1.1
+++ macros/boost.m4     3 Oct 2006 16:22:57 -0000       1.2
@@ -35,15 +35,19 @@
 dnl  
 dnl 
 
+dnl Boost modules are:
+dnl date-time, filesystem. graph. iostreams, program options, python,
+dnl regex, serialization, signals, unit test, thead, and wave.
+
 AC_DEFUN([GNASH_PATH_BOOST],
 [
   dnl Lool for the header
   AC_ARG_WITH(boost_incl, [  --with-boost-incl        directory where boost 
headers are], with_boost_incl=${withval})
   AC_CACHE_VAL(ac_cv_path_boost_incl,[
   if test x"${with_boost_incl}" != x ; then
-    if test -f ${with_boost_incl}/weak_ptr.hpp ; then
+    if test -f ${with_boost_incl}/mutex.hpp ; then
       ac_cv_path_boost_incl=`(cd ${with_boost_incl}; pwd)`
-    elif test -f ${with_boost_incl}/weak_ptr.hpp ; then
+    elif test -f ${with_boost_incl}/mutex.hpp ; then
       ac_cv_path_boost_incl=`(cd ${with_boost_incl}; pwd)`
     else
       AC_MSG_ERROR([${with_boost_incl} directory doesn't contain any headers])
@@ -56,7 +60,7 @@
     incllist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /opt/include /usr/include .. ../.."
 
     for i in $incllist; do
-      if test -f $i/boost/weak_ptr.hpp; then
+      if test -f $i/boost/mutex.hpp; then
         ac_cv_path_boost_incl="-I$i/boost"
         break
       fi

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- configure.ac        2 Oct 2006 16:32:39 -0000       1.121
+++ configure.ac        3 Oct 2006 16:22:57 -0000       1.122
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.121 2006/10/02 16:32:39 rsavoye Exp $
+dnl $Id: configure.ac,v 1.122 2006/10/03 16:22:57 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -1005,11 +1005,16 @@
   fi
 fi
 
-
-dnl For now, Boost is optional
-echo "        Boost flags are: ${BOOST_CFLAGS}"
-echo "        Boost lib flags are: ${BOOST_LIBS}"
-
+if test x"$BOOST_LIBS" != x; 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-thread1.33.1-dev
+ and libboost-dev (using apt-get) or libboost-thread-dev (using yum)."
+ nogo=true
+fi
 
 # If anything critical is missing, don't bother to continue
 if test x"$nogo" = x"true"; then

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1020
retrieving revision 1.1021
diff -u -b -r1.1020 -r1.1021
--- ChangeLog   3 Oct 2006 16:11:54 -0000       1.1020
+++ ChangeLog   3 Oct 2006 16:22:57 -0000       1.1021
@@ -17,6 +17,9 @@
 
 2006-10-03 Rob Savoye <address@hidden>
 
+       * macros/boost.m4: Look for mutex.hpp instead of weak_ptr.hpp.
+       * configure.ac: Print the packages to install to add Boost
+       threads.
        * gui/Makefile.am: Add BOOST_CFLAGS and BOOST_LIBS.
        * libbase/Makefile.am: Add BOOST_CFLAGS and BOOST_LIBS.
        * utilities/Makefile.am: Add BOOST_CFLAGS and BOOST_LIBS.