diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-01-02 19:07:36 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-01-02 20:53:05 -0600 |
commit | 7eea90d66dd1bd570723ab4d981880ecfbad265c (patch) | |
tree | ebb21a93f964bd4a55d2b96a5c26e83b1933fc7e /configure.in | |
parent | avoid conditional define, since they may cause troubles in x-comp case (diff) | |
download | core-7eea90d66dd1bd570723ab4d981880ecfbad265c.tar.gz core-7eea90d66dd1bd570723ab4d981880ecfbad265c.zip |
migrate JAVALIB out of set_soenv.in
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 238 |
1 files changed, 237 insertions, 1 deletions
diff --git a/configure.in b/configure.in index cc40ed9009d4..b7b255abe95e 100644 --- a/configure.in +++ b/configure.in @@ -2537,8 +2537,10 @@ AC_SUBST(MSPDB_PATH) AC_SUBST(SHOWINCLUDES_PREFIX) # -# determine CPI, CPUNAME, GUI, GUIBASE, ... +# determine CPU, CPUNAME, GUI, GUIBASE, ... # +LIB64="lib" + case "$host_os" in aix*) @@ -2564,6 +2566,7 @@ cygwin*) if test "$CL_X64" != ""; then CPU=X CPUNAME=X86_64 + LIB64="lib/x64" OUTPATH=wntmscx$COMEX else CPU=I @@ -2713,6 +2716,7 @@ linux-gnu*) powerpc64) CPU=P CPUNAME=POWERPC64 + LIB64="lib64" OUTPATH=unxlngppc64 ;; sparc) @@ -2728,11 +2732,13 @@ linux-gnu*) s390x) CPU=3 CPUNAME=S390x + LIB64="lib64" OUTPATH=unxlngs390x ;; x86_64) CPU=X CPUNAME=X86_64 + LIB64="lib64" OUTPATH=unxlngx6 ;; *) @@ -4726,6 +4732,236 @@ if test "$SOLAR_JAVA" != ""; then AC_SUBST(AWTLIB) fi +# +# Determine JAVALIB +# If your platform follow the common pattern +# just define JAVA_ARCH and JAVA_TOOLKIT for it +# if not, leave JAVA_ARCH empty and define JAVALIB manually +# if you don't want JAVALIB to be exported at all +# define x_JAVALIB=[\#] +# +JAVA_ARCH= +JAVA_TOOLKIT= +x_JAVALIB= + +case "$host_os" in + +aix*) + JAVA_ARCH="ppc" + JAVA_TOOLKIT="classic" + ;; + +cygwin*|darwin*) + x_JAVALIB=[\#] + ;; + +dragonfly*) + case "$host_cpu" in + i*86) + JAVA_ARCH="i386" + JAVA_TOOLKIT="client" + ;; + x86_64) + JAVA_ARCH="amd64" + JAVA_TOOLKIT="server" + ;; + esac + ;; + +freebsd*) + case "$host_cpu" in + i*86) + JAVA_ARCH="i386" + JAVA_TOOLKIT="client" + ;; + x86_64) + if test "`echo $JAVA_HOME | sed -e 's,.*/,,'`" = "linux" ; then + JAVA_ARCH="i386" + JAVA_TOOLKIT="client" + else + JAVA_ARCH="amd64" + JAVA_TOOLKIT="server" + fi + ;; + esac + ;; + +k*bsd*-gnu*) + case "$host_cpu" in + i*86) + JAVA_ARCH="i386" + JAVA_TOOLKIT="client" + ;; + x86_64) + JAVA_ARCH="amd64" + JAVA_TOOLKIT="server" + ;; + esac + ;; + +linux-gnu*) + + case "$host_cpu" in + + alpha) + JAVA_ARCH="alpha" + JAVA_TOOLKIT="server" + ;; + arm) + JAVA_ARCH="arm" + JAVA_TOOLKIT="server" + ;; + hppa) + JAVA_ARCH="hppa" + JAVA_TOOLKIT="server" + ;; + i*86) + JAVA_ARCH="i386" + case "$JDK" in + [Ii][Bb][Mm]*) + JAVA_ARCH= + JRE_BASE_DIR="$JAVA_HOME/jre/bin" + JAVALIB="-L $JAVA_HOME/$LIB64 -L $JRE_BASE_DIR -L $JRE_BASE_DIR/classic -L $JRE_BASE_DIR/native_thread" + ;; + [Bb][Ee][Aa]*) + JAVA_TOOLKIT="jrockit"; + ;; + *) + JAVA_TOOLKIT="client"; + ;; + esac + ;; + ia64) + JAVA_ARCH="ia64" + JAVA_TOOLKIT="server" + ;; + m68k) + JAVA_ARCH="mk68" + JAVA_TOOLKIT="server" + ;; + mips|mips64|mipsel|mips64el) + JAVA_ARCH="$host_cpu" + JAVA_TOOLKIT="server" + ;; + mips32) + JAVA_ARCH="$host_cpu" + JAVA_TOOLKIT="client" + ;; + powerpc) + JAVA_ARCH="ppc" + case "$JDK" in + [Ii][Bb][Mm]*) + JAVA_TOOLKIT="classic" + ;; + gcj) + JAVA_TOOLKIT="client" + ;; + *) + JAVA_TOOLKIT="server" + ;; + esac + ;; + powerpc64) + JAVA_ARCH="ppc64" + if test "$JDK" = "gcj" ; then + JAVA_TOOLKIT="client" + else + JAVA_TOOLKIT="server" + fi + ;; + sparc) + JAVA_ARCH="sparc" + JAVA_TOOLKIT="server" + ;; + s390) + JAVA_ARCH="s390" + JAVA_TOOLKIT="server" + ;; + s390x) + JAVA_ARCH="s390x" + JAVA_TOOLKIT="server" + ;; + x86_64) + JAVA_ARCH="amd64" + JAVA_TOOLKIT="server" + ;; + *) + AC_MSG_ERROR([No JAVALIB defintion host_cpu $host_cpu for host_os $host_os]) + ;; + esac + ;; + +linux-androideabi*) + + case "$host_cpu" in + + armel) + JAVA_ARCH="arm" + JAVA_TOOLKIT="server" + ;; + esac + ;; + +mingw*) + x_JAVALIB=[\#] + ;; + +*netbsd*) + + case "$host_cpu" in + i*86) + JAVA_ARCH="i386" + JAVA_TOOLKIT="client" + ;; + powerpc) + JAVA_ARCH="pcc" + JAVA_TOOLKIT="classic" + ;; + sparc) + JAVA_ARCH="sparc" + JAVA_TOOLKIT="client" + ;; + x86_64) + JAVA_ARCH="amd64" + JAVA_TOOLKIT="client" + ;; + esac + ;; + +openbsd*) + case "$host_cpu" in + i*86) + JAVA_ARCH="i386" + JAVA_TOOLKIT="client" + ;; + x86_64) + JAVA_ARCH="amd64" + JAVA_TOOLKIT="server" + ;; + esac + ;; + +solaris*) + + JAVA_TOOLKIT="xawt" + case "$host_cpu" in + i*86) + JAVA_ARCH="i386" + ;; + sparc) + JAVA_ARCH="sparc" + ;; + esac + ;; +esac + +if test -n "$JAVA_ARCH" ; then + JRE_BASE_DIR="$JAVA_HOME/jre/lib/$JAVA_ARCH" + JAVALIB="-L $JAVA_HOME/$LIB64 -L $JRE_BASE_DIR -L $JRE_BASE_DIR/$JAVA_TOOLKIT -L $JRE_BASE_DIR/native_thread" +fi + +AC_SUBST(x_JAVALIB) +AC_SUBST(JAVALIB) AC_SUBST(JAVA_HOME) AC_SUBST(JDK) AC_SUBST(JAVAFLAGS) |