diff options
| author | Carlos O'Donell <carlos@codesourcery.com> | 2006-11-08 16:52:05 +0000 |
|---|---|---|
| committer | Carlos O'Donell <carlos@gcc.gnu.org> | 2006-11-08 16:52:05 +0000 |
| commit | c794c06fef9e079ecdd14bae8ceb3d9046771979 (patch) | |
| tree | 143a3cfe8cd127a29f65e3825cba499045cdc502 /gcc | |
| parent | 08d7f64ef01f6985ac8fa34c62241ece297c9ecd (diff) | |
| download | gcc-c794c06fef9e079ecdd14bae8ceb3d9046771979.zip gcc-c794c06fef9e079ecdd14bae8ceb3d9046771979.tar.gz gcc-c794c06fef9e079ecdd14bae8ceb3d9046771979.tar.bz2 | |
configure.ac: Do not set PREFIX_INCLUDE_DIR if $prefix is NONE.
gcc/
2006-11-08 Carlos O'Donell <carlos@codesourcery.com>
* configure.ac: Do not set PREFIX_INCLUDE_DIR if $prefix is NONE.
* configure: Regenerate.
From-SVN: r118588
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rwxr-xr-x | gcc/configure | 3 | ||||
| -rw-r--r-- | gcc/configure.ac | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d215ec5..c110758 100644 --- 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 --- 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 --- 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 |