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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/10/05 19:43:07

Modified files:
        macros         : boost.m4 
        .              : ChangeLog 

Log message:
                * macros/boost/m4: Look for the Boost thread library using a
                variety of names.

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

Patches:
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- macros/boost.m4     5 Oct 2006 16:10:48 -0000       1.4
+++ macros/boost.m4     5 Oct 2006 19:43:07 -0000       1.5
@@ -95,63 +95,36 @@
     fi
   ])
 
+  boostnames="boost_thread boost-thread boost_thread-mt boost_thread_mt"
+  for j in $boostnames; do
   if test x"${ac_cv_path_boost_lib}" = x; then
-    AC_CHECK_LIB(boost_thread, cleanup_slots, 
[ac_cv_path_boost_lib="-lboost_thread"],[
+    AC_CHECK_LIB(${j}, cleanup_slots, [ac_cv_path_boost_lib="-l${j}"],[
       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.a -o -f $i/libboost_thread.so; then
+       if test -f $i/${j}.a -o -f $i/${j}.so; then
          if test x"$i" != x"/usr/lib"; then
-           ac_cv_path_boost_lib="-L$i -lboost_thread"
+           ac_cv_path_boost_lib="-L$i -l${j}"
             AC_MSG_RESULT(${ac_cv_path_boost_lib})
            break
           else
-           ac_cv_path_boost_lib="-lboost_thread"
+           ac_cv_path_boost_lib="-l${j}"
             AC_MSG_RESULT(yes)
            break
           fi
         fi
       done])
   else
-    if test -f ${ac_cv_path_boost_lib}/libboost_thread.a -o -f 
${ac_cv_path_boost_lib}/libboost_thread.so; then
+    if test -f ${ac_cv_path_boost_lib}/${j}.a -o -f 
${ac_cv_path_boost_lib}/${j}.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"
+       ac_cv_path_boost_lib="-L${ac_cv_path_boost_lib} -l${j}"
       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=""
+        ac_cv_path_boost_lib="-l${j}"
       fi
     fi
   fi
+  done
 
   if test x"${ac_cv_path_boost_lib}" != x ; then
       BOOST_LIBS="${ac_cv_path_boost_lib}"

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1044
retrieving revision 1.1045
diff -u -b -r1.1044 -r1.1045
--- ChangeLog   5 Oct 2006 16:10:48 -0000       1.1044
+++ ChangeLog   5 Oct 2006 19:43:07 -0000       1.1045
@@ -1,5 +1,7 @@
 2006-10-05  Rob Savoye  <address@hidden>
 
+       * macros/boost/m4: Look for the Boost thread library using a
+       variety of names.
        * macros/boost.m4: Also look for libboost_thread-mt if
        libboost_thread doesn't exist.