reverted the hack for accepting broken HHC files (new wxHF_xxxx flags provide same...

[wxWidgets.git] / contrib / configure

diff --git a/contrib/configure b/contrib/configure
index a2f43590a5761b34ed58dea8e259522ca4f1e91b..e20808c0c374a913f7c7c66403e75a6ba6c5920f 100755 (executable)
--- a/contrib/configure
+++ b/contrib/configure
@@ -690,6 +690,8 @@ fi
 
 PATH_IFS=$wx_cv_path_ifs
 WX_TARGET_LIBRARY=$wx_cv_target_library
+WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype
+
 
 
 
@@ -815,9 +817,28 @@ trap 'rm -fr `echo "
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
+            src/xml/Makefile
+            src/canvas/Makefile
+            src/gizmos/Makefile
+            src/plot/Makefile
             samples/Makefile
             samples/mmedia/Makefile
+            samples/ogl/Makefile
+            samples/ogl/ogledit/Makefile
+            samples/ogl/studio/Makefile
             samples/stc/Makefile
+            samples/canvas/Makefile
+            samples/canvas/test/Makefile
+            samples/canvas/simple/Makefile
+            samples/gizmos/Makefile
+            samples/gizmos/multicell/Makefile
+            samples/gizmos/splittree/Makefile
+            samples/xml/Makefile
+            samples/plot/Makefile
+            utils/Makefile
+            utils/wxrc/Makefile
+            utils/wxrcedit/Makefile
+            utils/convertrc/Makefile
          " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -854,6 +875,7 @@ s%@CPP@%$CPP%g
 s%@PATH_IFS@%$PATH_IFS%g
 s%@ESD_LINK@%$ESD_LINK%g
 s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
+s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g
 
 CEOF
 EOF
@@ -900,9 +922,28 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
+            src/xml/Makefile
+            src/canvas/Makefile
+            src/gizmos/Makefile
+            src/plot/Makefile
             samples/Makefile
             samples/mmedia/Makefile
+            samples/ogl/Makefile
+            samples/ogl/ogledit/Makefile
+            samples/ogl/studio/Makefile
             samples/stc/Makefile
+            samples/canvas/Makefile
+            samples/canvas/test/Makefile
+            samples/canvas/simple/Makefile
+            samples/gizmos/Makefile
+            samples/gizmos/multicell/Makefile
+            samples/gizmos/splittree/Makefile
+            samples/xml/Makefile
+            samples/plot/Makefile
+            utils/Makefile
+            utils/wxrc/Makefile
+            utils/wxrcedit/Makefile
+            utils/convertrc/Makefile
          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF