* configure.in (with_headers): Skip copy if value is "yes".

(with_libs): Likewise.
This commit is contained in:
Jason Thorpe 2002-09-23 23:36:54 +00:00
parent 10f469bf06
commit bdc57bfd91
2 changed files with 28 additions and 18 deletions

View file

@ -1,3 +1,8 @@
2002-09-23 Jason Thorpe <thorpej@wasabisystems.com>
* configure.in (with_headers): Skip copy if value is "yes".
(with_libs): Likewise.
2002-09-20 Nathanael Nerode <neroden@gcc.gnu.org> 2002-09-20 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.in (*-*-netbsd*): Use noconfigdirs, not skipdirs. * configure.in (*-*-netbsd*): Use noconfigdirs, not skipdirs.

View file

@ -876,36 +876,41 @@ esac
copy_dirs= copy_dirs=
# Handle --with-headers=XXX. The contents of the named directory are # Handle --with-headers=XXX. If the value is not "yes", the contents of
# copied to $(tooldir)/sys-include. # the named directory are copied to $(tooldir)/sys-include.
if test x"${with_headers}" != x ; then if test x"${with_headers}" != x ; then
if test x${is_cross_compiler} = xno ; then if test x${is_cross_compiler} = xno ; then
echo 1>&2 '***' --with-headers is only supported when cross compiling echo 1>&2 '***' --with-headers is only supported when cross compiling
exit 1 exit 1
fi fi
case "${exec_prefixoption}" in if test x"${with_headers}" != xyes ; then
"") x=${prefix} ;; case "${exec_prefixoption}" in
*) x=${exec_prefix} ;; "") x=${prefix} ;;
esac *) x=${exec_prefix} ;;
copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/sys-include" esac
copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/sys-include"
fi
fi fi
# Handle --with-libs=XXX. Multiple directories are permitted. The # Handle --with-libs=XXX. If the value is not "yes", the contents of
# contents are copied to $(tooldir)/lib. # the name directories are copied to $(tooldir)/lib. Multiple directories
# are permitted.
if test x"${with_libs}" != x ; then if test x"${with_libs}" != x ; then
if test x${is_cross_compiler} = xno ; then if test x${is_cross_compiler} = xno ; then
echo 1>&2 '***' --with-libs is only supported when cross compiling echo 1>&2 '***' --with-libs is only supported when cross compiling
exit 1 exit 1
fi fi
# Copy the libraries in reverse order, so that files in the first named if test x"${with_libs}" != xyes ; then
# library override files in subsequent libraries. # Copy the libraries in reverse order, so that files in the first named
case "${exec_prefixoption}" in # library override files in subsequent libraries.
"") x=${prefix} ;; case "${exec_prefixoption}" in
*) x=${exec_prefix} ;; "") x=${prefix} ;;
esac *) x=${exec_prefix} ;;
for l in ${with_libs}; do esac
copy_dirs="$l $x/${target_alias}/lib ${copy_dirs}" for l in ${with_libs}; do
done copy_dirs="$l $x/${target_alias}/lib ${copy_dirs}"
done
fi
fi fi
# Handle ${copy_dirs} # Handle ${copy_dirs}