2008-05-21 Zoltan Varga <vargaz@gmail.com>

	* configure.in: Add support for the DOLT libtool replacement.

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

diff --git a/ChangeLog b/ChangeLog
index 56358fc3256d8985a691b05f7c772fcc171664d8..03600e93ddf1e9436a497ffbc3e18de3ab95da6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-21  Zoltan Varga  <vargaz@gmail.com>
+
+       * configure.in: Add support for the DOLT libtool replacement.
+
 2008-05-19  Zoltan Varga  <vargaz@gmail.com>
 
        * configure.in: Change the way CPPFLAGS/CFLAGS are passed to libgc one more

diff --git a/configure.in b/configure.in
index ea77978a2639e8cd89333b4826d464f4ecdcf832..50e9306f779866ee6c07871fa79734f675e280ff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -300,6 +300,17 @@ AC_LIBTOOL_WIN32_DLL
 # This causes monodis to not link correctly
 #AC_DISABLE_FAST_INSTALL
 AM_PROG_LIBTOOL
+ 
+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