Disable DOLT by default and bring back the configure flag

It works on most systems but seems to break the build bot.
Needs more investigation.

svn path=/trunk/mono/; revision=106707

diff --git a/acinclude.m4 b/acinclude.m4
index d621bfcd81c4acf490f0f616c9fcbc011c572364..8c75480ae08c3b6bdadebf3825df76069e0e557f 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -150,14 +150,14 @@ __DOLTLIBTOOL__EOF__
     cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
 top_builddir_slash="${0%%doltlibtool}"
 : ${top_builddir_slash:=./}
-args=
+args=()
 modeok=false
 tagok=false
 for arg in "$[]@"; do
     case "$arg" in
         --mode=compile) modeok=true ;;
         --tag=CC|--tag=CXX) tagok=true ;;
-        *) args="$args $arg" ;;
+        *) args+=("$arg")
     esac
 done
 if $modeok && $tagok ; then

diff --git a/configure.in b/configure.in
index e9a1d8a3c83bc0e965d110a01255de9af93c4b02..c1767a3cbb375990311d225135f1c278c217f986 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -302,7 +302,16 @@ AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
  
 # Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.
-DOLT
+AC_ARG_ENABLE(dolt, [ --enable-dolt    Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.])
+ 
+if test "x$enable_dolt" = "xyes"; then
+   DOLT
+ else
++      # The DOLT macro contains AC_SUBST's for these so we must define them because of
+       # autoconf brokeness
+    LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
+    LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
+fi
 
 # Test whenever ld supports -version-script
 AC_PROG_LD