[Android] compile-libvlc.sh: replace ugly config_undef hack by good exports

[Thomas Guillem]

vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Feb 19 13:47:13 2015 +0100| [0604f3fe39bf49e03bd08b6ce18f5a6d8d934629] | committer: Thomas Guillem

compile-libvlc.sh: replace ugly config_undef hack by good exports

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

 compile-libvlc.sh |   53 ++++++++++++++++-------------------------------------
 1 file changed, 16 insertions(+), 37 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 362e471..8c31dd2 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -476,8 +476,6 @@ cd ../../
 
 if [ "${CHROME_OS}" = "1" ];then
     VLC_BUILD_DIR=build-chrome-${TARGET_TUPLE}
-    export ac_cv_func_eventfd=no
-    export ac_cv_header_sys_eventfd_h=no
 else
     VLC_BUILD_DIR=build-android-${TARGET_TUPLE}
 fi
@@ -488,6 +486,22 @@ mkdir -p $VLC_BUILD_DIR && cd $VLC_BUILD_DIR
 #############
 
 if [ ! -e ./config.h ]; then
+if [ "${CHROME_OS}" = "1" ];then
+    # chrome OS doesn't have eventfd
+    export ac_cv_func_eventfd=no
+    export ac_cv_header_sys_eventfd_h=no
+fi
+
+if [ ${ANDROID_API} = "android-21" ] ; then
+    # android-21 has empty sys/shm.h headers that triggers shm detection but it
+    # doesn't have any shm functions and/or symbols. */
+    export ac_cv_header_sys_shm_h=no
+fi
+if [ ${ANDROID_ABI} = "x86" -a ${ANDROID_API} != "android-21" ] ; then
+    # NDK x86 libm.so has nanf symbol but no nanf definition, we don't known if
+    # intel devices has nanf. Assume they don't have it.
+    export ac_cv_lib_m_nanf=no
+fi
 CPPFLAGS="$CPPFLAGS" \
 CFLAGS="$CFLAGS ${VLC_EXTRA_CFLAGS} ${EXTRA_CFLAGS}" \
 CXXFLAGS="$CFLAGS" \
@@ -504,41 +518,6 @@ sh ../configure --host=$TARGET_TUPLE --build=x86_64-unknown-linux \
 checkfail "vlc: configure failed"
 fi
 
-# ANDROID NDK FIXUP (BLAME GOOGLE)
-config_undef ()
-{
-    unamestr=`uname`
-    if [[ "$unamestr" == 'Darwin' ]]; then
-        previous_change=`stat -f "%Sm" -t "%y%m%d%H%M.%S" config.h`
-        sed -i '' 's,#define '$1' 1,/\* #undef '$1' \*/,' config.h
-        touch -t "$previous_change" config.h
-    else
-        previous_change=`stat -c "%y" config.h`
-        sed -i 's,#define '$1' 1,/\* #undef '$1' \*/,' config.h
-        # don't change modified date in order to don't trigger a full build
-        touch -d "$previous_change" config.h
-    fi
-}
-
-# 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.
-
-make $MAKEFLAGS config.h
-checkfail "vlc: make config.h failed"
-
-if [ ${ANDROID_ABI} = "x86" -a ${ANDROID_API} != "android-21" ] ; then
-    # NDK x86 libm.so has nanf symbol but no nanf definition, we don't known if
-    # intel devices has nanf. Assume they don't have it.
-    config_undef HAVE_NANF
-fi
-if [ ${ANDROID_API} = "android-21" ] ; then
-    # android-21 has empty sys/shm.h headers that triggers shm detection but it
-    # doesn't have any shm functions and/or symbols. */
-    config_undef HAVE_SYS_SHM_H
-fi
-# END OF ANDROID NDK FIXUP
-
 ############
 # BUILDING #
 ############