Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5298/conf
Modified Files:
Tag: MonetDB_1-20
MonetDB.m4
Log Message:
fixing bug
[ 1792333 ] Java compilation errors when compiling clients module
http://sourceforge.net/tracker/index.php?func=detail&aid=1792333&group_id=56967&atid=482468
Apparently, ant gets confused with paths containing symbolic links;
hence, we use `readlink -f` (if available)
to translate paths that (potentially) contain symbolic links
into absolut physical paths without symbolic links.
Index: MonetDB.m4
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -u -d -r1.37.2.2 -r1.37.2.3
--- MonetDB.m4 21 Sep 2007 08:23:57 -0000 1.37.2.2
+++ MonetDB.m4 3 Oct 2007 12:43:41 -0000 1.37.2.3
@@ -1085,6 +1085,7 @@
AC_CHECK_PROG(LOCKFILE,lockfile,lockfile -r 2,echo)
AC_PATH_PROG(BASH,bash, /usr/bin/bash, $PATH)
AC_CHECK_PROGS(RPMBUILD,rpmbuild rpm)
+AC_CHECK_PROG(READLINK,readlink,readlink -f,echo)
SOPREF=lib
case "$host_os" in
@@ -1473,22 +1474,24 @@
AC_DEFUN([AM_MONETDB_OPTIONS],
[
-dnl --with-translatepath
translatepath=echo
+anttranslatepath=$READLINK
+
+dnl --with-translatepath
AC_ARG_WITH(translatepath,
AC_HELP_STRING([--with-translatepath=PROG],
[program to translate paths from configure-time format to
execute-time format. Take care that this program can be given paths like
${prefix}/etc which should be translated carefully.]),
- translatepath="$withval",
+ [translatepath="$withval"
+ anttranslatepath="$withval"],
[if test $cross_compiling = yes; then
AC_MSG_WARN([Cross compiling, but no --with-translatepath
option given])
fi])
AC_SUBST(translatepath)
dnl --with-anttranslatepath
-anttranslatepath="$translatepath"
AC_ARG_WITH(anttranslatepath,
AC_HELP_STRING([--with-anttranslatepath=PROG],
- [program to translate paths from configure-time format to a
format that can be given to the ant program [default: value for
--with-translatepath]]),
+ [program to translate paths from configure-time format to a
format that can be given to the ant program [default: 'readlink -f' or value
for --with-translatepath]]),
anttranslatepath="$withval")
AC_SUBST(anttranslatepath)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
