From e9e657c2f54020dd3b596a56002812f38b61d6e9 Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
Date: Sat, 13 Oct 2018 07:31:29 +0300
Subject: [PATCH 1/2] Added support of "NOCONFIGURE" environmental variable.
 Fixes to code according to shellcheck.

This is a port of changes in NetworkManager-openvpn (https://github.com/NetworkManager/NetworkManager-openvpn/pull/3)
to NetworkManager-pptp.

Example usage:
in RPM spec we do not want to call `./confiogure`, we want to use
a special macro, e.g. %configure or %configure2_5x,
which will automatically set different flags and options.
So, we take a pure git tarball and run:
`env NOCONFIGURE=autogen.sh`
`%configure2_5x`
https://abf.io/mikhailnov/networkmanager-openvpn/blob/rosa2016.1/networkmanager-openvpn.spec#lc-63
---
 autogen.sh | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 2bdcdc1a55..df32629f9e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,22 +1,28 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-srcdir=`dirname $0`
+srcdir="$(dirname "$0")"
 test -z "$srcdir" && srcdir=.
 REQUIRED_AUTOMAKE_VERSION=1.9
 PKG_NAME=NetworkManager-pptp
 
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/auth-dialog/main.c) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
+{ test -f "$srcdir/configure.ac" \
+  && test -f "$srcdir/auth-dialog/main.c"; } || {
+    echo "**Error**: Directory ${srcdir} does not look like the top-level ${PKG_NAME} directory"
     exit 1
 }
 
-(cd $srcdir;
-    autoreconf --install --symlink &&
-    intltoolize --force &&
-    autoreconf &&
-    ./configure --enable-maintainer-mode $@
-)
+for test_tool in autoreconf intltoolize
+do
+	[ -x "$(command -v "$test_tool")" ] || {
+		echo "${test_tool} was not found!"
+		exit 1
+	}
+done
 
+if cd "$srcdir"; then
+    autoreconf --install --symlink
+    intltoolize --force
+    autoreconf
+    [ -n "$NOCONFIGURE" ] && ./configure --enable-maintainer-mode "$@"
+fi

From 8cbc41003890855fa72572190876bbe56c86d9fd Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
Date: Tue, 16 Oct 2018 10:59:14 +0300
Subject: [PATCH 2/2] Fix detecting NOCONFIGURE

---
 autogen.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index df32629f9e..7ce702e830 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,5 +24,6 @@ if cd "$srcdir"; then
     autoreconf --install --symlink
     intltoolize --force
     autoreconf
-    [ -n "$NOCONFIGURE" ] && ./configure --enable-maintainer-mode "$@"
+    # Run ./configure if NOCONFIGURE environmental variable is not defined (is empty)
+    [ -z "$NOCONFIGURE" ] && ./configure --enable-maintainer-mode "$@"
 fi