From 6c3e36af8f9d2d1562bda395ef79e971ae5b7d13 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 28 Jun 2003 11:34:41 +0000
Subject: [PATCH] only configure programs which compile without GUI when
 building wxBase

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

diff --git a/configure b/configure
index 97c1bb8191..6e86d26164 100755
--- a/configure
+++ b/configure
@@ -34725,10 +34725,23 @@ fi
           ac_config_commands="$ac_config_commands default"
 
 
+if test "$wxUSE_GUI" = "yes"; then
+    SUBDIRS="samples demos utils contrib"
+else         SUBDIRS="samples utils"
+fi
 
-for subdir in samples demos utils contrib ; do
+for subdir in `echo $SUBDIRS`; do
     if test -d ${srcdir}/${subdir} ; then
-        makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+        if test "$wxUSE_GUI" = "yes"; then
+            makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+        else                                     if test ${subdir} = "samples"; then
+                makefiles="samples/console/Makefile.in"
+            else                 makefiles="utils/HelpGen/Makefile.in \
+                           utils/HelpGen/src/Makefile.in \
+                           utils/makegen/Makefile.in"
+            fi
+        fi
+
         for mkin in $makefiles ; do
             mk=`echo $mkin | sed 's/Makefile\.in/Makefile/g'`
                       ac_config_files="$ac_config_files $mk"
@@ -34737,7 +34750,6 @@ for subdir in samples demos utils contrib ; do
     fi
 done
 
-
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
diff --git a/configure.in b/configure.in
index 3ceba0cc19..f3bcffeadb 100644
--- a/configure.in
+++ b/configure.in
@@ -5793,9 +5793,29 @@ AC_CONFIG_COMMANDS([default],
 
 
 dnl Configure samples, contrib etc. directories, but only if they are present:
-for subdir in samples demos utils contrib ; do
+if test "$wxUSE_GUI" = "yes"; then
+    SUBDIRS="samples demos utils contrib"
+else dnl we build wxBase only
+    dnl there are no wxBase programs in contrib nor demos
+    SUBDIRS="samples utils"
+fi
+
+for subdir in echo `$SUBDIRS`; do
     if test -d ${srcdir}/${subdir} ; then
-        makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+        if test "$wxUSE_GUI" = "yes"; then
+            makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+        else dnl we build wxBase only
+            dnl don't take all samples/utils, just those which build with
+            dnl wxBase
+            if test ${subdir} = "samples"; then
+                makefiles="samples/console/Makefile.in"
+            else dnl utils
+                makefiles="utils/HelpGen/Makefile.in \
+                           utils/HelpGen/src/Makefile.in \
+                           utils/makegen/Makefile.in"
+            fi
+        fi
+
         for mkin in $makefiles ; do
             mk=`echo $mkin | sed 's/Makefile\.in/Makefile/g'`
             AC_CONFIG_FILES([$mk])