diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-03-04 09:36:05 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-03-04 09:36:05 +0000 |
| commit | a1f260313dd829a3eea7f0a54f317599dcff89e4 (patch) | |
| tree | 62ce374fd47a35b7e696b3f046e16bab895aaef9 /libjava/configure.ac | |
| parent | f8163223503585626c24d57e165609bae9150744 (diff) | |
| download | gcc-a1f260313dd829a3eea7f0a54f317599dcff89e4.tar.gz | |
2009-03-04 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r144598
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@144599 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index 87194312104..2a6b78276fa 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -833,6 +833,10 @@ AC_CONFIG_LINKS(gnu/java/nio/natVMSelector.cc:gnu/java/nio/natVMSelector${PLATFO test -d gnu/java/nio/channels || mkdir gnu/java/nio/channels AC_CONFIG_LINKS(gnu/java/nio/channels/natFileChannelImpl.cc:gnu/java/nio/channels/natFileChannel${FILE-${PLATFORM}}.cc) +# Likewise for natVMSecureRandom.cc +test -d gnu/java/security/jce/prng || mkdir gnu/java/security/jce/prng +AC_CONFIG_LINKS(gnu/java/security/jce/prng/natVMSecureRandom.cc:gnu/java/security/jce/prng/natVMSecureRandom${FILE-${PLATFORM}}.cc) + case "${host}" in *mingw*) SYSTEMSPEC="-lgdi32 -lws2_32" @@ -1805,8 +1809,7 @@ then AC_SUBST(BUILD_VERSION) AC_MSG_RESULT(Java version: ${JAVA_VERSION}) - jre_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}/jre - sdk_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix} + jre_dir=jre jre_lnk=jre-${JAVA_VERSION}-${origin_name} sdk_lnk=java-${JAVA_VERSION}-${origin_name} @@ -1818,31 +1821,28 @@ then AC_SUBST(JVM_JAR_ROOT_DIR) AC_MSG_RESULT(JVM JAR ROOT directory: ${JVM_JAR_ROOT_DIR}) - JVM_JAR_DIR=${jvm_jar_dir}/${sdk_dir} + JVM_JAR_DIR=${jvm_jar_dir} AC_SUBST(JVM_JAR_DIR) AC_MSG_RESULT(JVM JAR directory: ${JVM_JAR_DIR}) JRE_DIR=${jre_dir} AC_SUBST(JRE_DIR) - SDK_DIR=${sdk_dir} - AC_SUBST(SDK_DIR) - JRE_LNK=${jre_lnk} AC_SUBST(JRE_LNK) SDK_LNK=${sdk_lnk} AC_SUBST(SDK_LNK) - SDK_BIN_DIR=${jvm_root_dir}/${sdk_dir}/bin + SDK_BIN_DIR=${jvm_root_dir}/bin AC_SUBST(SDK_BIN_DIR) AC_MSG_RESULT(SDK tools directory: ${SDK_BIN_DIR}) - SDK_LIB_DIR=${jvm_root_dir}/${sdk_dir}/lib + SDK_LIB_DIR=${jvm_root_dir}/lib AC_SUBST(SDK_LIB_DIR) AC_MSG_RESULT(SDK jar directory: ${SDK_LIB_DIR}) - SDK_INCLUDE_DIR=${jvm_root_dir}/${sdk_dir}/include + SDK_INCLUDE_DIR=${jvm_root_dir}/include AC_SUBST(SDK_INCLUDE_DIR) AC_MSG_RESULT(SDK include directory: ${SDK_INCLUDE_DIR}) @@ -1864,7 +1864,7 @@ then AC_SUBST(GCJ_BIN_DIR) AC_MSG_RESULT(GCJ tools directory: ${GCJ_BIN_DIR}) - echo host is ${host} + AC_MSG_RESULT(host is ${host}) if test "x${host_cpu}" = "x" then case ${host} in @@ -1872,6 +1872,8 @@ then host_cpu=x86;; i486-* | i586-* | i686-*) host_cpu=i386;; + x86_64-*) + host_cpu=amd64;; *) host_cpu=${host_cpu};; esac |