diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-02-09 17:53:05 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-02-10 21:41:46 +0100 |
| commit | 19b33ca42f1ce38a2e58070f962f37ecae58be0d (patch) | |
| tree | fb20dac543b1cfb9e355a7dd9661fb34bff3903c | |
| parent | 12bf03351ea38fb2d2eb5e184cd455d2d019fe1a (diff) | |
fdo#39491 remove a few nonexistent include paths from SOLARINC
| -rw-r--r-- | configure.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 927326e84fb8..5417c226e1ad 100644 --- a/configure.in +++ b/configure.in @@ -2975,6 +2975,7 @@ linux-androideabi*) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) ;; esac + SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/$OUTPATH" ;; mingw*) @@ -3000,7 +3001,7 @@ mingw*) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) ;; esac - SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/win32" + SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/win32 -I$SRC_ROOT/solenv/inc/$OUTPATH" SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib" SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib" ;; @@ -3112,7 +3113,7 @@ esac INPATH="${OUTPATH}${PROEXT}" OUTDIR="$SRC_ROOT/solver/$INPATH" -SOLARINC="-I. -I$SRC_ROOT/solver/$INPATH/inc/stl -I$SRC_ROOT/solver/$INPATH/inc/external -I$SRC_ROOT/solver/$INPATH/inc -I$SRC_ROOT/solenv/inc/$OUTPATH -I$SRC_ROOT/solenv/inc -I$SRC_ROOT/res $SOLARINC" +SOLARINC="-I. -I$SRC_ROOT/solver/$INPATH/inc/external -I$SRC_ROOT/solver/$INPATH/inc -I$SRC_ROOT/solenv/inc $SOLARINC" WORKDIR="$SRC_ROOT/workdir/$INPATH" AC_SUBST(COM) AC_SUBST(CPU) |