gcc/

2006-11-08  Carlos O'Donell  <carlos@codesourcery.com>

	* configure.ac: Do not set PREFIX_INCLUDE_DIR if $prefix is NONE.
	* configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@118588 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d215ec5..c110758 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-08  Carlos O'Donell  <carlos@codesourcery.com>
+
+       * configure.ac: Do not set PREFIX_INCLUDE_DIR if $prefix is NONE.
+       * configure: Regenerate.
+
 2006-11-08  Dorit Nuzman  <dorit@il.ibm.com>
 
        * tree-vect-analyze.c (vect_mark_relevant, vect_stmt_relevant_p): Take 

diff --git a/gcc/configure b/gcc/configure
index 18a7879..7723fc4 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -16176,7 +16176,8 @@ _ACEOF
 fi
 
 if test x$with_sysroot = x && test x$host = x$target \
-   && test "$prefix" != "/usr" && test "x$prefix" != "x$local_prefix" ; then
+   && test "$prefix" != "/usr" && test "x$prefix" != "x$local_prefix" \
+   && test "$prefix" != "NONE"; then
 
 cat >>confdefs.h <<_ACEOF
 #define PREFIX_INCLUDE_DIR "$prefix/include"

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 4cae3c8..9d265b0 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3285,7 +3285,8 @@ if test x"$gcc_cv_ld_sysroot" = xyes; then
 fi       
 
 if test x$with_sysroot = x && test x$host = x$target \
-   && test "$prefix" != "/usr" && test "x$prefix" != "x$local_prefix" ; then
+   && test "$prefix" != "/usr" && test "x$prefix" != "x$local_prefix" \
+   && test "$prefix" != "NONE"; then
   AC_DEFINE_UNQUOTED(PREFIX_INCLUDE_DIR, "$prefix/include",
 [Define to PREFIX/include if cpp should also search that directory.])
 fi