Update configure after the changes of the last commit
This should have been included in it but was forgotten.
This commit is contained in:
parent
c2f3a3db01
commit
0f54ec8b36
2 changed files with 19 additions and 9 deletions
17
configure
vendored
17
configure
vendored
|
|
@ -2135,8 +2135,8 @@ Optional Features:
|
||||||
--enable-datetime use wxDateTime class
|
--enable-datetime use wxDateTime class
|
||||||
--enable-debugreport use wxDebugReport class
|
--enable-debugreport use wxDebugReport class
|
||||||
--enable-dialupman use dialup network classes
|
--enable-dialupman use dialup network classes
|
||||||
--enable-dynlib use wxLibrary class for DLL loading
|
--enable-dynlib use wxDynamicLibrary class for DLL loading
|
||||||
--enable-dynamicloader use (new) wxDynamicLibrary class
|
--enable-dynamicloader use wxPluginLibrary and wxPluginManager classes
|
||||||
--enable-exceptions build exception-safe library
|
--enable-exceptions build exception-safe library
|
||||||
--enable-ffile use wxFFile class
|
--enable-ffile use wxFFile class
|
||||||
--enable-file use wxFile class
|
--enable-file use wxFile class
|
||||||
|
|
@ -35727,8 +35727,13 @@ if test "$wxUSE_UNIX" = "yes"; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if test "$TOOLKIT" != "MSW"; then
|
if test "$TOOLKIT" = "MSW"; then
|
||||||
|
if test "$wxUSE_DYNLIB_CLASS" != "yes" ; then
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not disabling wxDynamicLibrary support required by wxMSW" >&5
|
||||||
|
$as_echo "$as_me: WARNING: Not disabling wxDynamicLibrary support required by wxMSW" >&2;}
|
||||||
|
wxUSE_DYNLIB_CLASS=yes
|
||||||
|
fi
|
||||||
|
else
|
||||||
HAVE_DL_FUNCS=0
|
HAVE_DL_FUNCS=0
|
||||||
HAVE_SHL_FUNCS=0
|
HAVE_SHL_FUNCS=0
|
||||||
if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
|
if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
|
||||||
|
|
@ -35875,8 +35880,8 @@ $as_echo "$as_me: WARNING: Missing dynamic loading support, several features wil
|
||||||
wxUSE_DYNAMIC_LOADER=no
|
wxUSE_DYNAMIC_LOADER=no
|
||||||
wxUSE_DYNLIB_CLASS=no
|
wxUSE_DYNLIB_CLASS=no
|
||||||
else
|
else
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming wxLibrary class works on this platform" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming wxDynamicLibrary class works on this platform" >&5
|
||||||
$as_echo "$as_me: WARNING: Assuming wxLibrary class works on this platform" >&2;}
|
$as_echo "$as_me: WARNING: Assuming wxDynamicLibrary class works on this platform" >&2;}
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
11
configure.in
11
configure.in
|
|
@ -4927,9 +4927,14 @@ dnl ------------------------------------------------------------------------
|
||||||
dnl DLL support
|
dnl DLL support
|
||||||
dnl ------------------------------------------------------------------------
|
dnl ------------------------------------------------------------------------
|
||||||
|
|
||||||
dnl under MSW we always have LoadLibrary/GetProcAddress
|
dnl under MSW we always have LoadLibrary/GetProcAddress and always use
|
||||||
if test "$TOOLKIT" != "MSW"; then
|
dnl wxDynamicLibrary
|
||||||
|
if test "$TOOLKIT" = "MSW"; then
|
||||||
|
if test "$wxUSE_DYNLIB_CLASS" != "yes" ; then
|
||||||
|
AC_MSG_WARN([Not disabling wxDynamicLibrary support required by wxMSW])
|
||||||
|
wxUSE_DYNLIB_CLASS=yes
|
||||||
|
fi
|
||||||
|
else
|
||||||
HAVE_DL_FUNCS=0
|
HAVE_DL_FUNCS=0
|
||||||
HAVE_SHL_FUNCS=0
|
HAVE_SHL_FUNCS=0
|
||||||
if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
|
if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue