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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/10/05 16:10:48

Modified files:
        macros         : boost.m4 
        .              : ChangeLog 

Log message:
                * macros/boost.m4: Also look for libboost_thread-mt if
                libboost_thread doesn't exist.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1043&r2=1.1044

Patches:
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/boost.m4     3 Oct 2006 17:19:39 -0000       1.3
+++ macros/boost.m4     5 Oct 2006 16:10:48 -0000       1.4
@@ -102,11 +102,11 @@
       for i in $libslist; do
        if test -f $i/libboost_thread.a -o -f $i/libboost_thread.so; then
          if test x"$i" != x"/usr/lib"; then
-           ac_cv_path_boost_lib="-L$i"
+           ac_cv_path_boost_lib="-L$i -lboost_thread"
             AC_MSG_RESULT(${ac_cv_path_boost_lib})
            break
           else
-           ac_cv_path_boost_lib=""
+           ac_cv_path_boost_lib="-lboost_thread"
             AC_MSG_RESULT(yes)
            break
           fi
@@ -116,7 +116,37 @@
     if test -f ${ac_cv_path_boost_lib}/libboost_thread.a -o -f 
${ac_cv_path_boost_lib}/libboost_thread.so; then
 
       if test x"${ac_cv_path_boost_lib}" != x"/usr/lib"; then
-       ac_cv_path_boost_lib="-L${ac_cv_path_boost_lib}"
+       ac_cv_path_boost_lib="-L${ac_cv_path_boost_lib} -lboost_thread"
+      else
+        ac_cv_path_boost_lib="-lboost_thread"
+      fi
+    fi
+  fi
+
+dnl Unfortunately many distributions don't agree on the name of the library, 
so if we can't
+dnl find it under the default name, we should look for it under the variations.
+  if test x"${ac_cv_path_boost_lib}" = x; then
+    AC_CHECK_LIB(boost_thread-mt, cleanup_slots, 
[ac_cv_path_boost_lib="-lboost_thread-mt"],[
+      AC_MSG_CHECKING([for libboost library])
+      libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+      for i in $libslist; do
+       if test -f $i/libboost_thread-mt.a -o -f $i/libboost_thread-mt.so; then
+         if test x"$i" != x"/usr/lib"; then
+           ac_cv_path_boost_lib="-L$i -lboost_thread-mt"
+            AC_MSG_RESULT(${ac_cv_path_boost_lib})
+           break
+          else
+           ac_cv_path_boost_lib="-lboost_thread-mt"
+            AC_MSG_RESULT(yes)
+           break
+          fi
+        fi
+      done])
+  else
+    if test -f ${ac_cv_path_boost_lib}/libboost_thread-mt.a -o -f 
${ac_cv_path_boost_lib}/libboost_thread-mt.so; then
+
+      if test x"${ac_cv_path_boost_lib}" != x"/usr/lib"; then
+       ac_cv_path_boost_lib="-L${ac_cv_path_boost_lib} -lboost_thread-mt"
       else
         ac_cv_path_boost_lib=""
       fi

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1043
retrieving revision 1.1044
diff -u -b -r1.1043 -r1.1044
--- ChangeLog   5 Oct 2006 16:05:01 -0000       1.1043
+++ ChangeLog   5 Oct 2006 16:10:48 -0000       1.1044
@@ -1,3 +1,8 @@
+2006-10-05  Rob Savoye  <address@hidden>
+
+       * macros/boost.m4: Also look for libboost_thread-mt if
+       libboost_thread doesn't exist.
+
 2006-10-05 Sandro Santilli <address@hidden>
 
        * server/as_object.cpp (setPropFlags): added support for
@@ -83,6 +88,9 @@
 
 2006-10-03 Rob Savoye <address@hidden>
 
+       * plugin/plugin.cpp: Use cout instead of dbglogfile to reduce
+       dependancies.
+       * plugin/Makefile.am: Don't link in log.cpp directly.
        * plugin/plugin.cpp: Use cout instead of Gnash debugging library
        since Firefox doesn't print to stdout anyway unless you build from
        source. This removes all dependancies on Gnash libraries.