From 6e87dba9e5cfca5cc3d8d214370d34c98e2a4443 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 7 Jul 2013 16:35:44 +0000 Subject: [PATCH] Regenerate configure after libwxscintilla linking changes. This should have been done together with the changes of r74425, as autoconf_inc.m4 had changed, configure should have been regenerated too. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure b/configure index 131e9af63a..8163b56184 100755 --- a/configure +++ b/configure @@ -806,6 +806,7 @@ COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 +COND_MONOLITHIC_1_USE_STC_1 COND_MONOLITHIC_1_SHARED_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1 @@ -40483,6 +40484,11 @@ EOF COND_MONOLITHIC_1_SHARED_1="" fi + COND_MONOLITHIC_1_USE_STC_1="#" + if test "x$MONOLITHIC" = "x1" -a "x$USE_STC" = "x1" ; then + COND_MONOLITHIC_1_USE_STC_1="" + fi + COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#" if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="" -- 2.50.0