Skip to content

#386: fix compilation of java when using gnumake #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fbergmann merged 1 commit into from
Aug 22, 2024
Merged

#386: fix compilation of java when using gnumake #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,3 +237,9 @@ docs/src/doxygen-config-cpp.1.txt
docs/src/doxygen-config-cpp.2.txt
docs/src/doxygen-config-python.1.txt
docs/src/doxygen-config-python.2.txt


*.lo
*.la
libsbmlj.*
navtree*
80 changes: 5 additions & 75 deletions config/java.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,81 +166,6 @@ AC_DEFUN([CONFIG_PROG_JAVA],
dnl

case "$host" in
*darwin*)
framework="/System/Library/Frameworks/JavaVM.framework"
case $JAVA_VERSION in
9)
if test -e "$framework/Versions/Current/Headers"; then
headers="$framework/Versions/Current/Headers"
elif test -e "$framework/Versions/CurrentJDK/Headers"; then
headers="$framework/Versions/CurrentJDK/Headers"
fi
;;
8)
if test -e "$framework/Versions/Current/Headers"; then
headers="$framework/Versions/Current/Headers"
elif test -e "$framework/Versions/CurrentJDK/Headers"; then
headers="$framework/Versions/CurrentJDK/Headers"
fi
;;
7)
if test -e "$framework/Versions/Current/Headers"; then
headers="$framework/Versions/Current/Headers"
elif test -e "$framework/Versions/CurrentJDK/Headers"; then
headers="$framework/Versions/CurrentJDK/Headers"
elif test -e "$framework/Versions/1.7.0/Headers"; then
headers="$framework/Versions/1.7.0/Headers"
elif test -e "$framework/Versions/1.7/Headers"; then
headers="$framework/Versions/1.7/Headers"
fi
;;
6)
if test -e "$framework/Versions/Current/Headers"; then
headers="$framework/Versions/Current/Headers"
elif test -e "$framework/Versions/CurrentJDK/Headers"; then
headers="$framework/Versions/CurrentJDK/Headers"
elif test -e "$framework/Versions/1.6.0/Headers"; then
headers="$framework/Versions/1.6.0/Headers"
elif test -e "$framework/Versions/1.6/Headers"; then
headers="$framework/Versions/1.6/Headers"
fi
;;
5)
if test -e "$framework/Versions/CurrentJDK/Headers"; then
headers="$framework/Versions/CurrentJDK/Headers"
elif test -e "$framework/Versions/1.5.0/Headers"; then
headers="$framework/Versions/1.5.0/Headers"
elif test -e "$framework/Versions/1.5/Headers"; then
headers="$framework/Versions/1.5/Headers"
fi
;;
esac

if ! test -e "$headers/jni.h"; then
AC_MSG_ERROR([
Cannot find Java include files. Your environment may lack a Java
development kit installation.
])
fi

JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$headers\""

parent=`dirname "$headers"`
if test $JAVA_VERSION -ge 9; then
JAVADOC_JAR=
elif test -e "$parent/Classes/classes.jar"; then
JAVADOC_JAR="$parent/Classes/classes.jar"
elif test -e "$parent/Classes/tools.jar"; then
JAVADOC_JAR="$parent/Classes/tools.jar"
elif test -e "${parent}JDK/Classes/classes.jar"; then
JAVADOC_JAR="${parent}JDK/Classes/classes.jar"
elif test -e "/usr/libexec/java_home"; then
JAVADOC_JAR=`/usr/libexec/java_home`/lib/tools.jar
else
JAVADOC_JAR="$parent/lib/tools.jar"
fi
;;

*)
parent=`dirname "$JAVAC"`

Expand Down Expand Up @@ -282,6 +207,11 @@ development kit installation.
freebsd*) JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/freebsd\"";;
linux*) JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/linux\"";;
solaris*) JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/solaris\"";;
darwin*) JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/darwin\"";;
esac

case "$host" in
darwin*) JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/darwin\"";;
esac
;;
esac
Expand Down
Loading