Copied gsockpm.c revision 1.4

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index c0bd57f613e2078c3c702228ea5ba194241bc4bb..49950ac5cd6dfd0e399f2b01799a5d364ab136c6 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
@@ -1878,6 +1877,11 @@ dnl ------------------------------------------------------------------------
 
 if test "$wxUSE_REGEX" != "no"; then
     AC_DEFINE(wxUSE_REGEX)
+            
+    if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then
+        AC_MSG_WARN([Unicode build requires built-in regex library, will use it instead])
+        wxUSE_REGEX=builtin
+    fi
 
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
         dnl according to Unix 98 specs, regcomp() is in libc but I believe that
@@ -4611,10 +4615,6 @@ if test "$wxUSE_SOCKETS" = "yes"; then
         AC_MSG_WARN([wxSocket not yet supported under MGL... disabled])
         wxUSE_SOCKETS="no"
     fi
-    if test "$wxUSE_COCOA" = "1"; then
-        AC_MSG_WARN([wxSocket not yet supported under Cocoa... disabled])
-        wxUSE_SOCKETS="no"
-    fi
 fi
 
 if test "$wxUSE_SOCKETS" = "yes"; then