Skip to content

C
core
Kaydet (Commit) 4f601291 authored tarafından Peter Foley's avatar Peter Foley
Dosyalara gözat
Seçenekler

do not add non-existant dirs to JAVAINC 

Change-Id: I7b4498b21b5c003cf03af0ab897d59c1c604bfb8
üst bbb53572
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
configure.ac
Dosyayı görüntüle @ 4f601291
...@@ -6401,7 +6401,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then ...@@ -6401,7 +6401,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then
JAVA_TOOLKIT="classic" JAVA_TOOLKIT="classic"
JAVAINC="-I$JAVA_HOME/include" JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/aix" 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*) cygwin*)
...@@ -6428,7 +6428,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then ...@@ -6428,7 +6428,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then
;; ;;
esac esac
JAVAINC="-I$JAVA_HOME/include" 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*) freebsd*)
...@@ -6451,7 +6451,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then ...@@ -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/freebsd"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/bsd" JAVAINC="$JAVAINC -I$JAVA_HOME/include/bsd"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" 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*) k*bsd*-gnu*)
...@@ -6466,7 +6466,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then ...@@ -6466,7 +6466,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then
;; ;;
esac esac
JAVAINC="-I$JAVA_HOME/include" 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*) linux-gnu*)
...@@ -6561,7 +6561,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then ...@@ -6561,7 +6561,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then
esac esac
JAVAINC="-I$JAVA_HOME/include" JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" 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*) linux-androideabi*)
...@@ -6602,7 +6602,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then ...@@ -6602,7 +6602,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then
esac esac
JAVAINC="-I$JAVA_HOME/include" JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/netbsd" 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*) openbsd*)
...@@ -6618,7 +6618,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then ...@@ -6618,7 +6618,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then
esac esac
JAVAINC="-I$JAVA_HOME/include" JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/openbsd" 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*) solaris*)
...@@ -6634,7 +6634,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then ...@@ -6634,7 +6634,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then
esac esac
JAVAINC="-I$JAVA_HOME/include" JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/solaris" 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 esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment