Make configure script more robust

[cc0/argeo-build.git] / configure

diff --git a/configure b/configure
old mode 100644 (file)
new mode 100755 (executable)
index 9b3e980..5f28c8a
--- a/configure
+++ b/configure
@@ -3,15 +3,8 @@
 # We build where we are
 SDK_BUILD_BASE=$(pwd -P)/output
 
-# Source are located where this script is
-SDK_SRC_BASE="$(cd "$(dirname "$0")"; pwd -P)"
-
 SDK_MK=$SDK_SRC_BASE/sdk.mk
 
-#echo SDK_BUILD_BASE=$SDK_BUILD_BASE
-#echo SDK_SRC_BASE=$SDK_SRC_BASE
-#echo SDK_MK=$SDK_MK
-
 if [ -f "$SDK_MK" ]; 
 then
 
@@ -23,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
@@ -42,7 +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)/branch.mk
+-include \$(SDK_SRC_BASE)/sdk/branches/\$(BRANCH).bnd
 EOF