frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dolt from upstream, fixing fallback to libtool.

This commit is contained in:
Eric Anholt 2008-04-16 12:07:51 -07:00
parent e1e189f853
commit b907258ebe
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
acinclude.m4
View File

@ -8,8 +8,7 @@ dnl To use dolt, invoke the DOLT macro immediately after the libtool macros.
dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it
dnl installed when running autoconf on your project. dnl installed when running autoconf on your project.
dnl dnl
dnl git snapshot: 198a3026b347b9220a2f2e2ae23a3049c35af262 dnl git snapshot: d91f2b4e9041538400e2703a2a6fbeecdb8ee27d
AC_DEFUN([DOLT], [ AC_DEFUN([DOLT], [
AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_CANONICAL_HOST])
# dolt, a replacement for libtool # dolt, a replacement for libtool
@ -27,11 +26,13 @@ if test x$GCC != xyes; then
fi fi
case $host in case $host in
i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*) ;; i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*) ;;
amd64-*-freebsd*|i386-*-freebsd*|ia64-*-freebsd*) ;; amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*) ;;
*) dolt_supported=no ;; *) dolt_supported=no ;;
esac esac
if test x$dolt_supported = xno ; then if test x$dolt_supported = xno ; then
AC_MSG_RESULT([no, falling back to libtool]) 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 else
AC_MSG_RESULT([yes, replacing libtool]) AC_MSG_RESULT([yes, replacing libtool])
@ -65,9 +66,10 @@ dnl Write out shared compilation code.
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
libobjdir="${obj%$objbase}.libs" libobjdir="${obj%$objbase}.libs"
if test ! -d "$libobjdir" ; then if test ! -d "$libobjdir" ; then
mkdir -p "$libobjdir" mkdir_out="$(mkdir "$libobjdir" 2>&1)"
mkdir_ret=$? mkdir_ret=$?
if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
echo "$mkdir_out" 1>&2
exit $mkdir_ret exit $mkdir_ret
fi fi
fi fi
@ -130,10 +132,10 @@ __DOLTCOMPILE__EOF__
dnl Done writing out doltcompile; substitute it for libtool compilation. dnl Done writing out doltcompile; substitute it for libtool compilation.
chmod +x doltcompile chmod +x doltcompile
LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)' LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)'
AC_SUBST(LTCOMPILE)
LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)' LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)'
AC_SUBST(LTCXXCOMPILE)
fi fi
AC_SUBST(LTCOMPILE)
AC_SUBST(LTCXXCOMPILE)
# end dolt # end dolt
]) ])