Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 350489 - Make JavaXPCOM build with MSYS, r=jhpedemonte

Browse Source
This commit is contained in:
benjamin%smedbergs.us 2006-08-29 13:35:05 +00:00
parent 48b90e6991
commit 680cdc7401
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/autoconf.mk.in
View File

@ -156,9 +156,9 @@ MOZ_NO_FAST_LOAD = @MOZ_NO_FAST_LOAD@
NS_PRINTING = @NS_PRINTING@
MOZ_JAVAXPCOM = @MOZ_JAVAXPCOM@
JAVA_INCLUDE_PATH=@JAVA_INCLUDE_PATH@
JAVAC=@JAVAC@
JAR=@JAR@
JAVA_INCLUDE_PATH="@JAVA_INCLUDE_PATH@"
JAVAC="@JAVAC@"
JAR="@JAR@"
TAR=@TAR@

2
config/rules.mk
View File

@ -1542,7 +1542,7 @@ $(JAVA_INSTALL_DIR):
$(NSINSTALL) -D $@
export:: $(JAVA_DIST_DIR) $(JAVADEPFILES) $(JAVA_INSTALL_DIR)
cd $(JAVA_GEN_DIR) && tar $(TAR_CREATE_FLAGS) - * | (cd "../$(JAVA_INSTALL_DIR)" && tar -xf -)
(cd $(JAVA_GEN_DIR) && tar $(TAR_CREATE_FLAGS) - *) | (cd $(JAVA_INSTALL_DIR) && tar -xf -)
endif # XPIDLSRCS || SDK_XPIDLSRCS
endif # MOZ_JAVAXPCOM

9
configure.in
View File

@ -5430,6 +5430,11 @@ if test -n "${MOZ_JAVAXPCOM}"; then
JAVA_HOME=`cygpath -u \`cygpath -m -s "$JAVA_HOME"\``
fi
;;
*mingw*)
if test -n "$JAVA_HOME"; then
JAVA_HOME=`cd "$JAVA_HOME" && pwd`
fi
;;
esac
if test -n "${JAVA_INCLUDE_PATH}"; then
@ -5461,8 +5466,8 @@ if test -n "${MOZ_JAVAXPCOM}"; then
JAVA_PATH="$JAVA_HOME/bin:$PATH"
fi
AC_PATH_PROG(JAVAC, javac, :, $JAVA_PATH)
AC_PATH_PROG(JAR, jar, :, $JAVA_PATH)
AC_PATH_PROG(JAVAC, javac, :, "$JAVA_PATH")
AC_PATH_PROG(JAR, jar, :, "$JAVA_PATH")
if test -z "$JAVAC" || test "$JAVAC" = ":" || test -z "$JAR" || test "$JAR" = ":"; then
AC_MSG_ERROR([The programs javac and jar were not found. Set \$JAVA_HOME or use --with-java-bin-path={java-bin-dir}.])
fi