Selaa lähdekoodia

2008-06-30 Alp Toker <[email protected]>

	* 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
Alp Toker 17 vuotta sitten
vanhempi
sitoutus
e49ff7fdec
3 muutettua tiedostoa jossa 8 lisäystä ja 12 poistoa
  1. 6 0
      ChangeLog
  2. 1 1
      acinclude.m4
  3. 1 11
      configure.in

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+2008-06-30  Alp Toker  <[email protected]>
+
+	* configure.in:
+	* acinclude.m4: Remove concatenation syntax from doltlibtool to support
+	old versions of bash and re-enable dolt.
+
 2008-06-26  Alp Toker  <[email protected]>
 
 	* acinclude.m4: Prospective dolt fix for the build bot. Fix syntax to work

+ 1 - 1
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

+ 1 - 11
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