From f4334732da0846c3e73f7bc490fabd807598925b Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Thu, 23 Mar 2017 21:44:27 +0100
Subject: RPM + tito + copr support

---
 configure | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 58293e2e..953649d1 100755
--- a/configure
+++ b/configure
@@ -59,7 +59,7 @@ done
 
 if [ -d ".git" ]; then
     git submodule update --init 2>/dev/null
-elif [ -x $(which git) ]; then
+else
     tmp=0
     for i in $(cat .gitmodules | grep -n submodule | awk -F ':' '{print $1}') $(wc -l .gitmodules | awk '{print $1}'); do
         if ! [ $tmp -eq 0 ]; then
@@ -70,7 +70,8 @@ elif [ -x $(which git) ]; then
             branch=$(echo "$def" | grep '^branch=' | awk -F '=' '{print $2}')
 
             if ! ls "$path"/* >/dev/null 2>/dev/null; then
-                if ! [ -x $(which git) ]; then
+                git=$(which git)
+                if ! [ $? -eq 0 ] || ! [ -x $git ]; then
                     echo "Failed retrieving missing files"
                     exit 5
                 fi
@@ -150,7 +151,7 @@ mkdir -p build
 cd build
 
 echo "$cmake_type" > .cmake_type
-cmake -G "$cmake_type" -DCMAKE_INSTALL_PREFIX="$PREFIX" -DENABLED_PLUGINS="$ENABLED_PLUGINS" -DDISABLED_PLUGINS="$DISABLED_PLUGINS" -DVALA_EXECUTABLE="$VALA_EXECUTABLE" -DCMAKE_VALA_FLAGS="$VALAC_FLAGS" -DDISABLE_FAST_VAPI="$DISABLE_FAST_VAPI" -DLIB_SUFFIX="$LIB_SUFFIX" -DNO_DEBUG="$NO_DEBUG" ..
+cmake -G "$cmake_type" -DCMAKE_INSTALL_PREFIX="$PREFIX" -DENABLED_PLUGINS="$ENABLED_PLUGINS" -DDISABLED_PLUGINS="$DISABLED_PLUGINS" -DVALA_EXECUTABLE="$VALA_EXECUTABLE" -DCMAKE_VALA_FLAGS="$VALAC_FLAGS" -DDISABLE_FAST_VAPI="$DISABLE_FAST_VAPI" -DLIB_SUFFIX="$LIB_SUFFIX" -DNO_DEBUG="$NO_DEBUG" .. || exit 9
 
 if [ "$cmake_type" == "Ninja" ]
 then
-- 
cgit v1.2.3-70-g09d2