211 if test "x$VS_INCLUDE" = x || test "x$VS_LIB" = x; then |
211 if test "x$VS_INCLUDE" = x || test "x$VS_LIB" = x; then |
212 AC_MSG_RESULT([present but broken]) |
212 AC_MSG_RESULT([present but broken]) |
213 AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.]) |
213 AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.]) |
214 else |
214 else |
215 AC_MSG_RESULT([ok]) |
215 AC_MSG_RESULT([ok]) |
216 # Remove any trailing "\" and " " from the variables. |
216 # Remove any trailing "\" ";" and " " from the variables. |
217 VS_INCLUDE=`$ECHO "$VS_INCLUDE" | $SED 's/\\\\* *$//'` |
217 VS_INCLUDE=`$ECHO "$VS_INCLUDE" | $SED -e 's/\\\\*;* *$//'` |
218 VS_LIB=`$ECHO "$VS_LIB" | $SED 's/\\\\* *$//'` |
218 VS_LIB=`$ECHO "$VS_LIB" | $SED 's/\\\\*;* *$//'` |
219 VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'` |
219 VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'` |
220 WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'` |
220 WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'` |
221 WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'` |
221 WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'` |
222 # Remove any paths containing # (typically F#) as that messes up make. This |
222 # Remove any paths containing # (typically F#) as that messes up make. This |
223 # is needed if visual studio was installed with F# support. |
223 # is needed if visual studio was installed with F# support. |
224 VS_PATH=`$ECHO "$VS_PATH" | $SED 's/[[^:#]]*#[^:]*://g'` |
224 VS_PATH=`$ECHO "$VS_PATH" | $SED 's/[[^:#]]*#[^:]*://g'` |
225 |
225 |
226 AC_SUBST(VS_PATH) |
226 AC_SUBST(VS_PATH) |
227 AC_SUBST(VS_INCLUDE) |
227 AC_SUBST(VS_INCLUDE) |
228 AC_SUBST(VS_LIB) |
228 AC_SUBST(VS_LIB) |
|
229 |
|
230 # Convert VS_INCLUDE into SYSROOT_CFLAGS |
|
231 OLDIFS="$IFS" |
|
232 IFS=";" |
|
233 for i in $VS_INCLUDE; do |
|
234 ipath=$i |
|
235 IFS="$OLDIFS" |
|
236 BASIC_FIXUP_PATH([ipath]) |
|
237 IFS=";" |
|
238 SYSROOT_CFLAGS="$SYSROOT_CFLAGS -I$ipath" |
|
239 done |
|
240 # Convert VS_LIB into SYSROOT_LDFLAGS |
|
241 for i in $VS_LIB; do |
|
242 libpath=$i |
|
243 IFS="$OLDIFS" |
|
244 BASIC_FIXUP_PATH([libpath]) |
|
245 IFS=";" |
|
246 SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS -libpath:$libpath" |
|
247 done |
|
248 IFS="$OLDIFS" |
229 fi |
249 fi |
230 else |
250 else |
231 AC_MSG_RESULT([not found]) |
251 AC_MSG_RESULT([not found]) |
232 |
252 |
233 if test "x$VS_ENV_CMD" = x; then |
253 if test "x$VS_ENV_CMD" = x; then |