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

Added some missing brackets required by autoconf on OS2.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2003-08-20 10:29:08 +00:00
parent fa8e95cbdb
commit 4c15b7aff2
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
configure.in
View File

@@ -2096,10 +2096,12 @@ 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
@@ -3683,12 +3685,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"
)
]
) )
) ]
) )
] ]
) )
@@ -4524,15 +4530,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
@@ -4728,8 +4736,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