When building for/on a non-Unix platform, the --enable-dynlib check will only

issue a warning, not disable dynlib and odbc, since configure can't figure
it out anyway.

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

diff --git a/acconfig.h b/acconfig.h
index 72918fca307fa33d8c2116e0421551e1ec33e1fc..9e9bbb9865183ee5e3c0680528de00a5e9b71da3 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -342,7 +342,7 @@
 /*
  * wxLibrary class
  */
 /*
  * wxLibrary class
  */

-#define wxUSE_DYNLIB_CLASS 1
+#define wxUSE_DYNLIB_CLASS 0

 
 /* ------------------------------------------------------------------------ */
 /* PS options                                                               */
 
 /* ------------------------------------------------------------------------ */
 /* PS options                                                               */

diff --git a/configure.in b/configure.in
index 32e622485d182ddaf5e47f136d477607832d6356..b5519d4ba52ba1e5e8e0c531df3daa1c74d6264d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1705,9 +1705,13 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
                     [AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1])
 
     if test "$HAVE_DL_FUNCS" = 0; then
                     [AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1])
 
     if test "$HAVE_DL_FUNCS" = 0; then

-        AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
-        wxUSE_ODBC=no
-        wxUSE_DYNLIB_CLASS=no
+        if test "$USE_UNIX" = 1; then 
+            AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
+            wxUSE_ODBC=no
+            wxUSE_DYNLIB_CLASS=no
+       else
+           AC_MSG_WARN("Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled.")
+       fi    

     fi
 fi
 
     fi
 fi