CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/10/06 00:49:52
Modified files:
. : configure.ac ChangeLog
macros : boost.m4
Log message:
* macros/boost.m4: Adjust error messages when boost files aren't
found by configure.
* configure.ac: Adjust error messages when boost files aren't
found by configure.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.427&r2=1.428
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4548&r2=1.4549
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.63&r2=1.64
Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -b -r1.427 -r1.428
--- configure.ac 5 Oct 2007 20:59:38 -0000 1.427
+++ configure.ac 6 Oct 2007 00:49:51 -0000 1.428
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.427 2007/10/05 20:59:38 rsavoye Exp $
+dnl $Id: configure.ac,v 1.428 2007/10/06 00:49:51 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -2066,16 +2066,16 @@
if test x"${missing_headers}" != x; then
for i in ${missing_headers}; do
# They have some boost libs but no date_time and want to compile cygnal.
- echo " ERROR: The BOOST $i package is needed!"
+ echo " ERROR: The BOOST $i header file is needed!"
echo " Install it from http://boost.org";
- echo " or .deb users: apt-get install libboost-$i-dev"
+ echo " or from a Boost development package"
nogo=true
done
fi
if test x"${missing_libs}" != x; then
for i in ${missing_libs}; do
# They have some boost libs but no date_time and want to compile cygnal.
- echo " ERROR: The BOOST $i package is needed!"
+ echo " ERROR: The BOOST $i library is needed!"
echo " Install it from http://boost.org";
echo " or .deb users: apt-get install libboost-$i-dev"
nogo=true
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4548
retrieving revision 1.4549
diff -u -b -r1.4548 -r1.4549
--- ChangeLog 5 Oct 2007 22:27:57 -0000 1.4548
+++ ChangeLog 6 Oct 2007 00:49:51 -0000 1.4549
@@ -1,3 +1,10 @@
+2007-10-05 Rob Savoye <[EMAIL PROTECTED]>
+
+ * macros/boost.m4: Adjust error messages when boost files aren't
+ found by configure.
+ * configure.ac: Adjust error messages when boost files aren't
+ found by configure.
+
2007-10-05 Sandro Santilli <[EMAIL PROTECTED]>
* testsuite/actionscript.all/String.as: couple more tests for
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- macros/boost.m4 5 Oct 2007 20:19:34 -0000 1.63
+++ macros/boost.m4 6 Oct 2007 00:49:52 -0000 1.64
@@ -14,7 +14,7 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: boost.m4,v 1.63 2007/10/05 20:19:34 rsavoye Exp $
+dnl $Id: boost.m4,v 1.64 2007/10/06 00:49:52 rsavoye Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -50,7 +50,6 @@
newlist=${gnash_boost_topdir}
fi
- AC_MSG_CHECKING([for boost header])
dnl munge the GCC version number, which Boost uses to label it's libraries.
gcc_version=`${CXX} --version | head -1 | cut -d ' ' -f 3 | cut -d '.' -f
1-2 | tr -d '.'`
@@ -58,14 +57,16 @@
dnl Attempt to find the top level directory, which unfortunately has a
dnl version number attached. At least on Debian based systems, this
dnl doesn't seem to get a directory that is unversioned.
- AC_MSG_CHECKING([for the Boost Version])
if test x$cross_compiling = xno; then
if test x"$PKG_CONFIG" != x; then
+ AC_MSG_CHECKING([for the Boost Version])
$PKG_CONFIG --exists boost && gnash_boost_version=`$PKG_CONFIG
--modversion boost | cut -d "." -f 1 | awk '{print $'0'".0"}'`
+ AC_MSG_RESULT(${gnash_boost_version})
fi
fi
fi
+ AC_MSG_CHECKING([for boost header])
for i in $newlist; do
dirs=`ls -dr $i/boost* 2>/dev/null`
if test -n "${dirs}"; then
@@ -82,7 +83,8 @@
AC_MSG_RESULT(${ac_cv_path_boost_incl})
break
else
- AC_MSG_RESULT([You need to install ${missing_headers}])
+ AC_MSG_RESULT([headers missing])
+ AC_MSG_WARN([You need to install ${missing_headers}])
fi
fi
done
@@ -132,7 +134,7 @@
fi
if test x"${missing_libs}" != x ; then
- AC_MSG_ERROR([Libraries ${missing_libs} aren't installed ])
+ AC_MSG_WARN([Libraries ${missing_libs} aren't installed ])
fi
AC_MSG_RESULT(${ac_cv_path_boost_lib})
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
