Updated testconf, fixed mistake in install.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index 15ded7e5ec6a6f80f06e6b3c8d5e03bb1ee1082e..53d7105e63fdb1fa5958660f459015f7ccb18288 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -396,11 +396,11 @@ else
   DEFAULT_wxUSE_STARTUP_TIPS=yes
   DEFAULT_wxUSE_PROGRESSDLG=yes
   DEFAULT_wxUSE_MINIFRAME=yes
   DEFAULT_wxUSE_STARTUP_TIPS=yes
   DEFAULT_wxUSE_PROGRESSDLG=yes
   DEFAULT_wxUSE_MINIFRAME=yes

-  DEFAULT_wxUSE_HTML=no
-  DEFAULT_wxUSE_FS_INET=no
-  DEFAULT_wxUSE_FS_ZIP=no
-  DEFAULT_wxUSE_BUSYINFO=no
-  DEFAULT_wxUSE_ZIPSTREAM=no
+  DEFAULT_wxUSE_HTML=yes
+  DEFAULT_wxUSE_FS_INET=yes
+  DEFAULT_wxUSE_FS_ZIP=yes
+  DEFAULT_wxUSE_BUSYINFO=yes
+  DEFAULT_wxUSE_ZIPSTREAM=yes

   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ACCEL=yes
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ACCEL=yes

diff --git a/include/wx/html/Makefile.am b/include/wx/html/Makefile.am
index 3611382eb852098917d49dee53a08b8cfd9b8aa6..68fa19b4b5258f32fa352f74085126afbb143c97 100644 (file)
--- a/include/wx/html/Makefile.am
+++ b/include/wx/html/Makefile.am
@@ -14,4 +14,5 @@ htmlparser.h \
 htmltag.h \
 htmlwin.h \
 htmlwinparser.h \
 htmltag.h \
 htmlwin.h \
 htmlwinparser.h \

-mod_templ.h
+mod_templ.h \
+version.h