timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Eina: remove threads options from configure 

remove --disable-posix-threads and --disable-win32-threads
from configure options, and detect automatically the threading
support.



SVN revision: 71517
This commit is contained in:
Vincent Torri 2012-05-29 21:57:48 +00:00
parent ef25a41a76
commit 4889dc71d2
3 changed files with 37 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/eina/ChangeLog
View File

@ -285,3 +285,9 @@
* Fix global_faulty faulty flag in eina_file to be set to 0 * Fix global_faulty faulty flag in eina_file to be set to 0
initially rather than be random memory garbage. initially rather than be random memory garbage.
2012-05-29 Vincent Torri
* remove --disable-posix-threads and --disable-win32-threads
from configure options, and detect automatically the threading
support.

14
legacy/eina/configure.ac
View File

@ -95,19 +95,7 @@ EFL_CHECK_CPU_SSE([have_sse="yes"], [have_sse="no"])
EFL_CHECK_CPU_SSE2([have_sse2="yes"], [have_sse2="no"]) EFL_CHECK_CPU_SSE2([have_sse2="yes"], [have_sse2="no"])
EFL_CHECK_CPU_ALTIVEC([have_altivec="yes"], [have_altivec="no"]) EFL_CHECK_CPU_ALTIVEC([have_altivec="yes"], [have_altivec="no"])
EFL_CHECK_THREADS( EFL_CHECK_THREADS
[
if test "x${_efl_have_posix_threads}" = "xyes" ; then
have_threads="POSIX"
else
if test "x${_efl_have_win32_threads}" = "xyes" ; then
have_threads="Win32"
else
have_threads="no"
fi
fi
],
[have_threads="no"])
EFL_CHECK_SPINLOCK([have_posix_threads_spinlock="yes"], [have_posix_threads_spinlock="no"]) EFL_CHECK_SPINLOCK([have_posix_threads_spinlock="yes"], [have_posix_threads_spinlock="no"])
if ! test "x${have_threads}" = "xno" ; then if ! test "x${have_threads}" = "xno" ; then

125
legacy/eina/m4/common/efl_threads.m4
View File

