aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Thorpe <thorpej@wasabisystems.com>2002-09-23 23:36:54 +0000
committerJason Thorpe <thorpej@wasabisystems.com>2002-09-23 23:36:54 +0000
commitb14dad687d99b66c5f4429e3ab44af2948f8943e (patch)
tree239566dbfe9b7fd4554f2a67b3d803fd3e68f2a3
parentf0227ea3c78d8d23dc35f0939219649447eecfae (diff)
downloadnewlib-b14dad687d99b66c5f4429e3ab44af2948f8943e.zip
newlib-b14dad687d99b66c5f4429e3ab44af2948f8943e.tar.gz
newlib-b14dad687d99b66c5f4429e3ab44af2948f8943e.tar.bz2
* configure.in (with_headers): Skip copy if value is "yes".
(with_libs): Likewise.
-rw-r--r--ChangeLog5
-rw-r--r--configure.in41
2 files changed, 28 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 0283910..7da3a1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* configure.in (*-*-netbsd*): Use noconfigdirs, not skipdirs.
diff --git a/configure.in b/configure.in
index 0372cdc..2491fa7 100644
--- a/configure.in
+++ b/configure.in
@@ -876,36 +876,41 @@ esac
copy_dirs=
-# Handle --with-headers=XXX. The contents of the named directory are
-# copied to $(tooldir)/sys-include.
+# Handle --with-headers=XXX. If the value is not "yes", the contents of
+# the named directory are copied to $(tooldir)/sys-include.
if test x"${with_headers}" != x ; then
if test x${is_cross_compiler} = xno ; then
echo 1>&2 '***' --with-headers is only supported when cross compiling
exit 1
fi
- case "${exec_prefixoption}" in
- "") x=${prefix} ;;
- *) x=${exec_prefix} ;;
- esac
- copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/sys-include"
+ if test x"${with_headers}" != xyes ; then
+ case "${exec_prefixoption}" in
+ "") x=${prefix} ;;
+ *) x=${exec_prefix} ;;
+ esac
+ copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/sys-include"
+ fi
fi
-# Handle --with-libs=XXX. Multiple directories are permitted. The
-# contents are copied to $(tooldir)/lib.
+# Handle --with-libs=XXX. If the value is not "yes", the contents of
+# the name directories are copied to $(tooldir)/lib. Multiple directories
+# are permitted.
if test x"${with_libs}" != x ; then
if test x${is_cross_compiler} = xno ; then
echo 1>&2 '***' --with-libs is only supported when cross compiling
exit 1
fi
- # Copy the libraries in reverse order, so that files in the first named
- # library override files in subsequent libraries.
- case "${exec_prefixoption}" in
- "") x=${prefix} ;;
- *) x=${exec_prefix} ;;
- esac
- for l in ${with_libs}; do
- copy_dirs="$l $x/${target_alias}/lib ${copy_dirs}"
- done
+ if test x"${with_libs}" != xyes ; then
+ # Copy the libraries in reverse order, so that files in the first named
+ # library override files in subsequent libraries.
+ case "${exec_prefixoption}" in
+ "") x=${prefix} ;;
+ *) x=${exec_prefix} ;;
+ esac
+ for l in ${with_libs}; do
+ copy_dirs="$l $x/${target_alias}/lib ${copy_dirs}"
+ done
+ fi
fi
# Handle ${copy_dirs}