summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Triplett <josh@freedesktop.org>2008-04-14 13:31:22 -0700
committerJosh Triplett <josh@freedesktop.org>2008-04-15 10:54:41 -0700
commitd91f2b4e9041538400e2703a2a6fbeecdb8ee27d (patch)
tree189c591ecff9b8c27b8e48ff6f7ce086fbeb3d1f
parent91dd9486d2cc9bc284a7af9d35e654d2d5f1ab97 (diff)
Fix fallback to libtool.
-rw-r--r--dolt.m46
1 files changed, 4 insertions, 2 deletions
diff --git a/dolt.m4 b/dolt.m4
index 2f5d9db..1195da3 100644
--- a/dolt.m4
+++ b/dolt.m4
@@ -28,6 +28,8 @@ amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*) ;;
esac
if test x$dolt_supported = xno ; then
AC_MSG_RESULT([no, falling back to libtool])
+ LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
+ LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
else
AC_MSG_RESULT([yes, replacing libtool])
@@ -127,9 +129,9 @@ __DOLTCOMPILE__EOF__
dnl Done writing out doltcompile; substitute it for libtool compilation.
chmod +x doltcompile
LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)'
- AC_SUBST(LTCOMPILE)
LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)'
- AC_SUBST(LTCXXCOMPILE)
fi
+AC_SUBST(LTCOMPILE)
+AC_SUBST(LTCXXCOMPILE)
# end dolt
])