[vmkit-commits] [vmkit] r142859 - /vmkit/trunk/autoconf/configure.ac

[Will Dietz]

Author: wdietz2
Date: Mon Oct 24 17:07:31 2011
New Revision: 142859

URL: http://llvm.org/viewvc/llvm-project?rev=142859&view=rev
Log:
Fix DYLIB_EXTENSION use in configure.ac

Modified:
    vmkit/trunk/autoconf/configure.ac

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=142859&r1=142858&r2=142859&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Mon Oct 24 17:07:31 2011
@@ -241,12 +241,12 @@
   gnuclasspath)
     AC_MSG_NOTICE(Validing GNU Classpath installation...)
     AC_CHECK_FILES([${classpathlibs}]
-                   [${classpathlibs}/libjavaio$DYLIB_EXTENSION]
-                   [${classpathlibs}/libjavalang$DYLIB_EXTENSION]
-                   [${classpathlibs}/libjavalangreflect$DYLIB_EXTENSION]
-                   [${classpathlibs}/libjavanet$DYLIB_EXTENSION]
-                   [${classpathlibs}/libjavanio$DYLIB_EXTENSION]
-                   [${classpathlibs}/libjavautil$DYLIB_EXTENSION],,
+                   [${classpathlibs}/libjavaio.$DYLIB_EXTENSION]
+                   [${classpathlibs}/libjavalang.$DYLIB_EXTENSION]
+                   [${classpathlibs}/libjavalangreflect.$DYLIB_EXTENSION]
+                   [${classpathlibs}/libjavanet.$DYLIB_EXTENSION]
+                   [${classpathlibs}/libjavanio.$DYLIB_EXTENSION]
+                   [${classpathlibs}/libjavautil.$DYLIB_EXTENSION],,
       AC_MSG_ERROR([[Invalid GNU Classpath library path, can't find required libraries]]))
     AC_CHECK_FILE([${classpathglibj}],,
       AC_MSG_ERROR([[Invalid glibj.zip location]]))
@@ -259,9 +259,9 @@
     AC_CHECK_FILE([${openjdkarchdir}],,
       AC_MSG_ERROR([[Invalid OpenJDK arch dir]]))
     dnl Check that $archdir/client/libjava.so or $archdir/server/libjava.so exist
-    AC_CHECK_FILE([${openjdkarchdir}]/client/libjvm$DYLIB_EXTENSION,,
-      AC_CHECK_FILE([${openjdkarchdir}]/server/libjvm$DYLIB_EXTENSION,,
-        AC_MSG_ERROR([[Can't find libjvm$DYLIB_EXTENSION]])))
+    AC_CHECK_FILE([${openjdkarchdir}]/client/libjvm.$DYLIB_EXTENSION,,
+      AC_CHECK_FILE([${openjdkarchdir}]/server/libjvm.$DYLIB_EXTENSION,,
+        AC_MSG_ERROR([[Can't find libjvm.$DYLIB_EXTENSION]])))
       ;;
   *)
     AC_MSG_ERROR([Invalid --with-classpath-impl "${classpathimpl}".  Must be one of "gnuclasspath" or "openjdk"])