From: Marcus Comstedt <redacted>
Date: Sun, 2 Nov 2014 22:46:44 +0000 (+0100)
Subject: sigrok-cross-android: Prevent glib from running configure with wrong args
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=commitdiff_plain;h=c38bb0752199e36a393cd26d58de08012a5e5727

sigrok-cross-android: Prevent glib from running configure with wrong args

The autogen.sh script in glib will run the generated configure script
(for a non-cross build) unless the environment variable NOCONFIGURE is
set.  Set it.
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 57ab3d1..ce3d0af 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -242,7 +242,7 @@ cd ..
 $WGET http://ftp.gnome.org/pub/gnome/sources/glib/$VER_GLIB_SHORT/glib-$VER_GLIB.tar.xz
 tar xfJ glib-$VER_GLIB.tar.xz
 cd glib-$VER_GLIB
-./autogen.sh
+NOCONFIGURE=yes ./autogen.sh
 # Note: Manual LDFLAGS/CPPFLAGS needed for libiconv, rest uses pkg-config.
 LDFLAGS=-L$PREFIX/lib CPPFLAGS=-I$PREFIX/include glib_cv_stack_grows=no glib_cv_uscore=no ac_cv_func_posix_getpwuid_r=no ac_cv_func_posix_getgrgid_r=no ./configure --disable-compile-warnings $C
 make $PARALLEL