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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/13 23:13:15

Modified files:
        macros         : boost.m4 ogg.m4 

Log message:
        More fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ogg.m4?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- boost.m4    13 Oct 2006 23:07:35 -0000      1.16
+++ boost.m4    13 Oct 2006 23:13:15 -0000      1.17
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: boost.m4,v 1.16 2006/10/13 23:07:35 nihilus Exp $
+dnl $Id: boost.m4,v 1.17 2006/10/13 23:13:15 nihilus Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -118,10 +118,10 @@
   dnl a C function, as double colons screw up autoconf. We also force the 
probable 
   boostnames="boost_thread-gcc-mt boost_thread boost-thread boost_thread-mt 
boost-thread-gcc-mt"
   version_suffix=`echo ${gnash_boost_version} | tr '_' '.'`
-  dnl AC_MSG_CHECKING([for Boost thread library])
   AC_LANG_PUSH(C++)
   if test x"${ac_cv_path_boost_lib}" = x; then
   AC_SEARCH_LIBS(cleanup_slots, ${boostnames}, 
[ac_cv_path_boost_lib="$ac_cv_search_cleanup_slots"],[
+  AC_MSG_CHECKING([for Boost thread library])
       libslist="${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/lib64 
/usr/lib32 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib 
/opt/local/lib /usr/pkg/lib .. ../.."
       for i in $libslist; do
         boostnames=`ls -dr $i/libboost?thread*.so`
@@ -141,6 +141,7 @@
           break; 
         fi        
       done
+    AC_MSG_RESULT(${ac_cv_path_boost_lib})
     ])
   else
     if test -f ${ac_cv_path_boost_lib}/lib${j}.a -o -f 
${ac_cv_path_boost_lib}/lib${j}.so; then
@@ -153,7 +154,6 @@
     fi
   fi
   AC_LANG_POP(C++)
-dnl  AC_MSG_RESULT(${ac_cv_path_boost_lib})
   
   BOOST_LIBS="$ac_cv_path_boost_lib"
   

Index: ogg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ogg.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- ogg.m4      13 Oct 2006 23:02:44 -0000      1.17
+++ ogg.m4      13 Oct 2006 23:13:15 -0000      1.18
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: ogg.m4,v 1.17 2006/10/13 23:02:44 nihilus Exp $
+dnl $Id: ogg.m4,v 1.18 2006/10/13 23:13:15 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_OGG],
 [
@@ -113,7 +113,7 @@
       if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ogg_lib}" = x; then
         $PKG_CONFIG --exists ogg && ac_cv_path_ogg_lib=`$PKG_CONFIG --libs ogg`
       fi
-      AC_MSG_CHECKING([for libogg library])
+
       if test x"${ac_cv_path_ogg_lib}" = x; then
         AC_CHECK_LIB(ogg, ogg_sync_init, [ac_cv_path_ogg_lib="-logg"],[
           libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib  /opt/local/lib /usr/pkg/lib .. ../.."
@@ -129,7 +129,7 @@
            fi
           done])      
       fi
-      
+      AC_MSG_CHECKING([for libogg library])      
       AC_MSG_RESULT(${ac_cv_path_ogg_lib})
       
       if test x"${ac_cv_path_ogg_lib}" != x ; then