330 if test "x$VS_INCLUDE" = x || test "x$VS_LIB" = x; then |
330 if test "x$VS_INCLUDE" = x || test "x$VS_LIB" = x; then |
331 AC_MSG_RESULT([present but broken]) |
331 AC_MSG_RESULT([present but broken]) |
332 AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.]) |
332 AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.]) |
333 else |
333 else |
334 AC_MSG_RESULT([ok]) |
334 AC_MSG_RESULT([ok]) |
335 # Remove any trailing "\" and " " from the variables. |
335 # Remove any trailing "\" ";" and " " from the variables. |
336 VS_INCLUDE=`$ECHO "$VS_INCLUDE" | $SED 's/\\\\* *$//'` |
336 VS_INCLUDE=`$ECHO "$VS_INCLUDE" | $SED -e 's/\\\\*;* *$//'` |
337 VS_LIB=`$ECHO "$VS_LIB" | $SED 's/\\\\* *$//'` |
337 VS_LIB=`$ECHO "$VS_LIB" | $SED 's/\\\\*;* *$//'` |
338 VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'` |
338 VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'` |
339 WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'` |
339 WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'` |
340 WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'` |
340 WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'` |
341 # Remove any paths containing # (typically F#) as that messes up make. This |
341 # Remove any paths containing # (typically F#) as that messes up make. This |
342 # is needed if visual studio was installed with F# support. |
342 # is needed if visual studio was installed with F# support. |
343 VS_PATH=`$ECHO "$VS_PATH" | $SED 's/[[^:#]]*#[^:]*://g'` |
343 VS_PATH=`$ECHO "$VS_PATH" | $SED 's/[[^:#]]*#[^:]*://g'` |
344 |
344 |
345 AC_SUBST(VS_PATH) |
345 AC_SUBST(VS_PATH) |
346 AC_SUBST(VS_INCLUDE) |
346 AC_SUBST(VS_INCLUDE) |
347 AC_SUBST(VS_LIB) |
347 AC_SUBST(VS_LIB) |
|
348 |
|
349 # Convert VS_INCLUDE into SYSROOT_CFLAGS |
|
350 OLDIFS="$IFS" |
|
351 IFS=";" |
|
352 for i in $VS_INCLUDE; do |
|
353 ipath=$i |
|
354 IFS="$OLDIFS" |
|
355 BASIC_FIXUP_PATH([ipath]) |
|
356 IFS=";" |
|
357 SYSROOT_CFLAGS="$SYSROOT_CFLAGS -I$ipath" |
|
358 done |
|
359 # Convert VS_LIB into SYSROOT_LDFLAGS |
|
360 for i in $VS_LIB; do |
|
361 libpath=$i |
|
362 IFS="$OLDIFS" |
|
363 BASIC_FIXUP_PATH([libpath]) |
|
364 IFS=";" |
|
365 SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS -libpath:$libpath" |
|
366 done |
|
367 IFS="$OLDIFS" |
348 fi |
368 fi |
349 else |
369 else |
350 AC_MSG_RESULT([not found]) |
370 AC_MSG_RESULT([not found]) |
351 |
371 |
352 if test "x$VS_ENV_CMD" = x; then |
372 if test "x$VS_ENV_CMD" = x; then |