Update of /cvsroot/monetdb/pathfinder
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13128/pathfinder
Modified Files:
Tag: XQuery_0-22
configure.ag
Log Message:
Some time ago, I renamed variables "MONETDB(|4|5)VERS" into
"MONETDB(|4|5)_VERSION"
in buildtools/conf/MonetDB.m4.
Apparently, I unfortunately forgot to keep */configure.ag aligned ...
Luckily, in */configure.ag the "MONETDB(|4|5)VERS" / "MONETDB(|4|5)_VERSION"
are only used in configure warnings and error messages in case
(no suitable version of) MonetDB, MonetDB4 and/or MonetDB5 are NOT found ...
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/configure.ag,v
retrieving revision 1.124.6.2
retrieving revision 1.124.6.3
diff -u -d -r1.124.6.2 -r1.124.6.3
--- configure.ag 18 Feb 2008 16:17:53 -0000 1.124.6.2
+++ configure.ag 19 Feb 2008 17:43:42 -0000 1.124.6.3
@@ -64,10 +64,10 @@
# Contact [EMAIL PROTECTED] for details and/or assistance.
AM_MONETDB_COMMON($req_monetdb_ver)
if test "x$have_monetdb" != xyes; then
- if test "x$MONETDBVERS" = x; then
+ if test "x$MONETDB_VERSION" = x; then
AC_MSG_NOTICE([No MonetDB base installation found. No runtime support
for MonetDB4 and MonetDB5 will be compiled.])
else
- AC_MSG_WARN([Your MonetDB base installation is outdated (version
$MONETDBVERS, required $req_monetdb_ver). No runtime support for MonetDB4 and
MonetDB5 will be compiled.])
+ AC_MSG_WARN([Your MonetDB base installation is outdated (version
$MONETDB_VERSION, required $req_monetdb_ver). No runtime support for MonetDB4
and MonetDB5 will be compiled.])
fi
fi
@@ -119,30 +119,30 @@
dnl Test for MonetDB4
if test "x$have_monetdb4" != xyes; then
- if test "x$MONETDB4VERS" = x; then
+ if test "x$MONETDB4_VERSION" = x; then
AC_MSG_NOTICE([Pathfinder will be compiled without MonetDB4
support])
AC_MSG_NOTICE([(no installation of MonetDB4 found).])
else
AC_MSG_WARN([Pathfinder will be compiled without MonetDB4
support,])
- AC_MSG_WARN([since your version ($MONETDB4VERS) is outdated])
+ AC_MSG_WARN([since your version ($MONETDB4_VERSION) is outdated])
AC_MSG_WARN([(Pathfinder requires at least version
$req_monetdb4_ver).])
fi
else
- AC_MSG_NOTICE([MonetDB4 support enabled (found version $MONETDB4VERS
of MonetDB4).])
+ AC_MSG_NOTICE([MonetDB4 support enabled (found version
$MONETDB4_VERSION of MonetDB4).])
fi
dnl Test for MonetDB5
if test "x$have_monetdb5" != xyes; then
- if test "x$MONETDB5VERS" = x; then
+ if test "x$MONETDB5_VERSION" = x; then
AC_MSG_NOTICE([Pathfinder will be compiled without MonetDB5
support])
AC_MSG_NOTICE([(no installation of MonetDB5 found).])
else
AC_MSG_WARN([Pathfinder will be compiled without MonetDB5
support,])
- AC_MSG_WARN([since your version ($MONETDB5VERS) is outdated])
+ AC_MSG_WARN([since your version ($MONETDB5_VERSION) is outdated])
AC_MSG_WARN([(Pathfinder requires at least version
$req_monetdb5_ver).])
fi
else
- AC_MSG_NOTICE([MonetDB5 support enabled (found version $MONETDB5VERS
of MonetDB5).])
+ AC_MSG_NOTICE([MonetDB5 support enabled (found version
$MONETDB5_VERSION of MonetDB5).])
fi
else
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
