Make configure script more robust

diff --git a/configure b/configure
index 56a8fb7f4509c56919e43ab8151b2d7762e6e0fa..5f28c8acd71683bdd547d43e880e847c5b61fbad 100755 (executable)
--- a/configure
+++ b/configure
@@ -16,8 +16,8 @@ else
 
 if [ -z "$JAVA_HOME" ]
 then
-echo "Environment variable JAVA_HOME must be set"
-exit 1
+JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac))))
+echo "Environment variable JAVA_HOME not set, using $JAVA_HOME"
 fi
 
 # Create build directory, so that it can be used right away
@@ -35,8 +35,8 @@ SDK_SRC_BASE := $SDK_SRC_BASE
 SDK_BUILD_BASE := $SDK_BUILD_BASE
 JAVA_HOME := $JAVA_HOME
 
-include \$(SDK_SRC_BASE)/branch.mk
-include \$(SDK_SRC_BASE)/sdk/branches/\$(BRANCH).bnd
+-include \$(SDK_SRC_BASE)/branch.mk
+-include \$(SDK_SRC_BASE)/sdk/branches/\$(BRANCH).bnd
 EOF