Moved away from using environment variable for OPENVPN_SRC_DIR. Forcing use of ./configure

1 files changed, 6 insertions, 5 deletions

diff --git a/configure b/configure
index 59d0ab8..51edf0f 100755
--- a/configure
+++ b/configure
@@ -18,7 +18,7 @@ EOF
 PARAMS=""
 DB=""
 FW=""
-export OPENVPN_SRC_DIR=""
+OPENVPN_SRC_DIR=""
 while [ ! -z "$1" ]; do
       case $1 in 
           -h|--help)
@@ -26,7 +26,7 @@ while [ ! -z "$1" ]; do
               exit 0
               ;;
           -s|--openvpn-src)
-              export OPENVPN_SRC_DIR="$2"
+              OPENVPN_SRC_DIR="$2"
               shift
               ;;
           -D|--debug)
@@ -53,12 +53,12 @@ while [ ! -z "$1" ]; do
       shift
 done
 
-if [ -z $(which cmake) ]; then
+if [ -z "$(which cmake)" ]; then
     echo "To build eurephia, you need to install cmake (at least version 2.6)"
     exit 1;
 fi
 
-if [ -z ${OPENVPN_SRC_DIR} ]; then
+if [ -z "${OPENVPN_SRC_DIR}" ]; then
     echo "You need to give the --openvpn-src <path> option"
     exit 1;
 fi
@@ -68,7 +68,8 @@ if [ ${DB} = 0 ]; then
     exit 1;
 fi
 
-rm -f CMakeCache.txt
+rm -f CMakeCache.txt CMakeList.txt
+cat CMakeLists.in | sed "s#\@\@OPENVPN_SRC\@\@#${OPENVPN_SRC_DIR}#" > CMakeLists.txt
 cmake . ${PARAMS}
 ec=$?
 if [ $ec = 0 ]; then