? .config.log.swp ? conf.out ? configure.out ? gnash-0.7.1-cvs-20061005.tar.gz ? gnash-distcheck-gui.diff ? gnash-ffmpeg.diff ? gnash-macros_boost.diff ? gnash-pat.diff ? gnash-tests-dist.diff ? gnash.sum ? gnash_check_dist_fix.diff ? site.exp ? testsuite-make_distcheck.diff ? use_system_libtool.diff ? doc/C/gnash.aux ? doc/C/gnash.out ? doc/C/gnash.texi ? gui/NullGui.lo ? gui/Player.lo ? gui/gnash ? gui/gtk.lo ? gui/gtk_glue_gtkglext.lo ? gui/gui.lo ? gui/libgnashgui.la ? gui/libgnashplayer.la ? libamf/.libs ? libamf/amf.lo ? libamf/libgnashamf.la ? libamf/rtmp.lo ? libbase/out ? macros/libtool.m4-new ? server/Makefile.am-conflict ? testsuite/actionscript.all/Boolean.swf ? testsuite/actionscript.all/Camera.swf ? testsuite/actionscript.all/Color.swf ? testsuite/actionscript.all/ContextMenu.swf ? testsuite/actionscript.all/CustomActions.swf ? testsuite/actionscript.all/Date.swf ? testsuite/actionscript.all/Error.swf ? testsuite/actionscript.all/Function.swf ? testsuite/actionscript.all/Global.swf ? testsuite/actionscript.all/Inheritance.swf ? testsuite/actionscript.all/LoadVars.swf ? testsuite/actionscript.all/LocalConnection.swf ? testsuite/actionscript.all/Microphone.swf ? testsuite/actionscript.all/Mouse.swf ? testsuite/actionscript.all/MovieClip.swf ? testsuite/actionscript.all/NetConnection.swf ? testsuite/actionscript.all/NetStream.swf ? testsuite/actionscript.all/Number.swf ? testsuite/actionscript.all/Object.swf ? testsuite/actionscript.all/Selection.swf ? testsuite/actionscript.all/SharedObject.swf ? testsuite/actionscript.all/Stage.swf ? testsuite/actionscript.all/String.swf ? testsuite/actionscript.all/System.swf ? testsuite/actionscript.all/TextSnapshot.swf ? testsuite/actionscript.all/Video.swf ? testsuite/actionscript.all/XML.swf ? testsuite/actionscript.all/XMLNode.swf ? testsuite/actionscript.all/array.swf ? testsuite/actionscript.all/delete.swf ? testsuite/actionscript.all/gnash-check.out ? testsuite/actionscript.all/gnash-dbg.log ? testsuite/actionscript.all/inheritance.swf ? testsuite/actionscript.all/out.swf ? testsuite/actionscript.all/rtmp.swf ? testsuite/actionscript.all/site.exp ? testsuite/actionscript.all/testrun.log ? testsuite/actionscript.all/testrun.sum ? testsuite/libbase/NoSeekFileTest ? testsuite/libbase/NoSeekFileTestCache ? testsuite/libbase/RcTest ? testsuite/libbase/gnash-dbg.log ? testsuite/libbase/site.exp ? testsuite/libbase/testrun.log ? testsuite/libbase/testrun.sum ? testsuite/misc-ming.all/DefineEditTextTest ? testsuite/misc-ming.all/DefineEditTextVariableNameTest ? testsuite/misc-ming.all/PlaceObject2Test ? testsuite/misc-ming.all/RemoveObject2Test Index: macros/boost.m4 =================================================================== RCS file: /sources/gnash/gnash/macros/boost.m4,v retrieving revision 1.6 diff -u -3 -p -r1.6 boost.m4 --- macros/boost.m4 5 Oct 2006 20:44:57 -0000 1.6 +++ macros/boost.m4 6 Oct 2006 20:42:35 -0000 @@ -85,15 +85,9 @@ AC_DEFUN([GNASH_PATH_BOOST], dnl Look for the library AC_ARG_WITH(boost_lib, [ --with-boost-lib directory where boost libraries are], with_boost_lib=${withval}) - AC_CACHE_VAL(ac_cv_path_boost_lib,[ - if test x"${with_boost_lib}" != x ; then - if test -f ${with_boost_lib}/libboost_thread.a -o -f ${with_boost_lib}/libboost_thread.so; then - ac_cv_path_boost_lib=`(cd ${with_boost_lib}; pwd)` - else - AC_MSG_ERROR([${with_boost_lib} directory doesn't contain boost libraries.]) - fi - fi - ]) + if test x"${with_boost_lib}" != x ; then + ac_cv_path_boost_lib=`(cd ${with_boost_lib}; pwd)` + fi boostnames="boost_thread boost-thread boost_thread-mt boost_thread-gcc-mt" for j in $boostnames; do @@ -102,7 +96,7 @@ AC_DEFUN([GNASH_PATH_BOOST], 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/${j}.a -o -f $i/${j}.so; then + if test -f $i/lib${j}.a -o -f $i/lib${j}.so; then if test x"$i" != x"/usr/lib"; then ac_cv_path_boost_lib="-L$i -l${j}" AC_MSG_RESULT(${ac_cv_path_boost_lib}) @@ -114,8 +108,11 @@ AC_DEFUN([GNASH_PATH_BOOST], fi fi done]) + if test x"${ac_cv_path_boost_lib}" != x ; then + break; + fi else - if test -f ${ac_cv_path_boost_lib}/${j}.a -o -f ${ac_cv_path_boost_lib}/${j}.so; then + if test -f ${ac_cv_path_boost_lib}/lib${j}.a -o -f ${ac_cv_path_boost_lib}/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} -l${j}"