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

[Markus Gothe]

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

Modified files:
        .              : ChangeLog 
        macros         : boost.m4 ogg.m4 

Log message:
        Clean up and fixed missing AC_LANG{PUSH,POP}(C++).

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1206
retrieving revision 1.1207
diff -u -b -r1.1206 -r1.1207
--- ChangeLog   13 Oct 2006 18:52:16 -0000      1.1206
+++ ChangeLog   13 Oct 2006 23:02:44 -0000      1.1207
@@ -9,6 +9,8 @@
 
        * gui/sdl.cpp, gui/sdl_ogl_glue.cpp: Fixed some #defines that were 
          reverted. Removed basename().
+       * macros/ogg.m4: Typo.
+       * macros/boost.m4: Clean up and fixed missing AC_LANG{PUSH,POP}(C++).
 
 2006-10-13 Udo Giacomozzi
 

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- macros/boost.m4     13 Oct 2006 18:52:16 -0000      1.14
+++ macros/boost.m4     13 Oct 2006 23:02:44 -0000      1.15
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: boost.m4,v 1.14 2006/10/13 18:52:16 rsavoye Exp $
+dnl $Id: boost.m4,v 1.15 2006/10/13 23:02:44 nihilus Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -48,9 +48,7 @@
   AC_CACHE_VAL(ac_cv_path_boost_incl,[
   if test x"${with_boost_incl}" != x ; then
     if test -f ${with_boost_incl}/boost/detail/lightweight_mutex.hpp ; then
-      ac_cv_path_boost_incl=`(cd ${with_boost_incl}; pwd)`
-    elif test -f ${with_boost_incl}/boost/detail/lightweight_mutex.hpp ; then
-      ac_cv_path_boost_incl=`(cd ${with_boost_incl}; pwd)`
+      ac_cv_path_boost_incl=-I`(cd ${with_boost_incl}; pwd)`
     else
       AC_MSG_ERROR([${with_boost_incl} directory doesn't contain any headers])
     fi
@@ -89,52 +87,42 @@
    AC_MSG_RESULT(${gnash_boost_version})
   fi
 
-  if test x"${gnash_boost_topdir}" = x ; then
-    AC_MSG_CHECKING([for boost header])
-
-    incllist="/sw/include /usr/local/include /home/latest/include 
/usr/pkg/include /opt/include /opt/local/include /usr/include .. ../.."
-    AC_CHECK_HEADERS(boost/detail/lightweight_mutex.hpp, 
[ac_cv_path_boost_incl=""],[
+  AC_LANG_PUSH(C++)
+  if test x"${ac_cv_path_boost_incl}" = x ; then
+    AC_CHECK_HEADERS(boost/detail/lightweight_mutex.hpp, 
[ac_cv_path_boost_incl="-I/usr/include"],[
     if test x"${ac_cv_path_boost_incl}" = x; then
+      incllist="/usr/local/include /sw/include /opt/local/include 
/usr/local/include /home/latest/include /opt/include /opt/local/include 
/opt/local/include /usr/include /usr/pkg/include .. ../.."
       for i in $incllist; do
         if test -f $i/boost/detail/lightweight_mutex.hpp; then
-          ac_cv_path_boost_incl="$i"
-         break;
-       else
-          if test -f 
$i/${gnash_boost_topdir}/boost/detail/lightweight_mutex.hpp; then
-            ac_cv_path_boost_incl="$i/${gnash_boost_topdir}"
+          ac_cv_path_boost_incl="-I$i"
             break
           fi
-        fi
       done
    fi])
   fi
-
-  if test x"${gnash_boost_topdir}" != x ; then
-    BOOST_CFLAGS="${ac_cv_path_boost_incl}"
-  else
-    BOOST_CFLAGS=""
-    AC_MSG_WARN([Boost header files not found!])
-  fi
-
+  AC_LANG_POP(C++)
+  AC_MSG_CHECKING([for boost header])
+  AC_MSG_RESULT(${ac_cv_path_boost_incl})
+  BOOST_CFLAGS="$ac_cv_path_boost_incl"
   AC_SUBST(BOOST_CFLAGS)
 
   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
      ac_cv_path_boost_lib=`(cd ${with_boost_lib}; pwd)`
   fi
+])
 
   dnl This is the default list of names to search for. The function needs to be
   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 '_' '.'`
-  AC_MSG_CHECKING([for Boost thread library])
-  ac_save_LIBS="$LIBS"
+  dnl AC_MSG_CHECKING([for Boost thread library])
   AC_LANG_PUSH(C++)
-  LIBS="-L${gnash_boost_topdir}/lib"
   if test x"${ac_cv_path_boost_lib}" = x; then
-  AC_SEARCH_LIBS(cleanup_slots, ${boostnames}, 
[ac_cv_path_boost_lib="${LIBS}"],[
-      libslist="${gnash_boost_topdir}/lib/boost-${gnash_boost_version} 
${gnash_boost_topdir}/lib ${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib 
/sw/lib /usr/local/lib /home/latest/lib /opt/lib /opt/local/lib /usr/pkg/lib .. 
../.."
+  AC_SEARCH_LIBS(cleanup_slots, ${boostnames}, [ac_cv_path_boost_lib=""],[
+      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`
         for libname in ${boostnames}; do
@@ -164,8 +152,6 @@
       fi
     fi
   fi
-
-  LIBS="$ac_save_LIBS"
   AC_LANG_POP(C++)
 dnl  AC_MSG_RESULT(${ac_cv_path_boost_lib})
   

Index: macros/ogg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ogg.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- macros/ogg.m4       12 Oct 2006 20:24:04 -0000      1.16
+++ macros/ogg.m4       13 Oct 2006 23:02:44 -0000      1.17
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: ogg.m4,v 1.16 2006/10/12 20:24:04 strk Exp $
+dnl $Id: ogg.m4,v 1.17 2006/10/13 23:02:44 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_OGG],
 [
@@ -64,7 +64,6 @@
     fi
 
     dnl If the path hasn't been specified, go look for it.
-    AC_MSG_CHECKING([for libogg header])
     if test x"${ac_cv_path_ogg_incl}" = x; then
       AC_CHECK_HEADERS(ogg.h, [ac_cv_path_ogg_incl=""],[
       if test x"${ac_cv_path_ogg_incl}" = x; then
@@ -89,6 +88,7 @@
        ac_cv_path_ogg_incl=""
       fi
     fi
+    AC_MSG_CHECKING([for libogg header])
     AC_MSG_RESULT(${ac_cv_path_ogg_incl})
  
     if test x"${ac_cv_path_ogg_incl}" != x ; then