[vlc-commits] Configure: regroup the host/build sections
Jean-Baptiste Kempf
git at videolan.org
Mon Sep 10 11:06:06 CEST 2012
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Sep 10 11:00:37 2012 +0200| [26438f95fa9815dccdbfbf7ce2111b7e58c75d99] | committer: Jean-Baptiste Kempf
Configure: regroup the host/build sections
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=26438f95fa9815dccdbfbf7ce2111b7e58c75d99
---
configure.ac | 58 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5fe1f5a..8c7b3d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,6 +276,35 @@ AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
dnl
+dnl Sadly autoconf does not think about testing foo.exe when ask to test
+dnl for program foo on win32
+case "${build_os}" in
+ cygwin|msys)
+ ac_executable_extensions=".exe"
+ ;;
+ *)
+ ;;
+esac
+
+dnl Android is linux, but a bit different
+AS_IF([test "$SYS" = linux],[
+ AC_MSG_CHECKING([for an Android system])
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+ [[#ifndef __ANDROID__
+ # error Not Android
+ #endif
+ ]],[[;]])
+ ],[
+ HAVE_ANDROID="1"
+ AC_MSG_RESULT([yes])
+ ],[
+ AC_MSG_RESULT([no])
+ ])
+])
+AM_CONDITIONAL(HAVE_ANDROID, test "${HAVE_ANDROID}" = "1")
+
+
+dnl
dnl Check for the contrib directory
dnl
AC_ARG_WITH(contrib,
@@ -346,35 +375,6 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
AC_SUBST(CONTRIB_DIR)
dnl
-dnl Sadly autoconf does not think about testing foo.exe when ask to test
-dnl for program foo on win32
-
-case "${build_os}" in
- cygwin|msys)
- ac_executable_extensions=".exe"
- ;;
- *)
- ;;
-esac
-
-dnl Android is linux, but a bit different
-AS_IF([test "$SYS" = linux],[
- AC_MSG_CHECKING([for an Android system])
- AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
- [[#ifndef __ANDROID__
- # error Not Android
- #endif
- ]],[[;]])
- ],[
- HAVE_ANDROID="1"
- AC_MSG_RESULT([yes])
- ],[
- AC_MSG_RESULT([no])
- ])
-])
-AM_CONDITIONAL(HAVE_ANDROID, test "${HAVE_ANDROID}" = "1")
-
-dnl
dnl Libtool
dnl It's very bad, but our former custom system was worst
dnl -- Courmisch
More information about the vlc-commits
mailing list