diff options
| author | Romain Chantereay <rchantereau@entrouvert.com> | 2004-09-07 10:36:04 +0000 |
|---|---|---|
| committer | Romain Chantereay <rchantereau@entrouvert.com> | 2004-09-07 10:36:04 +0000 |
| commit | 8eb1397a89e88d055691db5113b8c3dd2155a525 (patch) | |
| tree | b8122f729d33cf9d4d19e90084b08365f2b0f66b /configure.ac | |
| parent | 1602702ea749c2c0749c56a6c5a753baf02de6c1 (diff) | |
| download | lasso-8eb1397a89e88d055691db5113b8c3dd2155a525.tar.gz lasso-8eb1397a89e88d055691db5113b8c3dd2155a525.tar.xz lasso-8eb1397a89e88d055691db5113b8c3dd2155a525.zip | |
Better java sun jdk support on Windows plateforms.
NOTE: Use good PATH environment variable and set JAVA=java, JAVAC=javac &
JAR=jar. It is very important.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 7b8b7bcc..5744daef 100644 --- a/configure.ac +++ b/configure.ac @@ -50,11 +50,16 @@ case "${host}" in CFLAGS="${CFLAGS} -D_MSC_VER -DIN_LASSO -DMINGW -DWIN32 -D_WIN32 -I/usr/local/include" LDFLAGS="${LDFLAGS} -L/usr/local/lib" MINGW=1 + SUN_EXTRA_INCLUDE="win32" ;; dnl ========================================================================== dnl Workaround for non libtool standard library name specs. dnl ========================================================================== + *) + SUN_EXTRA_INCLUDE="win32" + ;; esac + dnl if test -f "/cygdrive/c/windows/system/user32.dll"; then dnl dnl make symbolic link. dnl if test ! -f "/usr/local/lib/libuser32.dll"; then @@ -69,10 +74,13 @@ dnl /usr/local/lib/libkernel32.dll dnl fi dnl fi dnl FIXME: This is a guessing, no test yet under windows with sun JDK - SUN_EXTRA_INCLUDE="/win32" + ;; + *-pc-cygwin) + SUN_EXTRA_INCLUDE="win32" ;; *linux*) - SUN_EXTRA_INCLUDE="/linux" + SUN_EXTRA_INCLUDE="linux" + ;; esac @@ -251,7 +259,7 @@ dnl Now transform JDK_INCLUDE in CFLAG option if applicable. if test "X$JDK_INCLUDE" != X; then dnl If it is a sun environment if test "x$SUN" = "xyes"; then - JDK_INCLUDE="$JDK_INCLUDE -I$JDK_INCLUDE$SUN_EXTRA_INCLUDE" + JDK_INCLUDE="$JDK_INCLUDE -I$JDK_INCLUDE/$SUN_EXTRA_INCLUDE" fi JDK_INCLUDE=-I$JDK_INCLUDE fi |