18 files changed, 19 insertions, 70 deletions
diff --git a/configure.py b/configure.py
index 9ad96ff62..7a9440872 100755
--- a/configure.py
+++ b/configure.py
@@ -753,7 +753,7 @@ class CompilerInfo(object):
 class OsInfo(object):
     def __init__(self, infofile):
         lex_me_harder(infofile, self,
-                      ['aliases', 'target_features', 'supports_shared'],
+                      ['aliases', 'target_features'],
                       { 'os_type': None,
                         'obj_suffix': 'o',
                         'so_suffix': 'so',
@@ -764,12 +764,18 @@ class OsInfo(object):
                         'header_dir': 'include',
                         'lib_dir': 'lib',
                         'doc_dir': 'share/doc',
+                        'build_shared': 'yes',
                         'install_cmd_data': 'install -m 644',
                         'install_cmd_exec': 'install -m 755'
                         })
 
         self.ar_needs_ranlib = bool(self.ar_needs_ranlib)
 
+        if self.build_shared == 'yes':
+            self.build_shared = True
+        else:
+            self.build_shared = False
+
     def ranlib_command(self):
         if self.ar_needs_ranlib:
             return 'ranlib'
@@ -1518,6 +1524,11 @@ def main(argv = None):
                                            archinfo[options.arch],
                                            options)
 
+    if not osinfo[options.os].build_shared:
+        if options.build_shared_lib:
+            logging.info('Disabling shared lib on %s' % (options.os))
+            options.build_shared_lib = False
+
     build_config = BuildConfigurationInformation(options, modules_to_use)
     build_config.public_headers.append(
         os.path.join(build_config.build_dir, 'build.h'))
diff --git a/src/build-data/os/aix.txt b/src/build-data/os/aix.txt
index 312377096..369b720c4 100644
--- a/src/build-data/os/aix.txt
+++ b/src/build-data/os/aix.txt
@@ -3,7 +3,3 @@ os_type unix
 <target_features>
 gettimeofday
 </target_features>
-
-<supports_shared>
-all
-</supports_shared>
diff --git a/src/build-data/os/beos.txt b/src/build-data/os/beos.txt
index f6a06b7af..4a16b6326 100644
--- a/src/build-data/os/beos.txt
+++ b/src/build-data/os/beos.txt
@@ -9,10 +9,6 @@ doc_dir documentation
 gettimeofday
 </target_features>
 
-<supports_shared>
-all
-</supports_shared>
-
 <aliases>
 haiku
 </aliases>
diff --git a/src/build-data/os/cygwin.txt b/src/build-data/os/cygwin.txt
index f7c1f49ed..9ec86736d 100644
--- a/src/build-data/os/cygwin.txt
+++ b/src/build-data/os/cygwin.txt
@@ -1,15 +1,13 @@
 os_type unix
 
+# Cygwin supports shared libs fine, but there are problems with making a Botan
+# shared library when libraries it depends on are static-only (such as libz).
+# So until I can figure out a work-around, it's disabled.
+build_shared no
+
 install_root c:\Botan
 doc_dir docs
 
 <target_features>
 gettimeofday
 </target_features>
-
-# Cygwin supports shared libs fine, but there are problems with making a Botan
-# shared library when libraries it depends on are static-only (such as libz).
-# So until I can figure out a work-around, it's disabled.
-<supports_shared>
-#all
-</supports_shared>
diff --git a/src/build-data/os/darwin.txt b/src/build-data/os/darwin.txt
index af60e1bed..b63abf32c 100644
--- a/src/build-data/os/darwin.txt
+++ b/src/build-data/os/darwin.txt
@@ -12,10 +12,6 @@ doc_dir doc
 gettimeofday
 </target_features>
 
-<supports_shared>
-all
-</supports_shared>
-
 <aliases>
 macosx
 </aliases>
diff --git a/src/build-data/os/dragonfly.txt b/src/build-data/os/dragonfly.txt
index 7a002a65d..ff8f41d2a 100644
--- a/src/build-data/os/dragonfly.txt
+++ b/src/build-data/os/dragonfly.txt
@@ -5,7 +5,3 @@ clock_gettime
 gettimeofday
 posix_mlock
 </target_features>
-
-<supports_shared>
-all
-</supports_shared>
diff --git a/src/build-data/os/freebsd.txt b/src/build-data/os/freebsd.txt
index 3bcf58d62..14e6c63e2 100644
--- a/src/build-data/os/freebsd.txt
+++ b/src/build-data/os/freebsd.txt
@@ -4,7 +4,3 @@ os_type unix
 posix_mlock
 gettimeofday
 </target_features>
