2008-06-30 Alp Toker <alp@nuanti.com>

	* configure.in:
	* acinclude.m4: Remove concatenation syntax from doltlibtool to support
	old versions of bash and re-enable dolt.

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

diff --git a/ChangeLog b/ChangeLog
index dd7aea4fb78dd07097a4ef00b2bd6e2009b13d56..5092d0d926795fe65f2f1b870b4a3643c495c0db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-30  Alp Toker  <alp@nuanti.com>
+
+       * configure.in:
+       * acinclude.m4: Remove concatenation syntax from doltlibtool to support
+       old versions of bash and re-enable dolt.
+
 2008-06-26  Alp Toker  <alp@nuanti.com>
 
        * acinclude.m4: Prospective dolt fix for the build bot. Fix syntax to work

diff --git a/acinclude.m4 b/acinclude.m4
index 8c75480ae08c3b6bdadebf3825df76069e0e557f..8f94582fb899804409f4cc1595d1d8f3aa90fe02 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -157,7 +157,7 @@ for arg in "$[]@"; do
     case "$arg" in
         --mode=compile) modeok=true ;;
         --tag=CC|--tag=CXX) tagok=true ;;
-        *) args+=("$arg")
+        *) args@<:@${#args[@]}@:>@="$arg" ;;
     esac
 done
 if $modeok && $tagok ; then

diff --git a/configure.in b/configure.in
index 1873ac0e3bd01321abc172e02e5b78a8b0a1e940..4358d0ae8457d531551f561c54c3354ce3de737a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -300,18 +300,8 @@ AC_LIBTOOL_WIN32_DLL
 # This causes monodis to not link correctly
 #AC_DISABLE_FAST_INSTALL
 AM_PROG_LIBTOOL
- 
 # Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.
-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
+DOLT
 
 # Test whenever ld supports -version-script
 AC_PROG_LD