Permalink
Browse files

Fix VDDK link failure when building against its installed version

  • Loading branch information...
1 parent 9eb82d1 commit 2c263e13ff41b1aa229f277d5e6b7e58061d6878 @gholms gholms committed Feb 2, 2011
Showing with 11 additions and 7 deletions.
  1. +6 −4 configure
  2. +5 −3 configure.ac
View
@@ -3679,16 +3679,18 @@ if test -n "${LIBVIRT_HOME}" ; then
fi
fi
if test -n "${VDDK_HOME}" ; then
- if test "x$build_cpu" = "xx86_64"; then :
+ if test -d "${VDDK_HOME}"/include/ ; then
+ # Using tarball direct from VMware
+ INCLUDES="${INCLUDES} -I${VDDK_HOME}/include/"
+ if test "x$build_cpu" = "xx86_64"; then :
LIBS="-L${VDDK_HOME}/lib64 ${LIBS}"
else
LIBS="-L${VDDK_HOME}/lib32 ${LIBS}"
fi
-
- if test -d "${VDDK_HOME}"/include/ ; then
- INCLUDES="${INCLUDES} -I${VDDK_HOME}/include/"
elif test -d "${VDDK_HOME}"/lib/vmware-vix-disklib/include/ ; then
+ # Using installed tarball
INCLUDES="${INCLUDES} -I${VDDK_HOME}/lib/vmware-vix-disklib/include/"
+ LIBS="-L${VDDK_HOME}/lib %{LIBS}"
fi
fi
View
@@ -122,13 +122,15 @@ if test -n "${LIBVIRT_HOME}" ; then
fi
fi
if test -n "${VDDK_HOME}" ; then
- AS_IF([test "x$build_cpu" = "xx86_64"], [LIBS="-L${VDDK_HOME}/lib64 ${LIBS}"],
- [LIBS="-L${VDDK_HOME}/lib32 ${LIBS}"])
-
if test -d "${VDDK_HOME}"/include/ ; then
+ # Using tarball direct from VMware
INCLUDES="${INCLUDES} -I${VDDK_HOME}/include/"
+ AS_IF([test "x$build_cpu" = "xx86_64"], [LIBS="-L${VDDK_HOME}/lib64 ${LIBS}"],
+ [LIBS="-L${VDDK_HOME}/lib32 ${LIBS}"])
elif test -d "${VDDK_HOME}"/lib/vmware-vix-disklib/include/ ; then
+ # Using installed tarball
INCLUDES="${INCLUDES} -I${VDDK_HOME}/lib/vmware-vix-disklib/include/"
+ LIBS="-L${VDDK_HOME}/lib %{LIBS}"
fi
fi

0 comments on commit 2c263e1

Please sign in to comment.