Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only build HelpGen in wxBase, since it will #error (this will maybe fix

Browse Source 
some tinderboxes...).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-12-09 18:06:31 +00:00
parent d7f6918abd
commit 27635a90c7
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@@ -22260,11 +22260,12 @@ wx_cv_release=${WX_RELEASE}
wx_cv_current=${WX_CURRENT} wx_cv_current=${WX_CURRENT}
wx_cv_revision=${WX_REVISION} wx_cv_revision=${WX_REVISION}
wx_cv_age=${WX_AGE} wx_cv_age=${WX_AGE}
wx_cv_use_gui=${USE_GUI}
export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \ export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
wx_cv_path_ifs wx_cv_program_ext \ wx_cv_path_ifs wx_cv_program_ext \
wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \ 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"

5
configure.in
View File

@@ -5390,11 +5390,12 @@ wx_cv_release=${WX_RELEASE}
wx_cv_current=${WX_CURRENT} wx_cv_current=${WX_CURRENT}
wx_cv_revision=${WX_REVISION} wx_cv_revision=${WX_REVISION}
wx_cv_age=${WX_AGE} wx_cv_age=${WX_AGE}
wx_cv_use_gui=${USE_GUI}
export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \ export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
wx_cv_path_ifs wx_cv_program_ext \ wx_cv_path_ifs wx_cv_program_ext \
wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \ 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)

4
utils/HelpGen/Makefile.in
View File

@@ -1,6 +1,8 @@
USE_GUI=@USE_GUI@
all: all:
cd src; $(MAKE) if test "$(USE_GUI)" = 0; then cd src; $(MAKE); fi
clean: clean:
cd src; $(MAKE) clean cd src; $(MAKE) clean

3
utils/configure vendored
View File

@@ -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%@infodir@%$infodir%g
s%@mandir@%$mandir%g s%@mandir@%$mandir%g
s%@GL_TOOLKIT_DIR@%$GL_TOOLKIT_DIR%g s%@GL_TOOLKIT_DIR@%$GL_TOOLKIT_DIR%g
s%@USE_GUI@%$USE_GUI%g
CEOF CEOF
EOF EOF

2
utils/configure.in
View File

@@ -4,7 +4,9 @@ AC_REVISION($Id$)dnl
AC_INIT(Makefile.in) AC_INIT(Makefile.in)
GL_TOOLKIT_DIR=$wx_cv_path_glcanvas 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([ AC_OUTPUT([
Makefile Makefile