[PATCH util-modular 1/9] build.sh: honour when NOAUTOGEN (-a) is set

Emil Velikov emil.l.velikov at gmail.com
Tue Feb 14 11:57:51 UTC 2017


From: Emil Velikov <emil.velikov at collabora.com>

Do what the help string says - do not run autogen/configure when set.
If one is cloning a fresh repo, that is no reason to effectively ignore
the user requirement.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 build.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index 1a37a88..9ef6302 100755
--- a/build.sh
+++ b/build.sh
@@ -572,8 +572,6 @@ clone() {
 #   0 - good
 #   1 - bad
 process() {
-    needs_config=0
-
     module=$1
     component=$2
     confopts="$3"
@@ -596,7 +594,6 @@ process() {
 	    SRCDIR="$module${component:+/}$component"
 	    CONFCMD="autogen.sh"
         fi
-	needs_config=1
     else
         checkfortars $module $component
         if [ $? -eq 0 ]; then
@@ -662,7 +659,7 @@ process() {
     fi
 
     # Use "sh autogen.sh" since some scripts are not executable in CVS
-    if [ $needs_config -eq 1 ] || [ X"$NOAUTOGEN" = X ]; then
+    if [ X"$NOAUTOGEN" = X ]; then
 	sh ${DIR_CONFIG}/${CONFCMD} \
 	    ${PREFIX_USER:+--prefix="$PREFIX"} \
 	    ${EPREFIX_USER:+--exec-prefix="$EPREFIX"} \
-- 
2.11.0



More information about the xorg-devel mailing list