Commit 26438f95 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Configure: regroup the host/build sections

parent 4e6ace35
...@@ -275,6 +275,35 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") ...@@ -275,6 +275,35 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian") 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
dnl Check for the contrib directory dnl Check for the contrib directory
dnl dnl
...@@ -345,35 +374,6 @@ AS_IF([test -n "${CONTRIB_DIR}"], [ ...@@ -345,35 +374,6 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
]) ])
AC_SUBST(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
dnl Libtool dnl Libtool
dnl It's very bad, but our former custom system was worst dnl It's very bad, but our former custom system was worst
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment