Update of /cvsroot/monetdb/MonetDB
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17182/MonetDB
Modified Files:
configure.ag
Log Message:
unified path-variable setting during configure across all (active) modules
and centralized the generic part in AM_MONETDB_XQ_VARS_[12]() functions
defined in buildtools/conf/MonetDB.m4
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/configure.ag,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- configure.ag 15 Jul 2007 20:47:23 -0000 1.183
+++ configure.ag 13 Sep 2007 22:30:28 -0000 1.184
@@ -57,23 +57,8 @@
MONETDB_SOURCE=[`(cd $srcdir && pwd)`]
AC_SUBST(MONETDB_SOURCE)
-# if no --prefix option, we must set Qprefix to the default value
-# the problem is that prefix is set very late in the process if it
-# wasn't set by --prefix
-if test "${prefix}x" = "NONEx"; then
- Qprefix="${ac_default_prefix}"
-else
- Qprefix="${prefix}"
-fi
-Qprefix="`echo "$Qprefix" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qprefix)
-# exec_prefix is created very late, so let make do the expansion
-if test "${exec_prefix}x" = "NONEx"; then
- Qexec_prefix='${prefix}'
-else
- Qexec_prefix="`echo "$exec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"
-fi
-AC_SUBST(Qexec_prefix)
+AM_MONETDB_XQ_VARS_1()
+
AM_MONETDB_DEFAULTS()
@@ -117,26 +102,10 @@
AC_CHECK_FUNCS([fcntl ftime getopt getrlimit getuid kill lockf madvise
nanosleep pipe posix_fadvise posix_madvise setenv shutdown strdup strtof
sysconf uname strtoll fsync fdatasync])
AC_CHECK_DECLS([strdup, strtof])
+
dnl provide different versions of the paths derived above
-if test "${prefix}x" = "NONEx"; then
- Xprefix="`$translatepath "$Qprefix"`"
- QXprefix="`echo "$Xprefix" | sed 's/\\\\/\\\\\\\\/g'`"
-else
- Xprefix="`$translatepath "$prefix"`"
- QXprefix="`echo "$Xprefix" | sed 's/\\\\/\\\\\\\\/g'`"
-fi
-if test "${exec_prefix}x" = "NONEx"; then
- Xexec_prefix="`$translatepath "$Qexec_prefix"`"
- QXexec_prefix="`echo "$Xexec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"
-else
- Xexec_prefix="`$translatepath "$exec_prefix"`"
- QXexec_prefix="`echo "$Xexec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"
-fi
-AC_SUBST(Xprefix)
-AC_SUBST(QXprefix)
+AM_MONETDB_XQ_VARS_2()
AC_DEFINE_UNQUOTED(MONETDB_PREFIX,"$QXprefix",[architecture-independent files])
-AC_SUBST(Xexec_prefix)
-AC_SUBST(QXexec_prefix)
AC_DEFINE_UNQUOTED(MONETDB_EXEC_PREFIX,"$QXexec_prefix",[architecture-dependent
files])
QMONETDB_BUILD="$MONETDB_BUILD"
XMONETDB_BUILD="`$translatepath "$MONETDB_BUILD"`"
@@ -150,75 +119,10 @@
AC_SUBST(QMONETDB_SOURCE)
AC_SUBST(XMONETDB_SOURCE)
AC_SUBST(QXMONETDB_SOURCE)
-Qsrcdir="$srcdir"
-Xsrcdir="`$translatepath "$srcdir"`"
-QXsrcdir="`echo "$Xsrcdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qsrcdir)
-AC_SUBST(Xsrcdir)
-AC_SUBST(QXsrcdir)
-Qlocalstatedir="$localstatedir"
-Xlocalstatedir="`$translatepath "$localstatedir"`"
-QXlocalstatedir="`echo "$Xlocalstatedir" | sed 's/\\\\/\\\\\\\\/g'`"
AC_DEFINE_UNQUOTED(MONETDB_LOCALSTATEDIR,"$QXlocalstatedir",[modifiable
single-machine data])
-AC_SUBST(Qlocalstatedir)
-AC_SUBST(Xlocalstatedir)
-AC_SUBST(QXlocalstatedir)
-Qlibdir="$libdir"
-Xlibdir="`$translatepath "$libdir"`"
-QXlibdir="`echo "$Xlibdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qlibdir)
-AC_SUBST(Xlibdir)
-AC_SUBST(QXlibdir)
AC_DEFINE_UNQUOTED(MONETDB_LIBDIR,"$QXlibdir",[object code libraries])
-Qsysconfdir="$sysconfdir"
-Xsysconfdir="`$translatepath "$sysconfdir"`"
-QXsysconfdir="`echo "$Xsysconfdir" | sed 's/\\\\/\\\\\\\\/g'`"
AC_DEFINE_UNQUOTED(MONETDB_SYSCONFDIR,"$QXsysconfdir",[read-only
single-machine data])
-AC_SUBST(Qsysconfdir)
-AC_SUBST(Xsysconfdir)
-AC_SUBST(QXsysconfdir)
-Qbindir="$bindir"
-Xbindir="`$translatepath "$bindir"`"
-QXbindir="`echo "$Xbindir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qbindir)
-AC_SUBST(Xbindir)
-AC_SUBST(QXbindir)
-Qlibexecdir="$libexecdir"
-Xlibexecdir="`$translatepath "$libexecdir"`"
-QXlibexecdir="`echo "$Xlibexecdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qlibexecdir)
-AC_SUBST(Xlibexecdir)
-AC_SUBST(QXlibexecdir)
-Qdatarootdir="$datarootdir"
-Xdatarootdir="`$translatepath "$datarootdir"`"
-QXdatarootdir="`echo "$Xdatarootdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qdatarootdir)
-AC_SUBST(Xdatarootdir)
-AC_SUBST(QXdatarootdir)
-Qdatadir="$datadir"
-Xdatadir="`$translatepath "$datadir"`"
-QXdatadir="`echo "$Xdatadir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qdatadir)
-AC_SUBST(Xdatadir)
-AC_SUBST(QXdatadir)
-Qmandir="$mandir"
-Xmandir="`$translatepath "$mandir"`"
-QXmandir="`echo "$Xmandir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qmandir)
-AC_SUBST(Xmandir)
-AC_SUBST(QXmandir)
-Qincludedir="$includedir"
-Xincludedir="`$translatepath "$includedir"`"
-QXincludedir="`echo "$Xincludedir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qincludedir)
-AC_SUBST(Xincludedir)
-AC_SUBST(QXincludedir)
-Qinfodir="$infodir"
-Xinfodir="`$translatepath "$infodir"`"
-QXinfodir="`echo "$Xinfodir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qinfodir)
-AC_SUBST(Xinfodir)
-AC_SUBST(QXinfodir)
+
QPYTHON="$PYTHON"
XPYTHON="`$translatepath "$PYTHON"`"
QXPYTHON="`echo "$XPYTHON" | sed 's/\\\\/\\\\\\\\/g'`"
@@ -226,6 +130,7 @@
AC_SUBST(XPYTHON)
AC_SUBST(QXPYTHON)
+
case "$host_os" in
mac*) DIRSEP=':'
QDIRSEP=':'
-------------------------------------------------------------------------
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
