diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-20 20:45:45 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-21 17:27:02 -0400 |
| commit | 4f601291da65d43599a6aa6051497ae220822aca (patch) | |
| tree | 350ab7f7d713c40f8a7125f4b88d30965dc31605 /configure.ac | |
| parent | bbb5357288a12b33c054084ee15733abab61cdb1 (diff) | |
do not add non-existant dirs to JAVAINC
Change-Id: I7b4498b21b5c003cf03af0ab897d59c1c604bfb8
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index eff4438366f0..ae99a9f01a86 100644 --- a/configure.ac +++ b/configure.ac @@ -6401,7 +6401,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then JAVA_TOOLKIT="classic" JAVAINC="-I$JAVA_HOME/include" JAVAINC="$JAVAINC -I$JAVA_HOME/include/aix" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include" + test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; cygwin*) @@ -6428,7 +6428,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then ;; esac JAVAINC="-I$JAVA_HOME/include" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include" + test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; freebsd*) @@ -6451,7 +6451,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then JAVAINC="$JAVAINC -I$JAVA_HOME/include/freebsd" JAVAINC="$JAVAINC -I$JAVA_HOME/include/bsd" JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include" + test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; k*bsd*-gnu*) @@ -6466,7 +6466,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then ;; esac JAVAINC="-I$JAVA_HOME/include" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include" + test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; linux-gnu*) @@ -6561,7 +6561,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then esac JAVAINC="-I$JAVA_HOME/include" JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include" + test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; linux-androideabi*) @@ -6602,7 +6602,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then esac JAVAINC="-I$JAVA_HOME/include" JAVAINC="$JAVAINC -I$JAVA_HOME/include/netbsd" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include" + test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; openbsd*) @@ -6618,7 +6618,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then esac JAVAINC="-I$JAVA_HOME/include" JAVAINC="$JAVAINC -I$JAVA_HOME/include/openbsd" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include" + test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; solaris*) @@ -6634,7 +6634,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then esac JAVAINC="-I$JAVA_HOME/include" JAVAINC="$JAVAINC -I$JAVA_HOME/include/solaris" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include" + test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; esac |