Reworked how stock objects are initialized. They now have an

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 52b2dbb8cb9b805702c211f3c0ae2cda1553af50..83e0084cc337922d2f83cc9d6ced8832a6323f5f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1025,7 +1025,6 @@ if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
   wxUSE_DRAG_AND_DROP=no
   # Generic notebook requires tab dialog
   DEFAULT_wxUSE_TABDIALOG=yes
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
   DEFAULT_wxUSE_SCROLLBAR=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_DRAGIMAGE=no
@@ -1259,6 +1258,7 @@ if test "$wxUSE_WINE" = "yes"; then
     CC=winegcc
     CXX=wineg++
     RESCOMP=wrc
+    LDFLAGS_GUI="-mwindows"
 fi
 
 dnl NB: The two tests bellow are *NOT* mutually exclusive! They should only
@@ -2968,6 +2968,25 @@ if test "$wxUSE_DISPLAY" = "yes"; then
             fi
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
             AC_MSG_RESULT([yes])
+
+            AC_MSG_CHECKING([for Xxf86vm extension])
+            WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm)
+            if test "$ac_find_libraries" != "" ; then
+                AC_MSG_RESULT([yes])
+                AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
+                                 [
+                                  GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
+                                 ],
+                                 [], 
+                                 [
+                                      #if HAVE_X11_XLIB_H
+                                        #include <X11/Xlib.h>
+                                      #endif
+                                 ])
+            else
+                AC_MSG_RESULT([no])
+            fi
+        
         else
             AC_MSG_RESULT([no])
             AC_MSG_WARN("*** Xinerama not found; disabling wxDisplay")
@@ -5759,27 +5778,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_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
+AC_BAKEFILE
 
-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