Some additional checks for building wxPM (OS/2) which doesn't support
wxTipWindow and wxPopupWindow yet. Additionally check in libsocket for inet_addr (for all OS/2 builds). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9e3229b777
commit
c6712985be
21
configure.in
21
configure.in
@ -3047,7 +3047,7 @@ AC_CHECK_FUNCS(strtok_r)
|
||||
AC_LANG_RESTORE
|
||||
|
||||
dnl check for inet_addr and inet_aton (these may live either in libc, or in
|
||||
dnl libnsl or libresolv)
|
||||
dnl libnsl or libresolv or libsocket)
|
||||
INET_LINK=
|
||||
AC_CHECK_FUNCS(inet_addr,
|
||||
AC_DEFINE(HAVE_INET_ADDR),
|
||||
@ -3055,7 +3055,10 @@ AC_CHECK_FUNCS(inet_addr,
|
||||
AC_CHECK_LIB(nsl, inet_addr,
|
||||
INET_LINK="nsl",
|
||||
AC_CHECK_LIB(resolv, inet_addr,
|
||||
INET_LINK="resolv"
|
||||
INET_LINK="resolv",
|
||||
AC_CHECK_LIB(socket, inet_addr,
|
||||
INET_LINK="socket"
|
||||
)
|
||||
)
|
||||
)
|
||||
]
|
||||
@ -4396,15 +4399,23 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
|
||||
if test "$wxUSE_MOTIF" = 1; then
|
||||
AC_MSG_WARN([wxPopupWindow not yet supported under Motif... disabled])
|
||||
else
|
||||
AC_DEFINE(wxUSE_POPUPWIN)
|
||||
if test "$wxUSE_PM" = 1; then
|
||||
AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled])
|
||||
else
|
||||
AC_DEFINE(wxUSE_POPUPWIN)
|
||||
|
||||
USES_CONTROLS=1
|
||||
USES_CONTROLS=1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_TIPWINDOW" = "yes"; then
|
||||
AC_DEFINE(wxUSE_TIPWINDOW)
|
||||
if test "$wxUSE_PM" = 1; then
|
||||
AC_MSG_WARN([wxTipWindow not yet supported under PM... disabled])
|
||||
else
|
||||
AC_DEFINE(wxUSE_TIPWINDOW)
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$USES_CONTROLS" = 1; then
|
||||
|
Loading…
Reference in New Issue
Block a user