fix for last commit which accidentally disabled wxDynamicLibrary class as well

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 2c5008c377897ff724e6ef3c212ecf5aee1b4e01..33452c06ba8a2fecf3e37a81984210273b87ae27 100755 (executable)
--- a/configure
+++ b/configure
@@ -1464,7 +1464,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_SOCKETS=no
   DEFAULT_wxUSE_DIALUP_MANAGER=no
   DEFAULT_wxUSE_JOYSTICK=no
   DEFAULT_wxUSE_SOCKETS=no
   DEFAULT_wxUSE_DIALUP_MANAGER=no
   DEFAULT_wxUSE_JOYSTICK=no

-  DEFAULT_wxUSE_DYNLIB_CLASS=yes
+  DEFAULT_wxUSE_DYNLIB_CLASS=no

   DEFAULT_wxUSE_DYNAMIC_LOADER=no
   DEFAULT_wxUSE_LONGLONG=no
   DEFAULT_wxUSE_GEOMETRY=no
   DEFAULT_wxUSE_DYNAMIC_LOADER=no
   DEFAULT_wxUSE_LONGLONG=no
   DEFAULT_wxUSE_GEOMETRY=no


@@ -1628,7 +1628,7 @@ else
   DEFAULT_wxUSE_SOCKETS=yes
   DEFAULT_wxUSE_DIALUP_MANAGER=yes
   DEFAULT_wxUSE_JOYSTICK=yes
   DEFAULT_wxUSE_SOCKETS=yes
   DEFAULT_wxUSE_DIALUP_MANAGER=yes
   DEFAULT_wxUSE_JOYSTICK=yes

-  DEFAULT_wxUSE_DYNLIB_CLASS=no
+  DEFAULT_wxUSE_DYNLIB_CLASS=yes

   DEFAULT_wxUSE_DYNAMIC_LOADER=no
   DEFAULT_wxUSE_LONGLONG=yes
   DEFAULT_wxUSE_GEOMETRY=yes
   DEFAULT_wxUSE_DYNAMIC_LOADER=no
   DEFAULT_wxUSE_LONGLONG=yes
   DEFAULT_wxUSE_GEOMETRY=yes

diff --git a/configure.in b/configure.in
index b094d68e6db2b5954e3e077bd51b6116e121f706..467b14626c7e0defe46d70f26f9b32fc6b41964e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -700,7 +700,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_SOCKETS=no
   DEFAULT_wxUSE_DIALUP_MANAGER=no
   DEFAULT_wxUSE_JOYSTICK=no
   DEFAULT_wxUSE_SOCKETS=no
   DEFAULT_wxUSE_DIALUP_MANAGER=no
   DEFAULT_wxUSE_JOYSTICK=no

-  DEFAULT_wxUSE_DYNLIB_CLASS=yes
+  DEFAULT_wxUSE_DYNLIB_CLASS=no

   DEFAULT_wxUSE_DYNAMIC_LOADER=no
   DEFAULT_wxUSE_LONGLONG=no
   DEFAULT_wxUSE_GEOMETRY=no
   DEFAULT_wxUSE_DYNAMIC_LOADER=no
   DEFAULT_wxUSE_LONGLONG=no
   DEFAULT_wxUSE_GEOMETRY=no


@@ -864,7 +864,7 @@ else
   DEFAULT_wxUSE_SOCKETS=yes
   DEFAULT_wxUSE_DIALUP_MANAGER=yes
   DEFAULT_wxUSE_JOYSTICK=yes
   DEFAULT_wxUSE_SOCKETS=yes
   DEFAULT_wxUSE_DIALUP_MANAGER=yes
   DEFAULT_wxUSE_JOYSTICK=yes

-  DEFAULT_wxUSE_DYNLIB_CLASS=no
+  DEFAULT_wxUSE_DYNLIB_CLASS=yes

   DEFAULT_wxUSE_DYNAMIC_LOADER=no
   DEFAULT_wxUSE_LONGLONG=yes
   DEFAULT_wxUSE_GEOMETRY=yes
   DEFAULT_wxUSE_DYNAMIC_LOADER=no
   DEFAULT_wxUSE_LONGLONG=yes
   DEFAULT_wxUSE_GEOMETRY=yes

diff --git a/setup.h.in b/setup.h.in
index 3ba47ad8d118d336dd44b121f45737b4287e522d..f705138663bd564d97d6fb053338374e12e23d0a 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -659,10 +659,6 @@
  * Use spline
  */
 #define wxUSE_SPLINES 0
  * Use spline
  */
 #define wxUSE_SPLINES 0

-/*
- * Use wxLibrary class
- */
-#define wxUSE_DYNLIB_CLASS 0

 
 /*
  * Use the mdi architecture
 
 /*
  * Use the mdi architecture