[Android] Don't re-run configure if it has run already

Jean-Baptiste Kempf git at videolan.org
Wed Feb 4 23:56:52 CET 2015


vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Feb  4 23:56:34 2015 +0100| [26bc1edd895003dfc919806cc37327039aa7edae] | committer: Jean-Baptiste Kempf

Don't re-run configure if it has run already

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=26bc1edd895003dfc919806cc37327039aa7edae
---

 compile-libvlc.sh |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 67c4a46..b5f9bde 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -304,6 +304,7 @@ mkdir -p build-android-${TARGET_TUPLE} && cd build-android-${TARGET_TUPLE}
 
 CROSS_COMPILE=${ANDROID_BIN}/${TARGET_TUPLE}-
 
+if [ ! -e config.h ]; then
 CPPFLAGS="$CPPFLAGS" \
 CFLAGS="$CFLAGS ${VLC_EXTRA_CFLAGS} ${EXTRA_CFLAGS}" \
 CXXFLAGS="$CFLAGS" \
@@ -395,7 +396,7 @@ config_undef ()
     fi
 }
 
-# if config dependencies change, ./config.status
+# if config dependencies change, ./config.status
 # is run and overwrite previously hacked config.h. So call make config.h here
 # and hack config.h after.
 
@@ -413,6 +414,8 @@ if [ ${ANDROID_API} = "android-21" ] ; then
 fi
 # END OF ANDROID NDK FIXUP
 
+fi
+
 ############
 # BUILDING #
 ############
@@ -421,3 +424,7 @@ echo "Building"
 make $MAKEFLAGS
 
 cd ../..
+
+
+######################################################################################
+



More information about the Android mailing list