mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-23 14:45:04 +08:00
Check for CATCH in configure even when --without-subdirs is used
This may seem useless, but it allows to use --without-subdirs and then just do `$srcdir/regen tests/Makefile` to create a working makefile for the unit tests without wasting time on creating a hundred of samples makefiles.
This commit is contained in:
@@ -43863,7 +43863,6 @@ ac_config_commands="$ac_config_commands wx-config"
|
||||
|
||||
|
||||
|
||||
if test "$wxWITH_SUBDIRS" != "no"; then
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
SUBDIRS="samples demos utils"
|
||||
else
|
||||
@@ -43995,6 +43994,7 @@ $as_echo "yes" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxWITH_SUBDIRS" != "no"; then
|
||||
for subdir in $SUBDIRS; do
|
||||
if test -d ${srcdir}/${subdir} ; then
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
+2
-2
@@ -8286,8 +8286,6 @@ dnl though in this form because AC_CONFIG_LINKS will fail for directories
|
||||
dnl on platforms that do not have symlinks.
|
||||
dnl AC_CONFIG_LINKS([ include/wx-$WX_RELEASE$WX_FLAVOUR:include ])
|
||||
|
||||
if test "$wxWITH_SUBDIRS" != "no"; then
|
||||
dnl Configure samples, demos etc. directories, but only if they are present:
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
SUBDIRS="samples demos utils"
|
||||
else
|
||||
@@ -8340,6 +8338,8 @@ will use built-in instead])
|
||||
AC_SUBST(CATCH2_CFLAGS)
|
||||
fi
|
||||
|
||||
dnl Configure samples, demos etc. directories, but only if they are present:
|
||||
if test "$wxWITH_SUBDIRS" != "no"; then
|
||||
for subdir in $SUBDIRS; do
|
||||
if test -d ${srcdir}/${subdir} ; then
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
Reference in New Issue
Block a user