[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog macros/boost.m4 macros/glib.m4 ... [relea
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash ChangeLog macros/boost.m4 macros/glib.m4 ... [release_0_7_2] |
Date: |
Mon, 30 Oct 2006 16:11:09 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Markus Gothe <nihilus> 06/10/30 16:11:09
Modified files:
. : ChangeLog
macros : boost.m4 glib.m4 gnashpkgtool.m4
Log message:
* macros/boost.m4: Applied patch from Bernhard Rosenkraenzer.
* macros/glib.m4: Fixed output.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.9&r2=1.1412.2.10
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.22.2.1&r2=1.22.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.17.2.1&r2=1.17.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.12.2.1&r2=1.12.2.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.9
retrieving revision 1.1412.2.10
diff -u -b -r1.1412.2.9 -r1.1412.2.10
--- ChangeLog 30 Oct 2006 15:39:32 -0000 1.1412.2.9
+++ ChangeLog 30 Oct 2006 16:11:09 -0000 1.1412.2.10
@@ -1,3 +1,8 @@
+2006-10-30 Markus Gothe <address@hidden>
+
+ * macros/boost.m4: Applied patch from Bernhard Rosenkraenzer.
+ * macros/glib.m4: Fixed output.
+
2006-10-30 Udo Giacomozzi <address@hidden>
* testsuite/samples/: subshapes.swf, README:
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -b -r1.22.2.1 -r1.22.2.2
--- macros/boost.m4 30 Oct 2006 14:28:47 -0000 1.22.2.1
+++ macros/boost.m4 30 Oct 2006 16:11:09 -0000 1.22.2.2
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: boost.m4,v 1.22.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: boost.m4,v 1.22.2.2 2006/10/30 16:11:09 nihilus Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -51,7 +51,7 @@
gnash_boost_version=""
for i in $pathlist; do
for j in `ls -dr $i/boost* 2>/dev/null`; do
- if test -f ${libdir}/boost/detail/lightweight_mutex.hpp; then
+ if test -f ${j}/boost/detail/lightweight_mutex.hpp; then
gnash_boost_topdir=`basename $j`
gnash_boost_version=`echo ${gnash_boost_topdir} | sed -e 's:boost-::'`
break
@@ -75,6 +75,12 @@
ac_cv_path_boost_incl="-I$i"
break
fi
+ for j in `ls -dr $i/boost* 2>/dev/null`; do
+ if test -f $j/boost/detail/lightweight_mutex.hpp; then
+ ac_cv_path_boost_incl="-I$j"
+ break
+ fi
+ done
done
fi])
fi
Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -b -r1.17.2.1 -r1.17.2.2
--- macros/glib.m4 30 Oct 2006 14:28:47 -0000 1.17.2.1
+++ macros/glib.m4 30 Oct 2006 16:11:09 -0000 1.17.2.2
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: glib.m4,v 1.17.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: glib.m4,v 1.17.2.2 2006/10/30 16:11:09 nihilus Exp $
AC_DEFUN([GNASH_PATH_GLIB],
[
@@ -62,7 +62,7 @@
fi
AC_MSG_RESULT([${gnash_glib_version}])
- AC_MSG_CHECKING([for libglib header])
+
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_glib_incl}" = x; then
AC_CHECK_HEADERS(glib.h, [ac_cv_path_glib_incl=""],[
@@ -83,6 +83,7 @@
fi
])
fi
+ AC_MSG_CHECKING([for libglib header])
AC_MSG_RESULT(${ac_cv_path_glib_incl})
dnl Look for the library
@@ -102,7 +103,6 @@
$PKG_CONFIG --exists glib-2.0 && ac_cv_path_glib_lib=`$PKG_CONFIG --libs
glib-2.0`
fi
- AC_MSG_CHECKING([for libglib library])
if test x"${ac_cv_path_glib_lib}" = x; then
AC_CHECK_LIB(glib-${gnash_glib_version}, g_io_channel_init,
[ac_cv_path_glib_lib="-lglib-${gnash_glib_version}"],[
libslist="${ac_cv_path_glib_lib} ${prefix}/lib64 ${prefix}/lib /usr/lib
/usr/lib64 /sw/lib /usr/local/lib /opt/local/lib /home/latest/lib /opt/lib
/usr/pkg/lib .. ../.."
@@ -124,6 +124,7 @@
done
])
fi
+ AC_MSG_CHECKING([for libglib library])
AC_MSG_RESULT(${ac_cv_path_glib_lib})
dnl
Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -b -r1.12.2.1 -r1.12.2.2
--- macros/gnashpkgtool.m4 30 Oct 2006 14:28:47 -0000 1.12.2.1
+++ macros/gnashpkgtool.m4 30 Oct 2006 16:11:09 -0000 1.12.2.2
@@ -17,10 +17,10 @@
dnl
dnl
-dnl $Id: gnashpkgtool.m4,v 1.12.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: gnashpkgtool.m4,v 1.12.2.2 2006/10/30 16:11:09 nihilus Exp $
dnl Generic macros for finding and setting include-paths and library-path
-dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS()..
+dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS()...
AC_DEFUN([GNASH_PKG_INCLUDES], dnl GNASH_PKG_INCLUDES(jpeg, [jpeglib.h], [jpeg
images])
[
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog macros/boost.m4 macros/glib.m4 ... [release_0_7_2],
Markus Gothe <=