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
This commit is contained in:
parent
a5c1f8ca21
commit
6c3e36af8f
18
configure
vendored
18
configure
vendored
@ -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
|
||||
|
24
configure.in
24
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])
|
||||
|
Loading…
Reference in New Issue
Block a user