Applied patch by Dimitrie O. Paun <dpaun@rogers.com> to get configure

working with Winelib.

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

diff --git a/aclocal.m4 b/aclocal.m4
index 4a689c1309aed07efbd363ba3820c3e8387e62fe..59c3dad9a745b6c27ae522bfa806d332decb260e 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1767,6 +1767,15 @@ dnl ---------------------------------------------------------------------------
 dnl AC_BAKEFILE
 dnl
 dnl To be used in configure.in of any project using Bakefile-generated mks
 dnl AC_BAKEFILE
 dnl
 dnl To be used in configure.in of any project using Bakefile-generated mks

+dnl
+dnl *** Please note that currently due to a workaround in configure.in to allow
+dnl configuration in WINE mode, the contents of this macro is repeated
+dnl in configure.in instead of using AC_BAKEFILE. This allows an override
+dnl of PLATFORM_UNIX and PLATFORM_WIN32. Perhaps the code that generates
+dnl AC_BAKEFILE_PLATFORM can be changed to take this case into account.
+dnl Meanwhile, alterations in this macro need to be reflected in configure.in
+dnl also (search for e.g. AC_BAKEFILE_GNUMAKE). The patch to configure.in was
+dnl contributed by Dimitrie O. Paun <dpaun@rogers.com> and applied by Julian.

 dnl ---------------------------------------------------------------------------
 
 AC_DEFUN(AC_BAKEFILE,
 dnl ---------------------------------------------------------------------------
 
 AC_DEFUN(AC_BAKEFILE,

diff --git a/configure.in b/configure.in
index d1f2e9b6e62aa91c940387e16f4457f072d1ab6a..52b2dbb8cb9b805702c211f3c0ae2cda1553af50 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1156,6 +1156,7 @@ if test "$wxUSE_WINE" = "yes"; then
     DEFAULT_DEFAULT_wxUSE_GTK=0
     DEFAULT_DEFAULT_wxUSE_MOTIF=0
     DEFAULT_DEFAULT_wxUSE_MSW=1
     DEFAULT_DEFAULT_wxUSE_GTK=0
     DEFAULT_DEFAULT_wxUSE_MOTIF=0
     DEFAULT_DEFAULT_wxUSE_MSW=1

+    wxUSE_SHARED=no

 fi
 
 if test "$wxUSE_GUI" = "yes"; then
 fi
 
 if test "$wxUSE_GUI" = "yes"; then


@@ -5758,8 +5759,27 @@ AC_SUBST(SAMPLES_RPATH_FLAG)
 AC_SUBST(SAMPLES_RPATH_POSTLINK)
 AC_SUBST(HOST_SUFFIX)
 
 AC_SUBST(SAMPLES_RPATH_POSTLINK)
 AC_SUBST(HOST_SUFFIX)
 

-AC_BAKEFILE
+dnl Please see comments in aclocal.m4 (AC_BAKEFILE) for an explanation
+dnl of why this doesn't just say AC_BAKEFILE at present, to make Winelib
+dnl configuration work.

 
 

+AC_BAKEFILE_CHECK_BASIC_STUFF
+AC_BAKEFILE_GNUMAKE
+AC_BAKEFILE_PLATFORM
+
+dnl Override plaform detection for Wine
+if test "$wxUSE_WINE" = "yes"; then
+    PLATFORM_UNIX=0
+    PLATFORM_WIN32=1
+fi
+
+AC_BAKEFILE_SUFFIXES
+AC_BAKEFILE_SHARED_LD
+AC_BAKEFILE_SHARED_VERSIONS
+AC_BAKEFILE_DEPS
+AC_BAKEFILE_RES_COMPILERS
+
+builtin(include, autoconf_inc.m4)

 
 dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
 if test $GCC_PCH = 1 ; then
 
 dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
 if test $GCC_PCH = 1 ; then