X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3e717ecc5add075cd53a04cf24fe27e24170944..3660fc40ad00d17d21bf0057a30c099179b6eae8:/configure.in diff --git a/configure.in b/configure.in index a2047c8239..5a99554399 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ dnl --------------------------------------------------------------------------- dnl the file passed to AC_INIT should be specific to our package AC_INIT(wx-config.in) -AC_CANONICAL_HOST +AC_CANONICAL_SYSTEM dnl When making releases do: dnl @@ -80,7 +80,7 @@ USE_FREEBSD= USE_VMS= USE_ULTRIX= USE_CYGWIN= -USE_MINGW32= +USE_MINGW= USE_DATA_GENERAL= dnl the list of all available toolkits @@ -186,6 +186,16 @@ case "${host}" in AC_DEFINE(__WIN95__) AC_DEFINE(__WINDOWS__) AC_DEFINE(__GNUWIN32__) + AC_DEFINE(WINVER, 0x0400) + DEFAULT_DEFAULT_wxUSE_MSW=1 + ;; + *-*-mingw32* ) + USE_UNIX=0 + AC_DEFINE(__WIN32__) + AC_DEFINE(__WIN95__) + AC_DEFINE(__WINDOWS__) + AC_DEFINE(__GNUWIN32__) + AC_DEFINE(WINVER, 0x0400) DEFAULT_DEFAULT_wxUSE_MSW=1 ;; @@ -295,6 +305,8 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_HTML=no DEFAULT_wxUSE_FS_INET=no DEFAULT_wxUSE_FS_ZIP=no + DEFAULT_wxUSE_BUSYINFO=no + DEFAULT_wxUSE_ZIPSTREAM=no DEFAULT_wxUSE_VALIDATORS=yes DEFAULT_wxUSE_ACCEL=no @@ -394,9 +406,11 @@ else DEFAULT_wxUSE_STARTUP_TIPS=yes DEFAULT_wxUSE_PROGRESSDLG=yes DEFAULT_wxUSE_MINIFRAME=yes - DEFAULT_wxUSE_HTML=no - DEFAULT_wxUSE_FS_INET=no - DEFAULT_wxUSE_FS_ZIP=no + DEFAULT_wxUSE_HTML=yes + DEFAULT_wxUSE_FS_INET=yes + DEFAULT_wxUSE_FS_ZIP=yes + DEFAULT_wxUSE_BUSYINFO=yes + DEFAULT_wxUSE_ZIPSTREAM=yes DEFAULT_wxUSE_VALIDATORS=yes DEFAULT_wxUSE_ACCEL=yes @@ -531,6 +545,7 @@ WX_ARG_ENABLE(joystick, [ --enable-joystick compile in joystick supp WX_ARG_ENABLE(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM) WX_ARG_ENABLE(fs_inet, [ --enable-fs_inet use virtual HTTP/FTP filesystems], wxUSE_FS_INET) WX_ARG_ENABLE(fs_zip, [ --enable-fs_zip use virtual ZIP filesystems], wxUSE_FS_ZIP) +WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZipInputStream], wxUSE_ZIPSTREAM) dnl --------------------------------------------------------------------------- dnl "big" options (i.e. those which change a lot of things throughout the library) @@ -687,6 +702,7 @@ WX_ARG_ENABLE(html, [ --enable-html use wxHTML sub-library], w WX_ARG_ENABLE(tooltips, [ --enable-tooltips use wxToolTip class], wxUSE_TOOLTIPS) WX_ARG_ENABLE(splines, [ --enable-splines use spline drawing code], wxUSE_SPLINES) WX_ARG_ENABLE(validators, [ --enable-validators use wxValidator and derived classes], wxUSE_VALIDATORS) +WX_ARG_ENABLE(busyinfo, [ --enable-busyinfo use wxBusyInfo], wxUSE_BUSYINFO) dnl cache the options values before (may be) aborting below WX_ARG_CACHE_FLUSH @@ -754,11 +770,15 @@ AC_CACHE_SAVE dnl cross-compiling support: we're cross compiling if the build system is dnl different from the target one (assume host and target be always the same) if eval "test $host != $build"; then - if eval "test $build != NONE"; then - CC="$build-gcc" - CXX="$build-g++" - RANLIB="$build-ranlib" - NM="$build-nm" + if eval "test $host_alias != NONE"; then + CC=$host_alias-gcc + CXX=$host_alias-c++ + AR=$host_alias-ar + RANLIB=$host_alias-ranlib + DLLTOOL=$host_alias-dlltool + LD=$host_alias-ld + NM=$host_alias-nm + STRIP=$host_alias-strip fi fi @@ -963,16 +983,23 @@ WXGTK12= WXWINE= -if test "$wxUSE_CYGWIN" = 1; then +if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then AC_MSG_CHECKING(for Windows headers) WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h) + INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" + + dnl --- Quick & Dirty ; link against most/all libraries + dnl --- This will bloat the executable, but it'll work for now... + LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -loldnames -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" if test "$ac_find_includes" != "" ; then AC_MSG_RESULT(found $ac_find_includes) TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" else AC_MSG_RESULT(no) - AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) + if test "$cross_compiling" != "yes" ; then + AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) + fi fi TOOLKIT=MSW @@ -1556,6 +1583,14 @@ if test "$wxUSE_FS_ZIP" = "yes"; then AC_DEFINE(wxUSE_FS_ZIP) fi +if test "$wxUSE_ZIPSTREAM" = "yes"; then + AC_DEFINE(wxUSE_ZIPSTREAM) +fi + +if test "$wxUSE_BUSYINFO" = "yes"; then + AC_DEFINE(wxUSE_BUSYINFO) +fi + if test "$wxUSE_STD_IOSTREAM" = "yes"; then AC_DEFINE(wxUSE_STD_IOSTREAM) fi @@ -1654,6 +1689,9 @@ if test "$wxUSE_JOYSTICK" = 1; then fi fi + +AC_CHECK_FUNCS(vsscanf) + dnl ------------------------------------------------------------------------ dnl DLL support dnl ------------------------------------------------------------------------ @@ -1671,9 +1709,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_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 @@ -2013,6 +2055,7 @@ fi if test "$wxUSE_HTML" = "yes"; then AC_DEFINE(wxUSE_HTML) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html" + INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS html" fi if test "$wxUSE_VALIDATORS" = "yes"; then @@ -2145,8 +2188,11 @@ dnl samples/Makefile samples/minimal/Makefile include/wx/gtk/Makefile include/wx/motif/Makefile include/wx/msw/Makefile + include/wx/msw/gnuwin32/Makefile + include/wx/msw/ctl3d/Makefile include/wx/protocol/Makefile include/wx/unix/Makefile + include/wx/html/Makefile misc/Makefile misc/afm/Makefile misc/gs_afm/Makefile