[Android] fix build if configure is run from make

Thomas Guillem git at videolan.org
Tue Mar 10 11:53:02 CET 2015


vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Mar 10 11:51:44 2015 +0100| [adf0e07018c05972ee2e84faca6635555c1d7562] | committer: Thomas Guillem

fix build if configure is run from make

Always export configure hacks.

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

 compile-libvlc.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index fed0316..41b229b 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -485,7 +485,6 @@ mkdir -p $VLC_BUILD_DIR && cd $VLC_BUILD_DIR
 # CONFIGURE #
 #############
 
-if [ ! -e ./config.h -o "$RELEASE" = 1 ]; then
 if [ "${CHROME_OS}" = "1" ];then
     # chrome OS doesn't have eventfd
     export ac_cv_func_eventfd=no
@@ -502,6 +501,7 @@ if [ ${ANDROID_ABI} = "x86" -a ${ANDROID_API} != "android-21" ] ; then
     # intel devices has nanf. Assume they don't have it.
     export ac_cv_lib_m_nanf=no
 fi
+if [ ! -e ./config.h -o "$RELEASE" = 1 ]; then
 CPPFLAGS="$CPPFLAGS" \
 CFLAGS="$CFLAGS ${VLC_EXTRA_CFLAGS} ${EXTRA_CFLAGS}" \
 CXXFLAGS="$CFLAGS" \



More information about the Android mailing list