X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=configure;h=9b3e9804b04280910d6df08fd74ba0fe4cf4079c;hb=1b2809d4d0510e90226f04e894e2837cbb661d8e;hp=4587bf45ef4680ae1e675dbc2ae6e37e086e2814;hpb=9d7afbd488afb0c7e4e1cdc0e4282e0194a6d372;p=lgpl%2Fargeo-commons.git

diff --git a/configure b/configure
index 4587bf45e..9b3e9804b 100644
--- a/configure
+++ b/configure
@@ -21,6 +21,12 @@ exit 1
 
 else
 
+if [ -z "$JAVA_HOME" ]
+then
+echo "Environment variable JAVA_HOME must be set"
+exit 1
+fi
+
 # Create build directory, so that it can be used right away
 # and we check whether we have the rights
 mkdir -p $SDK_BUILD_BASE
@@ -34,13 +40,14 @@ fi
 cat > "$SDK_MK" <<EOF
 SDK_SRC_BASE := $SDK_SRC_BASE
 SDK_BUILD_BASE := $SDK_BUILD_BASE
+JAVA_HOME := $JAVA_HOME
 
-include \$(SDK_SRC_BASE)/branch.properties
-include \$(SDK_SRC_BASE)/sdk/includes.mk
+include \$(SDK_SRC_BASE)/branch.mk
 EOF
 
 
 echo SDK was configured.
+echo "JAVA_HOME        : $JAVA_HOME"
 echo "Base for sources : $SDK_SRC_BASE"
 echo "Base for builds  : $SDK_BUILD_BASE"
 exit 0