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

undid the last patch: set wxUSE_XXX to 0 in setup.h.in instead of having to do it manually in configure

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2005-01-16 15:58:54 +00:00
parent f50f0a4826
commit 370fd4c26e
2 changed files with 1 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
configure vendored
View File

@ -20819,11 +20819,6 @@ _ACEOF
fi
fi
else
cat >>confdefs.h <<\_ACEOF
#define wxUSE_REGEX 0
_ACEOF
fi
@ -21122,11 +21117,6 @@ echo "$as_me: WARNING: zlib library not found or too old, will use built-in inst
wxUSE_ZLIB=sys
fi
fi
else
cat >>confdefs.h <<\_ACEOF
#define wxUSE_ZLIB 0
_ACEOF
fi
@ -21432,11 +21422,6 @@ echo "$as_me: WARNING: system png library not found or too old, will use built-i
fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
else
cat >>confdefs.h <<\_ACEOF
#define wxUSE_LIBPNG 0
_ACEOF
fi
@ -21601,11 +21586,6 @@ echo "$as_me: WARNING: system jpeg library not found, will use built-in instead"
fi
fi
fi
else
cat >>confdefs.h <<\_ACEOF
#define wxUSE_LIBJPEG 0
_ACEOF
fi
@ -21849,11 +21829,6 @@ echo "$as_me: WARNING: system tiff library not found, will use built-in instead"
wxUSE_LIBTIFF=sys
fi
fi
else
cat >>confdefs.h <<\_ACEOF
#define wxUSE_LIBTIFF 0
_ACEOF
fi
@ -22171,15 +22146,6 @@ echo "$as_me: WARNING: system expat library not found, will use built-in instead
subdirs="$subdirs src/expat"
fi
else
cat >>confdefs.h <<\_ACEOF
#define wxUSE_EXPAT 0
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define wxUSE_XML 0
_ACEOF
fi
@ -22405,11 +22371,6 @@ if test "$wxUSE_LIBMSPACK" != "no"; then
#define wxUSE_LIBMSPACK 1
_ACEOF
else
cat >>confdefs.h <<\_ACEOF
#define wxUSE_LIBMSPACK 0
_ACEOF
fi
@ -33588,12 +33549,7 @@ if test "$wxUSE_GUI" = "yes"; then
_ACEOF
else
cat >>confdefs.h <<\_ACEOF
#define wxUSE_GUI 0
_ACEOF
fi
fi
if test "$wxUSE_UNIX" = "yes"; then

17
configure.in
View File

@ -2081,8 +2081,6 @@ if test "$wxUSE_REGEX" != "no"; then
AC_DEFINE(WX_NO_REGEX_ADVANCED)
fi
fi
else
AC_DEFINE(wxUSE_REGEX, 0)
fi
dnl ------------------------------------------------------------------------
@ -2156,8 +2154,6 @@ if test "$wxUSE_ZLIB" != "no" ; then
wxUSE_ZLIB=sys
fi
fi
else
AC_DEFINE(wxUSE_ZLIB, 0)
fi
dnl ------------------------------------------------------------------------
@ -2229,8 +2225,6 @@ if test "$wxUSE_LIBPNG" != "no" ; then
fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
else
AC_DEFINE(wxUSE_LIBPNG, 0)
fi
dnl ------------------------------------------------------------------------
@ -2285,8 +2279,6 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
fi
fi
fi
else
AC_DEFINE(wxUSE_LIBJPEG, 0)
fi
dnl ------------------------------------------------------------------------
@ -2328,8 +2320,6 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
wxUSE_LIBTIFF=sys
fi
fi
else
AC_DEFINE(wxUSE_LIBTIFF, 0)
fi
dnl ------------------------------------------------------------------------
@ -2377,9 +2367,6 @@ if test "$wxUSE_EXPAT" != "no"; then
dnl Expat needs this:
AC_CONFIG_SUBDIRS([src/expat])
fi
else
AC_DEFINE(wxUSE_EXPAT, 0)
AC_DEFINE(wxUSE_XML, 0)
fi
@ -2400,8 +2387,6 @@ fi
if test "$wxUSE_LIBMSPACK" != "no"; then
AC_DEFINE(wxUSE_LIBMSPACK)
else
AC_DEFINE(wxUSE_LIBMSPACK, 0)
fi
@ -4525,8 +4510,6 @@ if test "$wxUSE_GUI" = "yes"; then
dnl need the dcs, pens, brushes, ...), this just can't be done now
dnl 4. menu stuff: wxMenu, wxMenuBar, wxMenuItem
dnl 5. misc stuff: timers, settings, message box
else
AC_DEFINE(wxUSE_GUI, 0)
fi
dnl ---------------------------------------------------------------------------