Made building of OpenVPN plug-in optional

For those environments where you just want to build
the eurephiadm and/or database drivers.  ./configure
must now be called with -p or --plug-in to build the
OpenVPN plug-in

1 files changed, 22 insertions, 10 deletions

diff --git a/configure b/configure
index 4078837..744a756 100755
--- a/configure
+++ b/configure
@@ -5,17 +5,20 @@ usage() {
 configure help for eurephia
 
           --help               | -h        -- This help screen
-          --prefix <path>      | -p <path> -- Root directory of installation
+          --prefix <path>                  -- Root directory of installation
                                               (default: /etc/openvpn/eurephia)
-          --openvpn-src <path> | -s <path> -- OpenVPN source directory (needed for building)
           --debug              | -D        -- Enable verbose debug logging
           --show-secrets       | -S        -- Log passwords as clear text in log files
                                |              (only available when debug is enabled)
+          --plug-in            | -p        -- Build the eurephia plug-in for OpenVPN
+          --openvpn-src <path> | -s <path> -- OpenVPN source directory (needed when building plug-in)
           --fw-iptables        |           -- Build iptables firewall module
           --db-sqlite3         |           -- Build SQLite3 database module
           --sqlite3-prefix     | -sp       -- Root directory of SQLite3 eurephia database
                                               (default: /etc/openvpn)
           --eurephiadm         | -A        -- Build command line admin utility
+          --eurephiadm-fw                  -- Include the firewall info even without any
+                                              firewall interface being built
 EOF
 }
 
@@ -26,21 +29,17 @@ ADMIN="";
 OPENVPN_SRC_DIR=""
 PREFIX="/etc/openvpn/eurephia"
 SQLITE3PREFIX="/etc/openvpn"
+PLUGIN=""
 while [ ! -z "$1" ]; do
       case $1 in 
           -h|--help)
               usage
               exit 0
               ;;
-          -p|--prefix)
+          --prefix)
               PREFIX="$2";
               shift;
               ;;
-          -s|--openvpn-src)
-              OPENVPN_SRC_DIR="$2"
-              PARAMS="${PARAMS} -DOPENVPN_SRC:STRING=$2"
-              shift
-              ;;
           -D|--debug)
               PARAMS="${PARAMS} -DDEBUG=ON"
               DEBUG_WARN=1
@@ -49,6 +48,15 @@ while [ ! -z "$1" ]; do
               PARAMS="${PARAMS} -DSHOW_SECRETS=ON"
               SECRETS_WARN=1
               ;;
+          -p|--plug-in)
+              PARAMS="${PARAMS} -DPLUGIN=ON"
+              PLUGIN="eurephia-auth"
+              ;;
+          -s|--openvpn-src)
+              OPENVPN_SRC_DIR="$2"
+              PARAMS="${PARAMS} -DOPENVPN_SRC:STRING=$2"
+              shift
+              ;;
           --fw-iptables)
               PARAMS="${PARAMS} -DFW_IPTABLES=ON"
               FW="iptables "
@@ -65,6 +73,9 @@ while [ ! -z "$1" ]; do
               PARAMS="${PARAMS} -DEUREPHIADM=ON"
               ADMIN="${ADMIN}eurephiadm "
               ;;
+          --eurephiadm-fw)
+              PARAMS="${PARAMS} -DFIREWALL=ON"
+              ;;
           *)
               echo "Unkown option: $1"
               exit 2
@@ -78,8 +89,8 @@ if [ -z "$(which cmake)" ]; then
     exit 1;
 fi
 
-if [ -z "${OPENVPN_SRC_DIR}" ]; then
-    echo "You need to give the --openvpn-src <path> option"
+if [ ! -z "${PLUGIN}" -a -z "${OPENVPN_SRC_DIR}" ]; then
+    echo "You need to give the --openvpn-src <path> option when building the eurephia plug-in"
     exit 1;
 fi
 
@@ -102,6 +113,7 @@ if [ $ec = 0 ]; then
     echo
     echo "               Database: ${DB}"
     echo "               Firewall: ${FW:-"None"}"
+    echo "        OpenVPN plug-in: ${PLUGIN:-"No plug-ins requested"}"
     echo "            Admin tools: ${ADMIN:-"None"}"
     echo
     echo "         Install prefix: ${PREFIX}"