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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/02/25 15:45:32

Modified files:
        .              : ChangeLog 
        macros         : boost.m4 

Log message:
        Generic approach to test date-time.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2456&r2=1.2457
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2456
retrieving revision 1.2457
diff -u -b -r1.2456 -r1.2457
--- ChangeLog   25 Feb 2007 15:40:01 -0000      1.2456
+++ ChangeLog   25 Feb 2007 15:45:32 -0000      1.2457
@@ -10,6 +10,7 @@
 2007-02-25 Markus Gothe <address@hidden>
 
        * macros/libslist: Check in lib32 before lib64.
+       * macros/boost.m4: Generic approach to test date-time.
 
 2007-02-24 Sandro Santilli <address@hidden>
 

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- macros/boost.m4     19 Feb 2007 22:27:07 -0000      1.30
+++ macros/boost.m4     25 Feb 2007 15:45:32 -0000      1.31
@@ -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.30 2007/02/19 22:27:07 rsavoye Exp $
+dnl $Id: boost.m4,v 1.31 2007/02/25 15:45:32 nihilus Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -108,18 +108,18 @@
   save_LIBS="$LIBS"
   AC_LANG_PUSH(C++)
   if test x"${ac_cv_path_boost_lib}" = x; then
-    AC_MSG_CHECKING([for Boost thread library])
+    AC_MSG_CHECKING([for Boost's thread and date-time libraries])
     for i in $libslist; do
-      boostnames=`ls -dr $i/libboost?thread*.so 2>/dev/null`
+      boostnames="`ls -dr $i/libboost?thread*.so 2>/dev/null` `ls -dr 
$i/libboost?date?time*.so 2>/dev/null`"
       for libname in ${boostnames}; do
          if test -f ${libname}; then
           linkname=`basename ${libname} | sed -e 's/lib//' -e 's/.so//'`
            if test x"$i" != x"/usr/lib"; then
-           ac_cv_path_boost_lib="-L$i -l${linkname}"
-             break
+           ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -L$i -l${linkname}"
+dnl                  break
           else
-             ac_cv_path_boost_lib="-l${linkname}"
-             break
+             ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${linkname}"
+dnl                  break
           fi
         fi
       done
@@ -127,9 +127,6 @@
         break; 
       fi        
     done
-         if test -f $i/libboost_date_time.a -o $i/libboost_date_time.so; then
-      ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -lboost_date_time"
-    fi
     AC_MSG_RESULT(${ac_cv_path_boost_lib})
   else
     for k in ${boostnames}; do
@@ -149,8 +146,16 @@
   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"])
+  save_LIBS="$LIBS"
+  LIBS="$LIBS $BOOST_CFLAGS"
+
+  AC_TRY_LINK([#include <boost/date_time/gregorian/gregorian.hpp> 
+  using namespace boost::gregorian;], [
+       date d1(from_undelimited_string("20020125"));
+       date::ymd_type ymd = d1.year_month_day();
+       greg_weekday wd = d1.day_of_week();], [boost_date_time="yes"], 
[boost_date_time="no"])
 
+  LIBS="$save_LIBS"
   AC_LANG_POP(C++)
   
   dnl we don't want any boost libraries in LIBS, we prefer to kep it seperate.