Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for multithreading handling on OS/2.

Browse Source 
Some fixes for autoconf-2.57.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2003-08-24 07:31:06 +00:00
parent fb446a01f1
commit 4be2c4b3a6
1 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
configure.in
View File

@@ -263,6 +263,11 @@ case "${host}" in
AC_DEFINE(__EMX__) AC_DEFINE(__EMX__)
PROGRAM_EXT=".exe" PROGRAM_EXT=".exe"
DEFAULT_DEFAULT_wxUSE_PM=1 DEFAULT_DEFAULT_wxUSE_PM=1
dnl "c++" wrapper is not always available, so always use plain gcc.
CXX=gcc
dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
LIBS="$LIBS -lstdcpp"
LDFLAGS="$LDFLAGS -Zcrtdll -Zsysv-signals"
;; ;;
powerpc-*-darwin* ) powerpc-*-darwin* )
@@ -1931,11 +1936,13 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
fi fi
AC_CHECK_HEADER(tiffio.h, AC_CHECK_HEADER(tiffio.h,
AC_CHECK_LIB(tiff, TIFFError, [
TIFF_LINK=" -ltiff", AC_CHECK_LIB(tiff, TIFFError,
, TIFF_LINK=" -ltiff",
$TIFF_PREREQ_LINKS) ,
) $TIFF_PREREQ_LINKS)
]
)
if test "x$TIFF_LINK" = "x" ; then if test "x$TIFF_LINK" = "x" ; then
if test "$wxUSE_LIBTIFF" = "sys" ; then if test "$wxUSE_LIBTIFF" = "sys" ; then
@@ -3461,12 +3468,16 @@ AC_CHECK_FUNCS(inet_addr,
[ [
AC_CHECK_LIB(nsl, inet_addr, AC_CHECK_LIB(nsl, inet_addr,
INET_LINK="nsl", INET_LINK="nsl",
AC_CHECK_LIB(resolv, inet_addr, [
INET_LINK="resolv", AC_CHECK_LIB(resolv, inet_addr,
AC_CHECK_LIB(socket, inet_addr, INET_LINK="resolv",
INET_LINK="socket" [
AC_CHECK_LIB(socket, inet_addr,
INET_LINK="socket"
)
]
) )
) ]
) )
] ]
) )
@@ -3499,7 +3510,7 @@ dnl ---------------------------------------------------------------------------
dnl under MSW (except mingw32) we always have thread support dnl under MSW (except mingw32) we always have thread support
CPP_MT_FLAG= CPP_MT_FLAG=
if test "$TOOLKIT" != "MSW"; then if test "$TOOLKIT" != "MSW" -a "$TOOLKIT" != "PM"; then
dnl the code below: dnl the code below:
dnl dnl
@@ -3795,6 +3806,11 @@ else
CFLAGS="$CFLAGS_OLD" CFLAGS="$CFLAGS_OLD"
fi fi
;; ;;
*-pc-os2*emx )
CFLAGS="$CFLAGS -Zmt"
CXXFLAGS="$CXXFLAGS -Zmt"
LDFLAGS="$LDFLAGS -Zmt"
;;
esac esac
fi fi
fi fi
@@ -4258,15 +4274,17 @@ if test "$wxUSE_SOCKETS" = "yes"; then
if test "$TOOLKIT" != "MSW"; then if test "$TOOLKIT" != "MSW"; then
dnl under Solaris and OS/2, socket functions live in -lsocket dnl under Solaris and OS/2, socket functions live in -lsocket
AC_CHECK_FUNC(socket,, AC_CHECK_FUNC(socket,,
AC_CHECK_LIB(socket, socket, [
if test "$INET_LINK" != " -lsocket"; then AC_CHECK_LIB(socket, socket,
INET_LINK="$INET_LINK -lsocket" if test "$INET_LINK" != " -lsocket"; then
fi, INET_LINK="$INET_LINK -lsocket"
[ fi,
AC_MSG_WARN([socket library not found - sockets will be disabled]) [
wxUSE_SOCKETS=no AC_MSG_WARN([socket library not found - sockets will be disabled])
] wxUSE_SOCKETS=no
) ]
)
]
) )
fi fi
fi fi
@@ -4420,8 +4438,11 @@ if test "$TOOLKIT" != "MSW"; then
dnl check also for dlerror() dnl check also for dlerror()
if test "$HAVE_DL_FUNCS" = 1; then if test "$HAVE_DL_FUNCS" = 1; then
AC_CHECK_FUNCS(dlerror, AC_CHECK_FUNCS(dlerror,
AC_DEFINE(HAVE_DLERROR), AC_DEFINE(HAVE_DLERROR),
AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))) [
AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))
]
)
fi fi
fi fi