Changeset: 4e4932153647 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4e4932153647
Modified Files:
MonetDB.spec
buildtools/conf/Makefile.ag
buildtools/conf/MonetDB.m4
configure.ag
Branch: default
Log Message:
Only install Maddlog for developers.
There is a new --enable-developer option which is default "yes" when
configuring from a Mercurial tree, "no" otherwise. When "yes", this
option causes Maddlog to be installed.
diffs (68 lines):
diff -r d4dc617fbbca -r 4e4932153647 MonetDB.spec
--- a/MonetDB.spec Wed Jan 12 14:23:35 2011 +0100
+++ b/MonetDB.spec Wed Jan 12 14:25:04 2011 +0100
@@ -475,9 +475,6 @@
%files devel
%defattr(-,root,root)
%{_bindir}/calibrator
-%{_bindir}/Maddlog
-%{_bindir}/Mbootstrap
-%{_bindir}/Mdebootstrap
%dir %{_includedir}/MonetDB
%dir %{_includedir}/MonetDB/common
%dir %{_includedir}/MonetDB/gdk
diff -r d4dc617fbbca -r 4e4932153647 buildtools/conf/Makefile.ag
--- a/buildtools/conf/Makefile.ag Wed Jan 12 14:23:35 2011 +0100
+++ b/buildtools/conf/Makefile.ag Wed Jan 12 14:25:04 2011 +0100
@@ -16,7 +16,7 @@
# All Rights Reserved.
scripts_sh = {
- COND = NOT_WIN32
+ COND = HAVE_DEVELOPER
EXT = ""
DIR = bindir
SOURCES = Maddlog
diff -r d4dc617fbbca -r 4e4932153647 buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4 Wed Jan 12 14:23:35 2011 +0100
+++ b/buildtools/conf/MonetDB.m4 Wed Jan 12 14:25:04 2011 +0100
@@ -25,6 +25,7 @@
dft_assert=yes
dft_debug=yes
dft_optimi=no
+ dft_develop=yes
else
dnl Users compiling from source tarball(s):
dnl default is --disable-strict --disable-assert --disable-debug
--disable-optimize
@@ -32,6 +33,7 @@
dft_assert=no
dft_debug=no
dft_optimi=no
+ dft_develop=no
fi
dft_warning=no
dft_netcdf=auto
diff -r d4dc617fbbca -r 4e4932153647 configure.ag
--- a/configure.ag Wed Jan 12 14:23:35 2011 +0100
+++ b/configure.ag Wed Jan 12 14:25:04 2011 +0100
@@ -157,6 +157,12 @@
enable_testing=$enableval,
enable_testing=$dft_testing)
+AC_ARG_ENABLE(developer,
+ AS_HELP_STRING([--enable-developer],
+ [enable support for MonetDB development (default=auto)]),
+ enable_developer=$enableval,
+ enable_developer=$dft_develop)
+
dnl Pathfinder has three different code generators: The
dnl "milprint_summer" back-end directly translates XQuery Core
dnl code into MIL, while the "algebra" back-end uses an intermediate
@@ -1468,6 +1474,7 @@
AM_CONDITIONAL(HAVE_PFTIJAH, test "x$enable_pftijah" = xyes -o
"x$enable_pftijah" = xauto)
AM_CONDITIONAL(HAVE_PROBXML, test "x$enable_probxml" = xyes -o
"x$enable_probxml" = xauto)
AM_CONDITIONAL(HAVE_TESTING, test "x$enable_testing" = xyes -o
"x$enable_testing" = xauto)
+AM_CONDITIONAL(HAVE_DEVELOPER, test "x$enable_developer" = xyes)
AC_SUBST(compilercall, ["$CC $CFLAGS $X_CFLAGS"])
AC_SUBST(linkercall, ["$LD $LDFLAGS"])
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
