From 27635a90c70478f22f716e57a549fbb3d52c997a Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Mon, 9 Dec 2002 18:06:31 +0000 Subject: [PATCH] Only build HelpGen in wxBase, since it will #error (this will maybe fix some tinderboxes...). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 5 +++-- configure.in | 5 +++-- utils/HelpGen/Makefile.in | 4 +++- utils/configure | 3 +++ utils/configure.in | 2 ++ 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/configure b/configure index f739f56c23..6bb9aefcd0 100755 --- a/configure +++ b/configure @@ -22260,11 +22260,12 @@ wx_cv_release=${WX_RELEASE} wx_cv_current=${WX_CURRENT} wx_cv_revision=${WX_REVISION} wx_cv_age=${WX_AGE} +wx_cv_use_gui=${USE_GUI} export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \ wx_cv_path_ifs wx_cv_program_ext \ wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \ - wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age - + wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \ + wx_cv_use_gui subdirs="demos samples utils contrib" diff --git a/configure.in b/configure.in index 8244e6dd2c..0207d8072f 100644 --- a/configure.in +++ b/configure.in @@ -5390,11 +5390,12 @@ wx_cv_release=${WX_RELEASE} wx_cv_current=${WX_CURRENT} wx_cv_revision=${WX_REVISION} wx_cv_age=${WX_AGE} +wx_cv_use_gui=${USE_GUI} export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \ wx_cv_path_ifs wx_cv_program_ext \ wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \ - wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age - + wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \ + wx_cv_use_gui AC_CONFIG_SUBDIRS(demos samples utils contrib) diff --git a/utils/HelpGen/Makefile.in b/utils/HelpGen/Makefile.in index 6d36395442..cecec595bb 100644 --- a/utils/HelpGen/Makefile.in +++ b/utils/HelpGen/Makefile.in @@ -1,6 +1,8 @@ +USE_GUI=@USE_GUI@ + all: - cd src; $(MAKE) + if test "$(USE_GUI)" = 0; then cd src; $(MAKE); fi clean: cd src; $(MAKE) clean diff --git a/utils/configure b/utils/configure index 04188df6ab..3baa1cb446 100755 --- a/utils/configure +++ b/utils/configure @@ -524,6 +524,8 @@ fi GL_TOOLKIT_DIR=$wx_cv_path_glcanvas +USE_GUI=$wx_cv_use_gui + trap '' 1 2 15 @@ -685,6 +687,7 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@GL_TOOLKIT_DIR@%$GL_TOOLKIT_DIR%g +s%@USE_GUI@%$USE_GUI%g CEOF EOF diff --git a/utils/configure.in b/utils/configure.in index b22ae83314..73eb0ccd0e 100644 --- a/utils/configure.in +++ b/utils/configure.in @@ -4,7 +4,9 @@ AC_REVISION($Id$)dnl AC_INIT(Makefile.in) GL_TOOLKIT_DIR=$wx_cv_path_glcanvas +USE_GUI=$wx_cv_use_gui AC_SUBST(GL_TOOLKIT_DIR) +AC_SUBST(USE_GUI) AC_OUTPUT([ Makefile -- 2.45.2