Fix VDDK link failure when building against its installed version

eucalyptus · Feb 2, 2011 · 2c263e1 · 2c263e1
1 parent 9eb82d1
commit 2c263e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/configure b/configure
@@ -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
 

diff --git a/configure.ac b/configure.ac
@@ -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