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

diff --git a/configure b/configure
index f739f56c23325058e3d0ca09b8fab1d5d9b951d4..6bb9aefcd093859e56796aad4f6d005de867a3c2 100755 (executable)
--- 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_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 \
 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"
 
 
 subdirs="demos samples utils contrib"
 

diff --git a/configure.in b/configure.in
index 8244e6dd2c6bd639ce0d83628b3ca379ff303263..0207d8072f3d796b4ba1dfeed76b86f4699cd8e5 100644 (file)
--- 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_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 \
 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)
 
 
 AC_CONFIG_SUBDIRS(demos samples utils contrib)
 

diff --git a/utils/HelpGen/Makefile.in b/utils/HelpGen/Makefile.in
index 6d3639544230deac72c4084d70662067ed607f36..cecec595bb79e1f166a1375e2bdcad9f452fb8c0 100644 (file)
--- a/utils/HelpGen/Makefile.in
+++ b/utils/HelpGen/Makefile.in
@@ -1,6 +1,8 @@
 
 

+USE_GUI=@USE_GUI@
+

 all:
 all:

-       cd src; $(MAKE)
+       if test "$(USE_GUI)" = 0; then cd src; $(MAKE); fi

 
 clean:
        cd src; $(MAKE) clean
 
 clean:
        cd src; $(MAKE) clean

diff --git a/utils/configure b/utils/configure
index 04188df6ab9ee2cc7159fce2b4b4a3b02a4b916c..3baa1cb4466be29ed7a1602a8f478edf27d92355 100755 (executable)
--- a/utils/configure
+++ b/utils/configure
@@ -524,6 +524,8 @@ fi
 
 
 GL_TOOLKIT_DIR=$wx_cv_path_glcanvas
 
 
 GL_TOOLKIT_DIR=$wx_cv_path_glcanvas

+USE_GUI=$wx_cv_use_gui
+

 
 
 trap '' 1 2 15
 
 
 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%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
 s%@GL_TOOLKIT_DIR@%$GL_TOOLKIT_DIR%g

+s%@USE_GUI@%$USE_GUI%g

 
 CEOF
 EOF
 
 CEOF
 EOF

diff --git a/utils/configure.in b/utils/configure.in
index b22ae8331438536e82e04e03e8f0da2fe7fd559e..73eb0ccd0e3df548a29106e133dc6a89d03f5067 100644 (file)
--- 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
 AC_INIT(Makefile.in)
 
 GL_TOOLKIT_DIR=$wx_cv_path_glcanvas

+USE_GUI=$wx_cv_use_gui

 AC_SUBST(GL_TOOLKIT_DIR)
 AC_SUBST(GL_TOOLKIT_DIR)

+AC_SUBST(USE_GUI)

 
 AC_OUTPUT([
             Makefile
 
 AC_OUTPUT([
             Makefile