From 6534efcf7b8afc2854619f03d81d9886f49d0ae9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 11 Jul 2007 20:11:37 +0000
Subject: [PATCH] add adv and core libraries to the built wx libs if GUI is
 enabled

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 configure    | 21 +++++++++++----------
 configure.in |  5 +++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index 56b14cda48..de7e55e4b3 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 47287 2007-07-10 10:28:12Z VZ .
+# From configure.in Id: configure.in 47339 2007-07-11 20:03:11Z VZ .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for wxWidgets 2.9.0.
 #
@@ -944,7 +944,7 @@ Optional Features:
   --enable-plugins        build parts of wxWidgets as loadable components
   --enable-official_build official build of wxWidgets (win32 DLL only)
   --enable-vendor=VENDOR  vendor name (win32 DLL only)
-  --disable-all-features  disable all optional features to build minimal library
+  --disable-all_features  disable all optional features to build minimal library
   --enable-universal      use wxWidgets GUI controls instead of native ones
   --enable-nanox          use NanoX
   --disable-gtk2          use GTK+ 1.2 instead of 2.0
@@ -2508,17 +2508,17 @@ fi
               fi
           fi
 
-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-all-features" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-all-features... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-all_features" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-all_features... $ECHO_C" >&6
           no_cache=0
-          # Check whether --enable-all-features or --disable-all-features was given.
+          # Check whether --enable-all_features or --disable-all_features was given.
 if test "${enable_all_features+set}" = set; then
   enableval="$enable_all_features"
 
                           if test "$enableval" = yes; then
-                            ac_cv_use_all-features='wxUSE_ALL_FEATURES=yes'
+                            ac_cv_use_all_features='wxUSE_ALL_FEATURES=yes'
                           else
-                            ac_cv_use_all-features='wxUSE_ALL_FEATURES=no'
+                            ac_cv_use_all_features='wxUSE_ALL_FEATURES=no'
                           fi
 
 else
@@ -2530,13 +2530,13 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_all-features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
+                          ac_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
 
 fi;
 
-          eval "$ac_cv_use_all-features"
+          eval "$ac_cv_use_all_features"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_all-features >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_all_features >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -48176,6 +48176,7 @@ fi
 
 if test "$wxUSE_GUI" = "yes"; then
     STD_GUI_LIBS="adv core"
+    BUILT_WX_LIBS="$STD_GUI_LIBS $BUILT_WX_LIBS"
 
     if test "$wxUSE_DEBUGREPORT" = "yes" ; then
         STD_GUI_LIBS="qa $STD_GUI_LIBS"
diff --git a/configure.in b/configure.in
index 7c99babf74..8324825f9f 100644
--- a/configure.in
+++ b/configure.in
@@ -420,7 +420,7 @@ dnl     - WX_ARG_WITHOUT/WX_ARG_DISABLE mirror WX_ARG_WITH/WX_ARG_ENABLE but
 dnl       should be used for the options which are enabled by default
 dnl     - WX_ARG_FEATURE is a version of WX_ARG_ENABLE which should be used for
 dnl       optional features, i.e. options which should be disabled if
-dnl       --disable-all-features is specified (WX_ARG_WITH/WX_ARG_SYS_WITH are
+dnl       --disable-all_features is specified (WX_ARG_WITH/WX_ARG_SYS_WITH are
 dnl       also affected by this)
 
 dnl ---------------------------------------------------------------------------
@@ -438,7 +438,7 @@ if test "x$VENDOR" = "x"; then
     VENDOR="custom"
 fi
 
-WX_ARG_DISABLE(all-features,[  --disable-all-features  disable all optional features to build minimal library], wxUSE_ALL_FEATURES)
+WX_ARG_DISABLE(all_features,[  --disable-all_features  disable all optional features to build minimal library], wxUSE_ALL_FEATURES)
 
 dnl ---------------------------------------------------------------------------
 dnl port selection
@@ -7131,6 +7131,7 @@ fi
 
 if test "$wxUSE_GUI" = "yes"; then
     STD_GUI_LIBS="adv core"
+    BUILT_WX_LIBS="$STD_GUI_LIBS $BUILT_WX_LIBS"
 
     if test "$wxUSE_DEBUGREPORT" = "yes" ; then
         STD_GUI_LIBS="qa $STD_GUI_LIBS"
-- 
2.47.2