undid the last patch: set wxUSE_XXX to 0 in setup.h.in instead of having to do it manually in configure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
46
configure
vendored
46
configure
vendored
@@ -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
|
||||
|
Reference in New Issue
Block a user