Automatically disable wxDialupManager for wxMac and wxCocoa,

skip dialup sample if wxDialupManager is disabled.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-02-03 22:34:54 +00:00
parent 74e2116a4b
commit b843b628c9
2 changed files with 22 additions and 13 deletions

21
configure vendored
View File

@@ -35645,14 +35645,6 @@ _ACEOF
fi
if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_DIALUP_MANAGER 1
_ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
fi
if test "$wxUSE_STREAMS" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_STREAMS 1
@@ -38149,6 +38141,19 @@ _ACEOF
fi
fi
if test "$wxUSE_DIALUP" = "yes"; then
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
{ echo "$as_me:$LINENO: WARNING: Dialup manager not yet supported under Mac OS X... disabled" >&5
echo "$as_me: WARNING: Dialup manager not yet supported under Mac OS X... disabled" >&2;}
else
cat >>confdefs.h <<\_ACEOF
#define wxUSE_DIALUP_MANAGER 1
_ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
fi
fi
if test "$wxUSE_TIPWINDOW" = "yes"; then
if test "$wxUSE_PM" = 1; then
{ echo "$as_me:$LINENO: WARNING: wxTipWindow not yet supported under PM... disabled" >&5

View File

@@ -4867,11 +4867,6 @@ if test "$wxUSE_GEOMETRY" = "yes"; then
AC_DEFINE(wxUSE_GEOMETRY)
fi
if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
AC_DEFINE(wxUSE_DIALUP_MANAGER)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
fi
if test "$wxUSE_STREAMS" = "yes" ; then
AC_DEFINE(wxUSE_STREAMS)
fi
@@ -5754,6 +5749,15 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
fi
fi
if test "$wxUSE_DIALUP" = "yes"; then
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
AC_MSG_WARN([Dialup manager not yet supported under Mac OS X... disabled])
else
AC_DEFINE(wxUSE_DIALUP_MANAGER)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
fi
fi
if test "$wxUSE_TIPWINDOW" = "yes"; then
if test "$wxUSE_PM" = 1; then
AC_MSG_WARN([wxTipWindow not yet supported under PM... disabled])