mainly the result of collapsing folds in vimdiff from 2.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
30
configure.in
30
configure.in
@@ -3189,17 +3189,17 @@ dnl ---------------------------------------------------------------------------
|
|||||||
dnl under MSW we always have thread support
|
dnl under MSW we always have thread support
|
||||||
if test "$TOOLKIT" != "MSW"; then
|
if test "$TOOLKIT" != "MSW"; then
|
||||||
|
|
||||||
dnl the code below:
|
dnl the code below:
|
||||||
dnl defines THREADS_OBJ which contains the object files to build
|
dnl defines THREADS_OBJ which contains the object files to build
|
||||||
dnl defines THREADS_LINK which contains the thread library to link with
|
dnl defines THREADS_LINK which contains the thread library to link with
|
||||||
dnl defines wxUSE_THREADS=1 if thread support is activated
|
dnl defines wxUSE_THREADS=1 if thread support is activated
|
||||||
|
|
||||||
THREADS_LINK=
|
THREADS_LINK=
|
||||||
THREADS_OBJ=
|
THREADS_OBJ=
|
||||||
CODE_GEN_FLAGS=
|
CODE_GEN_FLAGS=
|
||||||
CODE_GEN_FLAGS_CXX=
|
CODE_GEN_FLAGS_CXX=
|
||||||
|
|
||||||
if test "$wxUSE_THREADS" = "yes" ; then
|
if test "$wxUSE_THREADS" = "yes" ; then
|
||||||
if test "$wxUSE_WINE" = 1 ; then
|
if test "$wxUSE_WINE" = 1 ; then
|
||||||
AC_MSG_WARN([Threads are not supported under WINE])
|
AC_MSG_WARN([Threads are not supported under WINE])
|
||||||
wxUSE_THREADS="no"
|
wxUSE_THREADS="no"
|
||||||
@@ -3207,9 +3207,9 @@ if test "$wxUSE_THREADS" = "yes" ; then
|
|||||||
AC_MSG_WARN([BeOS threads are not yet supported])
|
AC_MSG_WARN([BeOS threads are not yet supported])
|
||||||
wxUSE_THREADS="no"
|
wxUSE_THREADS="no"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_THREADS" = "yes" ; then
|
if test "$wxUSE_THREADS" = "yes" ; then
|
||||||
dnl find if POSIX threads are available
|
dnl find if POSIX threads are available
|
||||||
|
|
||||||
dnl AIX calls the library libpthreads - thanks IBM!
|
dnl AIX calls the library libpthreads - thanks IBM!
|
||||||
@@ -3242,10 +3242,10 @@ if test "$wxUSE_THREADS" = "yes" ; then
|
|||||||
wxUSE_THREADS=no
|
wxUSE_THREADS=no
|
||||||
AC_MSG_WARN(No thread support on this system)
|
AC_MSG_WARN(No thread support on this system)
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl do other tests only if we are using threads
|
dnl do other tests only if we are using threads
|
||||||
if test "$wxUSE_THREADS" = "yes" ; then
|
if test "$wxUSE_THREADS" = "yes" ; then
|
||||||
AC_CHECK_FUNCS(thr_setconcurrency)
|
AC_CHECK_FUNCS(thr_setconcurrency)
|
||||||
|
|
||||||
dnl define autoconf macro to check for given function in both pthread and
|
dnl define autoconf macro to check for given function in both pthread and
|
||||||
@@ -3386,7 +3386,7 @@ if test "$wxUSE_THREADS" = "yes" ; then
|
|||||||
CXXFLAGS="$CXXFLAGS -mt"
|
CXXFLAGS="$CXXFLAGS -mt"
|
||||||
LDFLAGS="$LDFLAGS -mt"
|
LDFLAGS="$LDFLAGS -mt"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl from if !MSW
|
dnl from if !MSW
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user