diff --git a/configure b/configure index 6bb9aefcd0..b31052c3a5 100755 --- a/configure +++ b/configure @@ -22261,11 +22261,12 @@ wx_cv_current=${WX_CURRENT} wx_cv_revision=${WX_REVISION} wx_cv_age=${WX_AGE} wx_cv_use_gui=${USE_GUI} +wx_cv_use_resources=${wxUSE_RESOURCES} 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_use_gui + wx_cv_use_gui wx_cv_use_resources subdirs="demos samples utils contrib" diff --git a/configure.in b/configure.in index 0207d8072f..9a811a5add 100644 --- a/configure.in +++ b/configure.in @@ -5391,11 +5391,12 @@ wx_cv_current=${WX_CURRENT} wx_cv_revision=${WX_REVISION} wx_cv_age=${WX_AGE} wx_cv_use_gui=${USE_GUI} +wx_cv_use_resources=${wxUSE_RESOURCES} 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_use_gui + wx_cv_use_gui wx_cv_use_resources AC_CONFIG_SUBDIRS(demos samples utils contrib) diff --git a/utils/configure b/utils/configure index 3baa1cb446..6791829909 100755 --- a/utils/configure +++ b/utils/configure @@ -525,6 +525,8 @@ fi GL_TOOLKIT_DIR=$wx_cv_path_glcanvas USE_GUI=$wx_cv_use_gui +USE_RESOURCES=$wx_cv_use_resources + @@ -688,6 +690,7 @@ s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@GL_TOOLKIT_DIR@%$GL_TOOLKIT_DIR%g s%@USE_GUI@%$USE_GUI%g +s%@USE_RESOURCES@%$USE_RESOURCES%g CEOF EOF diff --git a/utils/configure.in b/utils/configure.in index 73eb0ccd0e..5e94e089db 100644 --- a/utils/configure.in +++ b/utils/configure.in @@ -5,8 +5,10 @@ AC_INIT(Makefile.in) GL_TOOLKIT_DIR=$wx_cv_path_glcanvas USE_GUI=$wx_cv_use_gui +USE_RESOURCES=$wx_cv_use_resources AC_SUBST(GL_TOOLKIT_DIR) AC_SUBST(USE_GUI) +AC_SUBST(USE_RESOURCES) AC_OUTPUT([ Makefile diff --git a/utils/dialoged/Makefile.in b/utils/dialoged/Makefile.in index 6d36395442..d33737e70a 100644 --- a/utils/dialoged/Makefile.in +++ b/utils/dialoged/Makefile.in @@ -1,6 +1,8 @@ +USE_RESOURCES=@USE_RESOURCES@ + all: - cd src; $(MAKE) + if test "$(USE_RESOURCES)" = "yes"; then cd src; $(MAKE); fi clean: cd src; $(MAKE) clean