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
This commit is contained in:
parent
63aea43ffd
commit
c637d46187
@ -342,7 +342,7 @@
|
|||||||
/*
|
/*
|
||||||
* wxLibrary class
|
* wxLibrary class
|
||||||
*/
|
*/
|
||||||
#define wxUSE_DYNLIB_CLASS 1
|
#define wxUSE_DYNLIB_CLASS 0
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------------ */
|
||||||
/* PS options */
|
/* PS options */
|
||||||
|
@ -1705,9 +1705,13 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
|
|||||||
[AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1])
|
[AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1])
|
||||||
|
|
||||||
if test "$HAVE_DL_FUNCS" = 0; then
|
if test "$HAVE_DL_FUNCS" = 0; then
|
||||||
|
if test "$USE_UNIX" = 1; then
|
||||||
AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
|
AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
|
||||||
wxUSE_ODBC=no
|
wxUSE_ODBC=no
|
||||||
wxUSE_DYNLIB_CLASS=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
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user