reverted previous change (except for tiny part that actually made sense)

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

diff --git a/aclocal.m4 b/aclocal.m4
index 59c3dad9a745b6c27ae522bfa806d332decb260e..4a689c1309aed07efbd363ba3820c3e8387e62fe 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1767,15 +1767,6 @@ dnl ---------------------------------------------------------------------------
 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,

diff --git a/configure b/configure
index fdcec05a633e580ada820ef1bde09429397be36a..618ad120319d866a5fd62bb0b5bf1e44fc9af56f 100755 (executable)
--- a/configure
+++ b/configure
@@ -9736,6 +9736,7 @@ if test "$wxUSE_WINE" = "yes"; then
     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
@@ -26543,6 +26544,48 @@ if test "$wxUSE_ZLIB" = "builtin" ; then
     ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
 fi
 
+if test "$wxUSE_DISPLAY" = "yes"; then
+    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1; then
+        echo "$as_me:$LINENO: checking for Xinerama" >&5
+echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6
+
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB /usr/lib;
+  do
+    for ac_extension in a so sl dylib; do
+      if test -f "$ac_dir/libXinerama.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+        if test "$ac_find_libraries" != "" ; then
+
+  echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
+  result=$?
+  if test $result = 0; then
+    ac_path_to_link=""
+  else
+    ac_path_to_link=" -L$ac_find_libraries"
+  fi
+
+            if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                LDFLAGS="$LDFLAGS $ac_path_to_link"
+            fi
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+        else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+            { echo "$as_me:$LINENO: WARNING: \"*** Xinerama not found; disabling wxDisplay\"" >&5
+echo "$as_me: WARNING: \"*** Xinerama not found; disabling wxDisplay\"" >&2;}
+            wxUSE_DISPLAY="no"
+        fi
+    fi
+fi
+
 
 USE_OPENGL=0
 if test "$wxUSE_OPENGL" = "yes"; then
@@ -37460,7 +37503,7 @@ while test \${#} -gt 0; do
         shift
         ;;
 
-       -l*|-L*|-flat_namespace)
+       -l*|-L*|-flat_namespace|-headerpad_max_install_names)
         # collect these options
         args="\${args} \${1}"
         ;;
@@ -37870,6 +37913,8 @@ fi
 
 
 
+
+
     # Check whether --enable-precomp-headers or --disable-precomp-headers was given.
 if test "${enable_precomp_headers+set}" = set; then
   enableval="$enable_precomp_headers"

diff --git a/configure.in b/configure.in
index 52b2dbb8cb9b805702c211f3c0ae2cda1553af50..9ec459aca036da87e8d89fa37b5a1114cf4e9a84 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5759,27 +5759,8 @@ AC_SUBST(SAMPLES_RPATH_FLAG)
 AC_SUBST(SAMPLES_RPATH_POSTLINK)
 AC_SUBST(HOST_SUFFIX)
 
-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
 
-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