-
-<supports_shared>
-all
-</supports_shared>
diff --git a/src/build-data/os/hpux.txt b/src/build-data/os/hpux.txt
index e7aa30e9c..19c230d77 100644
--- a/src/build-data/os/hpux.txt
+++ b/src/build-data/os/hpux.txt
@@ -6,10 +6,6 @@ so_suffix sl
 gettimeofday
 </target_features>
 
-<supports_shared>
-all
-</supports_shared>
-
 <aliases>
 hp-ux
 </aliases>
diff --git a/src/build-data/os/hurd.txt b/src/build-data/os/hurd.txt
index f0ab18a98..e3906f63a 100644
--- a/src/build-data/os/hurd.txt
+++ b/src/build-data/os/hurd.txt
@@ -4,11 +4,6 @@ os_type unix
 posix_mlock
 </target_features>
 
-# Is this correct?
-<supports_shared>
-all
-</supports_shared>
-
 <aliases>
 gnu
 </aliases>
diff --git a/src/build-data/os/irix.txt b/src/build-data/os/irix.txt
index 312377096..369b720c4 100644
--- a/src/build-data/os/irix.txt
+++ b/src/build-data/os/irix.txt
@@ -3,7 +3,3 @@ os_type unix
 <target_features>
 gettimeofday
 </target_features>
-
-<supports_shared>
-all
-</supports_shared>
diff --git a/src/build-data/os/linux.txt b/src/build-data/os/linux.txt
index 2f59fb9d1..8bfacd4c9 100644
--- a/src/build-data/os/linux.txt
+++ b/src/build-data/os/linux.txt
@@ -6,8 +6,3 @@ gettimeofday
 posix_mlock
 gmtime_r
 </target_features>
-
-# Is this correct?
-<supports_shared>
-all
-</supports_shared>
diff --git a/src/build-data/os/mingw.txt b/src/build-data/os/mingw.txt
index 1b30e0b3a..08f85b4db 100644
--- a/src/build-data/os/mingw.txt
+++ b/src/build-data/os/mingw.txt
@@ -4,6 +4,8 @@ obj_suffix o
 so_suffix dll
 static_suffix a
 
+build_shared no
+
 ar_command "ar crs"
 ar_needs_ranlib yes
 
diff --git a/src/build-data/os/netbsd.txt b/src/build-data/os/netbsd.txt
index 312377096..369b720c4 100644
--- a/src/build-data/os/netbsd.txt
+++ b/src/build-data/os/netbsd.txt
@@ -3,7 +3,3 @@ os_type unix
 <target_features>
 gettimeofday
 </target_features>
-
-<supports_shared>
-all
-</supports_shared>
diff --git a/src/build-data/os/openbsd.txt b/src/build-data/os/openbsd.txt
index 312377096..369b720c4 100644
--- a/src/build-data/os/openbsd.txt
+++ b/src/build-data/os/openbsd.txt
@@ -3,7 +3,3 @@ os_type unix
 <target_features>
 gettimeofday
 </target_features>
-
-<supports_shared>
-all
-</supports_shared>
diff --git a/src/build-data/os/qnx.txt b/src/build-data/os/qnx.txt
index 312377096..369b720c4 100644
--- a/src/build-data/os/qnx.txt
+++ b/src/build-data/os/qnx.txt
@@ -3,7 +3,3 @@ os_type unix
 <target_features>
 gettimeofday
 </target_features>
-
-<supports_shared>
-all
-</supports_shared>
diff --git a/src/build-data/os/solaris.txt b/src/build-data/os/solaris.txt
index df951d4fc..47e7bccbc 100644
--- a/src/build-data/os/solaris.txt
+++ b/src/build-data/os/solaris.txt
@@ -5,10 +5,6 @@ posix_mlock
 gettimeofday
 </target_features>
 
-<supports_shared>
-all
-</supports_shared>
-
 <aliases>
 sunos
 </aliases>
diff --git a/src/build-data/os/tru64.txt b/src/build-data/os/tru64.txt
index 677c38955..a442743bc 100644
--- a/src/build-data/os/tru64.txt
+++ b/src/build-data/os/tru64.txt
@@ -4,10 +4,6 @@ os_type unix
 gettimeofday
 </target_features>
 
-<supports_shared>
-all
-</supports_shared>
-
 <aliases>
 osf1
 </aliases>
diff --git a/src/build-data/os/windows.txt b/src/build-data/os/windows.txt
index 4d8879dd8..140eddeba 100644
--- a/src/build-data/os/windows.txt
+++ b/src/build-data/os/windows.txt
@@ -16,10 +16,6 @@ win32_get_systemtime
 gmtime_s
 </target_features>
 
-<supports_shared>
-all
-</supports_shared>
-
 <aliases>
 win32
 MSWin32