@ -12,92 +12,35 @@ dnl Defines EFL_HAVE_POSIX_THREADS or EFL_HAVE_WIN32_THREADS, and EFL_HAVE_THREA
AC_DEFUN([EFL_CHECK_THREADS], AC_DEFUN([EFL_CHECK_THREADS],
[ [
dnl configure option EFL_PTHREAD_CFLAGS=""
EFL_PTHREAD_LIBS=""
AC_ARG_ENABLE([posix-threads], _efl_enable_posix_threads="no"
[AC_HELP_STRING([--disable-posix-threads], [enable POSIX threads code @<:@default=auto@:>@])], _efl_have_posix_threads="no"
[ _efl_have_win32_threads="no"
if test "x${enableval}" = "xyes" ; then
_efl_enable_posix_threads="yes"
else
_efl_enable_posix_threads="no"
fi
],
[_efl_enable_posix_threads="auto"])
AC_MSG_CHECKING([whether to build POSIX threads code])
AC_MSG_RESULT([${_efl_enable_posix_threads}])
AC_ARG_ENABLE([win32-threads],
[AC_HELP_STRING([--disable-win32-threads], [enable Win32 threads code @<:@default=no@:>@])],
[
if test "x${enableval}" = "xyes" ; then
_efl_enable_win32_threads="yes"
else
_efl_enable_win32_threads="no"
fi
],
[_efl_enable_win32_threads="no"])
AC_MSG_CHECKING([whether to build Windows threads code])
AC_MSG_RESULT([${_efl_enable_win32_threads}])
dnl
dnl * no + no
dnl * yes + no : win32: error, other : pthread
dnl * yes + yes : win32 : wthread, other : pthread
dnl * no + yes : win32 : wthread, other : error
if test "x${_efl_enable_posix_threads}" = "xyes" && test "x${_efl_enable_win32_threads}" = "xyes" ; then
case "$host_os" in
mingw*)
_efl_enable_posix_threads=no
;;
*)
_efl_enable_win32_threads=no
;;
esac
fi
if test "x${_efl_enable_win32_threads}" = "xyes" ; then
case "$host_os" in
mingw*)
;;
*)
AC_MSG_ERROR([Win32 threads support requested but non Windows system found.])
;;
esac
fi
if test "x${_efl_enable_posix_threads}" = "xyes" ; then
case "$host_os" in
mingw*)
AC_MSG_ERROR([POSIX threads support requested but Windows system found.])
;;
*)
;;
esac
fi
dnl check if the compiler supports POSIX threads
case "$host_os" in case "$host_os" in
mingw*) mingw*)
_efl_have_win32_threads="yes"
AC_DEFINE([EFL_HAVE_WIN32_THREADS], [1], [Define to mention that Win32 threads are supported])
AC_DEFINE([EFL_HAVE_THREADS], [1], [Define to mention that POSIX or Win32 threads are supported])
;; ;;
solaris*) solaris*)
_efl_enable_posix_threads="yes"
_efl_threads_cflags="-mt" _efl_threads_cflags="-mt"
_efl_threads_libs="-mt" _efl_threads_libs="-mt"
;; ;;
*) *)
_efl_enable_posix_threads="yes"
_efl_threads_cflags="-pthread" _efl_threads_cflags="-pthread"
_efl_threads_libs="-pthread" _efl_threads_libs="-pthread"
;; ;;
esac esac
_efl_have_posix_threads="no" dnl check if the compiler supports POSIX threads
_efl_have_win32_threads="no"
if test "x${_efl_enable_posix_threads}" = "xyes" || test "x${_efl_enable_posix_threads}" = "xauto" ; then
if test "x${_efl_enable_posix_threads}" = "xyes" ; then
SAVE_CFLAGS=${CFLAGS} SAVE_CFLAGS=${CFLAGS}
CFLAGS="${CFLAGS} ${_efl_threads_cflags}" CFLAGS="${CFLAGS} ${_efl_threads_cflags}"
@ -111,25 +54,30 @@ if test "x${_efl_enable_posix_threads}" = "xyes" || test "x${_efl_enable_posix_t
pthread_t id; pthread_t id;
id = pthread_self(); id = pthread_self();
]])], ]])],
[_efl_have_posix_threads="yes"], [
_efl_have_posix_threads="yes"
AC_DEFINE([EFL_HAVE_POSIX_THREADS], [1], [Define to mention that POSIX threads are supported])
AC_DEFINE([EFL_HAVE_THREADS], [1], [Define to mention that POSIX or Win32 threads are supported])
EFL_PTHREAD_CFLAGS=${_efl_threads_cflags}
EFL_PTHREAD_LIBS=${_efl_threads_libs}
],
[_efl_have_posix_threads="no"]) [_efl_have_posix_threads="no"])
CFLAGS=${SAVE_CFLAGS} CFLAGS=${SAVE_CFLAGS}
LIBS=${SAVE_LIBS} LIBS=${SAVE_LIBS}
fi fi
AC_MSG_CHECKING([whether system support POSIX threads]) AC_MSG_CHECKING([which threads API is used])
AC_MSG_RESULT([${_efl_have_posix_threads}])
if test "$x{_efl_enable_posix_threads}" = "xyes" && test "x${_efl_have_posix_threads}" = "xno"; then
AC_MSG_ERROR([POSIX threads support requested but not found.])
fi
EFL_PTHREAD_CFLAGS=""
EFL_PTHREAD_LIBS=""
if test "x${_efl_have_posix_threads}" = "xyes" ; then if test "x${_efl_have_posix_threads}" = "xyes" ; then
EFL_PTHREAD_CFLAGS=${_efl_threads_cflags} have_threads="POSIX"
EFL_PTHREAD_LIBS=${_efl_threads_libs} else
if test "x${_efl_have_win32_threads}" = "xyes" ; then
have_threads="Windows"
else
have_threads="none"
fi
fi fi
AC_MSG_RESULT([${have_threads}])
AC_SUBST(EFL_PTHREAD_CFLAGS) AC_SUBST(EFL_PTHREAD_CFLAGS)
AC_SUBST(EFL_PTHREAD_LIBS) AC_SUBST(EFL_PTHREAD_LIBS)
@ -153,24 +101,11 @@ AC_ARG_ENABLE([debug-threads],
[_efl_enable_debug_threads="${enableval}"]) [_efl_enable_debug_threads="${enableval}"])
have_debug_threads="no" have_debug_threads="no"
if test "x${_efl_have_posix_threads}" = "xyes" -a "x${_efl_enable_debug_threads}" = "xyes"; then if test "x${_efl_have_posix_threads}" = "xyes" && test "x${_efl_enable_debug_threads}" = "xyes"; then
have_debug_threads="yes" have_debug_threads="yes"
AC_DEFINE([EFL_DEBUG_THREADS], [1], [Assert when forgot to call eina_threads_init]) AC_DEFINE([EFL_DEBUG_THREADS], [1], [Assert when forgot to call eina_threads_init])
fi fi
if test "x${_efl_have_posix_threads}" = "xyes" ; then
AC_DEFINE([EFL_HAVE_POSIX_THREADS], [1], [Define to mention that POSIX threads are supported])
fi
if test "x${_efl_enable_win32_threads}" = "xyes" ; then
_efl_have_win32_threads="yes"
AC_DEFINE([EFL_HAVE_WIN32_THREADS], [1], [Define to mention that Win32 threads are supported])
fi
if test "x${_efl_have_posix_threads}" = "xyes" || test "x${_efl_have_win32_threads}" = "xyes" ; then
AC_DEFINE([EFL_HAVE_THREADS], [1], [Define to mention that POSIX or Win32 threads are supported])
fi
AS_IF([test "x$_efl_have_posix_threads" = "xyes" || test "x$_efl_have_win32_threads" = "xyes"], [$1], [$2]) AS_IF([test "x$_efl_have_posix_threads" = "xyes" || test "x$_efl_have_win32_threads" = "xyes"], [$1], [$2])
]) ])