Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9900/buildtools/conf
Modified Files:
MonetDB.m4
Log Message:
clean-up:
- do not install, package & distribute configure-generated <pkg>_config.h;
each pkg need to generate and include its own <pkg>_config.h, anyway.
- avoid maintaining, installing, packaging & distributing redundant
sysdefs.h[.in];
(re-)use MonetDB/sysdefs.h.in instead.
- ensure that each pkg includes its own <pkg>_config.h, only.
- replace "hacky" definitions of MONETDBPREFIX & MONETDBCONFIG
by proper(?) definitions of MONETDB[45]_PREFIX & MONETDB[45]_CONFFILE;
TODO:
on Windows, find a way to replace the hard-wired definitions
of MONETDB[45]_PREFIX & MONETDB[45]_CONFFILE
in sql/NT/sql_config.h.in & pathfinder/NT/pf_config.h.in
by proper ones that use the output of
`monetdb[45]-config --prefix` & `monetdb[45]-config --syscofdir` .
Index: MonetDB.m4
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- MonetDB.m4 28 Nov 2007 16:23:13 -0000 1.51
+++ MonetDB.m4 4 Dec 2007 01:04:28 -0000 1.52
@@ -395,6 +395,7 @@
MONETDB4_MODS=""
MONETDB4_MOD_PATH=""
MONETDB4_PREFIX=""
+ MONETDB4_CONFFILE=""
else
MONETDB4_CFLAGS=`$MONETDB4_CONFIG --cflags`
MONETDB4_INCS=`$MONETDB4_CONFIG --includes`
@@ -403,6 +404,9 @@
MONETDB4_MODS=`$MONETDB4_CONFIG --mods | sed 's/-L\([[^ ]]*\)/& -R\1/g'`
MONETDB4_MOD_PATH=`$MONETDB4_CONFIG --modpath`
MONETDB4_PREFIX=`$MONETDB4_CONFIG --prefix`
+ MONETDB4_CONFFILE=`$MONETDB4_CONFIG --sysconfdir`/MonetDB.conf
+ AC_DEFINE_UNQUOTED(MONETDB4_CONFFILE, "$MONETDB4_CONFFILE", [MonetDB4
config file location])
+ AC_DEFINE_UNQUOTED(MONETDB4_PREFIX, "$MONETDB4_PREFIX", [MonetDB4
configured prefix])
fi
fi
AC_SUBST(MONETDB4_CFLAGS)
@@ -466,7 +470,6 @@
MONETDB5_MODS=""
MONETDB5_MOD_PATH=""
MONETDB5_PREFIX=""
- # can't use MONETDB5_CONFIG: already in use, MONETDBCONFIG is out of line
MONETDB5_CONFFILE=""
else
MONETDB5_CFLAGS=`$MONETDB5_CONFIG --cflags`
@@ -476,7 +479,9 @@
MONETDB5_MODS=`$MONETDB5_CONFIG --mods | sed 's/-L\([[^ ]]*\)/& -R\1/g'`
MONETDB5_MOD_PATH=`$MONETDB5_CONFIG --modpath`
MONETDB5_PREFIX=`$MONETDB5_CONFIG --prefix`
- MONETDB5_CONFFILE=`$MONETDB_CONFIG --sysconfdir`/monetdb5.conf
+ MONETDB5_CONFFILE=`$MONETDB5_CONFIG --sysconfdir`/monetdb5.conf
+ AC_DEFINE_UNQUOTED(MONETDB5_CONFFILE, "$MONETDB5_CONFFILE", [MonetDB5
config file location])
+ AC_DEFINE_UNQUOTED(MONETDB5_PREFIX, "$MONETDB5_PREFIX", [MonetDB5
configured prefix])
fi
fi
AC_SUBST(MONETDB5_CFLAGS)
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
