fixing the regex mess that Ryan wasn't yet able to fix himself
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
13
configure
vendored
13
configure
vendored
@@ -6735,7 +6735,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
|
||||
@@ -9833,6 +9832,7 @@ if test "$wxUSE_WINE" = "yes"; then
|
||||
CC=winegcc
|
||||
CXX=wineg++
|
||||
RESCOMP=wrc
|
||||
LDFLAGS_GUI="-mwindows"
|
||||
fi
|
||||
|
||||
if test "$wants_win32" = 1 ; then
|
||||
@@ -18910,6 +18910,12 @@ if test "$wxUSE_REGEX" != "no"; then
|
||||
_ACEOF
|
||||
|
||||
|
||||
if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then
|
||||
{ echo "$as_me:$LINENO: WARNING: Unicode build requires built-in regex library, will use it instead" >&5
|
||||
echo "$as_me: WARNING: Unicode build requires built-in regex library, will use it instead" >&2;}
|
||||
wxUSE_REGEX=builtin
|
||||
fi
|
||||
|
||||
if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
|
||||
if test "${ac_cv_header_regex_h+set}" = set; then
|
||||
echo "$as_me:$LINENO: checking for regex.h" >&5
|
||||
@@ -33791,11 +33797,6 @@ if test "$wxUSE_SOCKETS" = "yes"; then
|
||||
echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
|
||||
wxUSE_SOCKETS="no"
|
||||
fi
|
||||
if test "$wxUSE_COCOA" = "1"; then
|
||||
{ echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under Cocoa... disabled" >&5
|
||||
echo "$as_me: WARNING: wxSocket not yet supported under Cocoa... disabled" >&2;}
|
||||
wxUSE_SOCKETS="no"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes"; then
|
||||
|
Reference in New Issue
Block a user