diff --git a/bin/named/win32/named.dsp.in b/bin/named/win32/named.dsp.in
index a8c36a7864..10f12bfe03 100644
--- a/bin/named/win32/named.dsp.in
+++ b/bin/named/win32/named.dsp.in
@@ -294,10 +294,6 @@ SOURCE=..\include\named\query.h
# End Source File
# Begin Source File
-SOURCE=..\include\named\seccomp.h
-# End Source File
-# Begin Source File
-
SOURCE=..\include\named\server.h
# End Source File
# Begin Source File
diff --git a/bin/named/win32/named.vcxproj.filters.in b/bin/named/win32/named.vcxproj.filters.in
index 8cc6a7b21f..e7d65c5970 100644
--- a/bin/named/win32/named.vcxproj.filters.in
+++ b/bin/named/win32/named.vcxproj.filters.in
@@ -177,9 +177,6 @@
Header Files
-
- Header Files
-
Header Files
diff --git a/bin/named/win32/named.vcxproj.in b/bin/named/win32/named.vcxproj.in
index 3341259314..282a48d893 100644
--- a/bin/named/win32/named.vcxproj.in
+++ b/bin/named/win32/named.vcxproj.in
@@ -156,7 +156,6 @@
-
diff --git a/lib/isccc/win32/libisccc.dsp.in b/lib/isccc/win32/libisccc.dsp.in
index f195b5b93b..cd02a70ae4 100644
--- a/lib/isccc/win32/libisccc.dsp.in
+++ b/lib/isccc/win32/libisccc.dsp.in
@@ -184,6 +184,10 @@ SOURCE=..\include\isccc\types.h
SOURCE=..\include\isccc\util.h
# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccc\version.h
+# End Source File
# End Group
# Begin Group "Resource Files"
diff --git a/lib/isccc/win32/libisccc.vcxproj.filters.in b/lib/isccc/win32/libisccc.vcxproj.filters.in
index 822ac956d0..b17d13c078 100644
--- a/lib/isccc/win32/libisccc.vcxproj.filters.in
+++ b/lib/isccc/win32/libisccc.vcxproj.filters.in
@@ -86,5 +86,8 @@
Header Files
+
+ Header Files
+
\ No newline at end of file
diff --git a/lib/isccc/win32/libisccc.vcxproj.in b/lib/isccc/win32/libisccc.vcxproj.in
index 6043a5350b..1239babb4a 100644
--- a/lib/isccc/win32/libisccc.vcxproj.in
+++ b/lib/isccc/win32/libisccc.vcxproj.in
@@ -131,6 +131,7 @@
+
diff --git a/lib/isccfg/win32/libisccfg.dsp.in b/lib/isccfg/win32/libisccfg.dsp.in
index abd8631699..684703c137 100644
--- a/lib/isccfg/win32/libisccfg.dsp.in
+++ b/lib/isccfg/win32/libisccfg.dsp.in
@@ -144,6 +144,10 @@ SOURCE=..\include\isccfg\log.h
SOURCE=..\include\isccfg\namedconf.h
# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccfg\version.h
+# End Source File
# End Group
# Begin Group "Resource Files"
diff --git a/lib/isccfg/win32/libisccfg.vcxproj.filters.in b/lib/isccfg/win32/libisccfg.vcxproj.filters.in
index 33cdef60dd..07fb950a37 100644
--- a/lib/isccfg/win32/libisccfg.vcxproj.filters.in
+++ b/lib/isccfg/win32/libisccfg.vcxproj.filters.in
@@ -53,5 +53,8 @@
Header Files
+
+ Header Files
+
\ No newline at end of file
diff --git a/lib/isccfg/win32/libisccfg.vcxproj.in b/lib/isccfg/win32/libisccfg.vcxproj.in
index 3bbb6f1e58..e2aa84011e 100644
--- a/lib/isccfg/win32/libisccfg.vcxproj.in
+++ b/lib/isccfg/win32/libisccfg.vcxproj.in
@@ -120,6 +120,7 @@
+
diff --git a/lib/lwres/win32/liblwres.dsp.in b/lib/lwres/win32/liblwres.dsp.in
index c17504d112..174a6f9b9c 100644
--- a/lib/lwres/win32/liblwres.dsp.in
+++ b/lib/lwres/win32/liblwres.dsp.in
@@ -244,6 +244,10 @@ SOURCE=..\include\lwres\stdlib.h
SOURCE=..\include\lwres\string.h
# End Source File
+# Begin Source File
+
+SOURCE=..\include\lwres\version.h
+# End Source File
# End Group
# Begin Group "Resource Files"
diff --git a/lib/lwres/win32/liblwres.vcxproj.filters.in b/lib/lwres/win32/liblwres.vcxproj.filters.in
index 7b7c614a21..990684d1a0 100644
--- a/lib/lwres/win32/liblwres.vcxproj.filters.in
+++ b/lib/lwres/win32/liblwres.vcxproj.filters.in
@@ -131,5 +131,8 @@
Header Files
+
+ Header Files
+
diff --git a/lib/lwres/win32/liblwres.vcxproj.in b/lib/lwres/win32/liblwres.vcxproj.in
index 7c2550a916..8e36fa5898 100644
--- a/lib/lwres/win32/liblwres.vcxproj.in
+++ b/lib/lwres/win32/liblwres.vcxproj.in
@@ -140,6 +140,7 @@
+
diff --git a/win32utils/Configure b/win32utils/Configure
index 5e9f8817df..31dc1650dc 100644
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -424,6 +424,8 @@ my @substcond = ("ATOMIC",
"TESTS",
"XTESTS");
+my @allcond = (@substcond, "NOTYET", "NOLONGER");
+
# arguments
# enable-xxx/disable-xxx
@@ -2068,11 +2070,15 @@ sub setupfile {
unshift(@conds, $cond);
unshift(@passes, $pass);
}
- $cond = $1;
- if (defined($configcond{$cond})) {
- # do nothing
+ if ($1 ~~ @allcond) {
+ $cond = $1;
+ if (defined($configcond{$cond})) {
+ # do nothing
+ } else {
+ $pass = 0;
+ }
} else {
- $pass = 0;
+ die "unknown condition \@IF $1 in $filename\n";
}
next;
} elsif ($line =~ /^\@ELSE (.*)$/) {
@@ -2181,11 +2187,15 @@ sub setupproject {
unshift(@conds, $cond);
unshift(@passes, $pass);
}
- $cond = $1;
- if (defined($configcond{$cond})) {
- # do nothing
+ if ($1 ~~ @allcond) {
+ $cond = $1;
+ if (defined($configcond{$cond})) {
+ # do nothing
+ } else {
+ $pass = 0;
+ }
} else {
- $pass = 0;
+ die "unknown condition \@IF $1 in $projectname\n";
}
next;
} elsif ($line =~ /^\@ELSE (.*)$/) {
@@ -2695,27 +2705,29 @@ exit 0;
# --enable-exportlib TODO (obsolete)
# --enable-ipv6 included without a way to disable it
# --enable-atomic supported (renamed intrinsic)
-# --enable-spnego support (part of GSSAPI)
+# --enable-isc-spnego support (part of GSSAPI)
# --enable-fixed-rrset supported
# --enable-querytrace supported
# --disable-rpz-nsip supported
# --disable-rpz-nsdname supported
# --enable-filter-aaaa supported
+# --enable-full-report supported by verbose
# --with-python supported
# --with-openssl supported
+# --with-pkcs11 supported
# --with-ecdsa supported
# --with-gost supported
-# --with-pkcs11 supported
# --with-geoip supported
# --with-gssapi supported with MIT (K)erberos (f)or (W)indows
# --with-libxml2 supported
# --with-libjson not supported on WIN32 (package not available on WIN32)
-# --with-purify ? (package available on WIN32 but for free?)
-# --with-gperftools-profiler (package not available on WIN32)
+# --with-purify not supported (package available on WIN32 but for free?)
+# --with-gperftools-profiler not supported (package not available on WIN32)
# --with-libtool not supported on WIN32 (never)
# --with-readline supported
-# --with-idn support
-# --with-[lib]iconv (part of IDN)
+# --with-docbook-xsl not supported (?)
+# --with-idn[lib] supported
+# --with-[lib]iconv supported (part of IDN)
# --with-atf not supported on WIN32 (package not available on WIN32)
# --with-tuning supported
# --with-dlopen included without a way to disable it