propagate from branch 'net.randombit.botan' (head 8242ac69f7f2d942e250d31c59de569e4a780470)

            to branch 'net.randombit.botan.python-configure' (head 383228a39716994014f5a0e24334b42d01807ec2)

14 files changed, 170 insertions, 176 deletions

diff --git a/configure.pl b/configure.pl
index 53b7897e5..f290f002d 100755
--- a/configure.pl
+++ b/configure.pl
@@ -65,12 +65,12 @@ sub main {
     $$config{'base-dir'} = $base_dir;
     $$config{'src-dir'} = File::Spec->catdir($base_dir, 'src');
     $$config{'checks-dir'} = File::Spec->catdir($base_dir, 'checks');
-    $$config{'doc-dir'} = File::Spec->catdir($base_dir, 'doc');
+    $$config{'doc_src_dir'} = File::Spec->catdir($base_dir, 'doc');
 
     $$config{'config-dir'} =
         File::Spec->catdir($$config{'src-dir'}, 'build-data');
 
-    $$config{'command-line'} = $0 . ' ' . join(' ', @ARGV);
+    $$config{'command_line'} = $0 . ' ' . join(' ', @ARGV);
     $$config{'timestamp'} = gmtime;
     $$config{'user'} = getlogin || getpwuid($<) || '';
     $$config{'hostname'} = hostname;
@@ -103,12 +103,12 @@ sub main {
 
     # Goes into build-specific dirs (maybe)
 
-    $$config{'build-dir'} = 'build';
-    $$config{'botan-config'} = File::Spec->catfile(
-        $$config{'build-dir'}, 'botan-config');
+    $$config{'build_dir'} = 'build';
+    $$config{'botan_config'} = File::Spec->catfile(
+        $$config{'build_dir'}, 'botan-config');
 
-    $$config{'botan-pkgconfig'} = File::Spec->catfile(
-        $$config{'build-dir'},
+    $$config{'botan_pkgconfig'} = File::Spec->catfile(
+        $$config{'build_dir'},
         'botan-' . $MAJOR_VERSION . '.' . $MINOR_VERSION . '.pc');
 
     $$config{'makefile'} = 'Makefile';
@@ -116,9 +116,9 @@ sub main {
     $$config{'lib_prefix'} = '';
 
     if(defined($$config{'with_build_dir'})) {
-        for my $var ('build-dir',
-                     'botan-config',
-                     'botan-pkgconfig',
+        for my $var ('build_dir',
+                     'botan_config',
+                     'botan_pkgconfig',
                      'makefile',
                      'check_prefix',
                      'lib_prefix')
@@ -147,12 +147,12 @@ sub main {
     add_to($config, {
         'includedir'    => os_info_for($os, 'header_dir'),
 
-        'build_lib'     => File::Spec->catdir($$config{'build-dir'}, 'lib'),
-        'build_check'   => File::Spec->catdir($$config{'build-dir'}, 'checks'),
+        'build_lib'     => File::Spec->catdir($$config{'build_dir'}, 'lib'),
+        'build_check'   => File::Spec->catdir($$config{'build_dir'}, 'checks'),
         'build_include' =>
-            File::Spec->catdir($$config{'build-dir'}, 'include'),
+            File::Spec->catdir($$config{'build_dir'}, 'include'),
         'build_include_botan' =>
-            File::Spec->catdir($$config{'build-dir'}, 'include', 'botan'),
+            File::Spec->catdir($$config{'build_dir'}, 'include', 'botan'),
 
         'mp_bits'       => find_mp_bits(sort keys %{$$config{'modules'}}),
         'mod_libs'      =>
@@ -170,7 +170,7 @@ sub main {
 
     load_modules($config);
 
-    my @dirs = mkdirs($$config{'build-dir'},
+    my @dirs = mkdirs($$config{'build_dir'},
                       $$config{'build_include'},
                       $$config{'build_include_botan'},
                       $$config{'build_lib'},
@@ -183,15 +183,15 @@ sub main {
     determine_config($config);
 
     process_template(File::Spec->catfile($$config{'config-dir'}, 'buildh.in'),
-                     File::Spec->catfile($$config{'build-dir'}, 'build.h'),
+                     File::Spec->catfile($$config{'build_dir'}, 'build.h'),
                      $config);
 
     process_template(File::Spec->catfile(
                          $$config{'config-dir'}, 'botan.doxy.in'),
-                     File::Spec->catfile($$config{'doc-dir'}, 'botan.doxy'),
+                     File::Spec->catfile($$config{'doc_src_dir'}, 'botan.doxy'),
                      $config);
 
-    $$config{'includes'}{'build.h'} = $$config{'build-dir'};
+    $$config{'includes'}{'build.h'} = $$config{'build_dir'};
 
     generate_makefile($config);
 
@@ -1246,7 +1246,7 @@ sub load_modules {
         push @mod_names, $mod;
     }
 
-    $$config{'mod-list'} = join("\n", @mod_names);
+    $$config{'mod_list'} = join("\n", @mod_names);
 
     my $unaligned_ok = 0;
 
@@ -1468,19 +1468,10 @@ sub process_template {
             next;
         }
 
-        $contents =~ s/@\{var:$name\}/$val/g;
-
-        unless($val eq 'no' or $val eq 'false') {
-            $contents =~ s/\@\{if:$name (.*)\}/$1/g;
-            $contents =~ s/\@\{if:$name (.*) (.*)\}/$1/g;
-        } else {
-            $contents =~ s/\@\{if:$name (.*)\}//g;
-            $contents =~ s/\@\{if:$name (.*) (.*)\}/$2/g;
-        }
+        $contents =~ s/\%\{$name\}/$val/g;
     }
 
-    if($contents =~ /@\{var:([a-z_]*)\}/ or
-       $contents =~ /@\{if:(.*) /) {
+    if($contents =~ /\%\{([a-z_]*)\}/) {
 
         sub summarize {
             my ($n, $s) = @_;
@@ -1726,7 +1717,9 @@ sub get_os_info {
     $info{'name'} = $name;
 
     while($_ = &$reader()) {
-        match_any_of($_, \%info, 'quoted', 'realname', 'ar_command');
+        match_any_of($_, \%info,
+                     'quoted', 'realname', 'ar_command',
+                     'install_cmd_data', 'install_cmd_exec');
 
         match_any_of($_, \%info, 'unquoted',
                      'os_type',
@@ -1736,9 +1729,7 @@ sub get_os_info {
                      'install_root',
                      'header_dir',
                      'lib_dir', 'doc_dir',
-                     'ar_needs_ranlib',
-                     'install_cmd_data',
-                     'install_cmd_exec');
+                     'ar_needs_ranlib');
 
         read_list($_, $reader, 'aliases', list_push(\@{$info{'aliases'}}));
 
@@ -1823,7 +1814,7 @@ sub write_pkg_config {
 
     $$config{'link_to'} = libs('-l', '', 'm', @{$$config{'mod_libs'}});
 
-    my $botan_config = $$config{'botan-config'};
+    my $botan_config = $$config{'botan_config'};
 
     process_template(
        File::Spec->catfile($$config{'config-dir'}, 'botan-config.in'),
@@ -1832,7 +1823,7 @@ sub write_pkg_config {
 
     process_template(
        File::Spec->catfile($$config{'config-dir'}, 'botan.pc.in'),
-                           $$config{'botan-pkgconfig'}, $config);
+                           $$config{'botan_pkgconfig'}, $config);
 
     delete $$config{'link_to'};
 }
@@ -2029,10 +2020,10 @@ sub generate_makefile {
    my ($config) = @_;
 
    my $is_in_doc_dir =
-       sub { -e File::Spec->catfile($$config{'doc-dir'}, $_[0]) };
+       sub { -e File::Spec->catfile($$config{'doc_src_dir'}, $_[0]) };
 
    my $docs = file_list(undef, undef, undef,
-                        map_to($$config{'doc-dir'},
+                        map_to($$config{'doc_src_dir'},
                                grep { &$is_in_doc_dir($_); } @DOCS));
 
    $docs .= File::Spec->catfile($$config{'base-dir'}, 'readme.txt');
diff --git a/doc/log.txt b/doc/log.txt
index e6ca6bdcd..e41262747 100644
--- a/doc/log.txt
+++ b/doc/log.txt
@@ -1,12 +1,13 @@
 
 * 1.8.3-pre, 2009-??-??
- - Improve handling of low-entropy situations during PRNG seeding
- - Use an input insensitive implementation of same_mem instead of memcmp
- - Change random device polling to prefer /dev/urandom over /dev/random
  - Add the Skein-512 SHA-3 candidate hash function
  - Add the XTS block cipher mode from IEEE P1619
- - Provide a default value for AutoSeeded_RNG::reseed
+ - Improve handling of low-entropy situations during PRNG seeding
+ - Change random device polling to prefer /dev/urandom over /dev/random
+ - Use an input insensitive implementation of same_mem instead of memcmp
  - Correct DataSource::discard_next to return the number of discarded bytes
+ - Various changes to the makefile template language for easier parsing
+ - Provide a default value for AutoSeeded_RNG::reseed
  - Fix Gentoo bug 272242
 
 * 1.8.2, 2009-04-07
diff --git a/src/build-data/botan-config.in b/src/build-data/botan-config.in
index 28b494254..f3fa3db94 100644
--- a/src/build-data/botan-config.in
+++ b/src/build-data/botan-config.in
@@ -2,15 +2,15 @@
 
 # For normal builds:
 guess_prefix=`dirname \`dirname $0\``
-includedir=@{var:includedir}
-libdir=@{var:libdir}
+includedir=%{includedir}
+libdir=%{libdir}
 
 #  For workspace builds:
 #guess_prefix=`dirname $0`
 #includedir=build/include
 #libdir=
 
-install_prefix=@{var:prefix}
+install_prefix=%{prefix}
 prefix=
 
 usage()
@@ -42,7 +42,7 @@ while test $# -gt 0; do
         echo $prefix
         ;;
     --version)
-        echo @{var:version}
+        echo %{version}
         exit 0
         ;;
     --cflags)
@@ -54,9 +54,9 @@ while test $# -gt 0; do
     --libs)
         if [ $prefix != "/usr" -a $prefix != "/usr/local" ]
         then
-           echo -L$prefix/$libdir -lbotan @{var:link_to}
+           echo -L$prefix/$libdir -lbotan %{link_to}
         else
-           echo -lbotan @{var:link_to}
+           echo -lbotan %{link_to}
         fi
         ;;
     *)
diff --git a/src/build-data/botan.doxy.in b/src/build-data/botan.doxy.in
index 82796a272..2da5e1244 100644
--- a/src/build-data/botan.doxy.in
+++ b/src/build-data/botan.doxy.in
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = Botan
-PROJECT_NUMBER         = @{var:version}
+PROJECT_NUMBER         = %{version}
 OUTPUT_DIRECTORY       = doc/doxygen
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
diff --git a/src/build-data/botan.pc.in b/src/build-data/botan.pc.in
index 6fbf43862..70ed65d70 100644
--- a/src/build-data/botan.pc.in
+++ b/src/build-data/botan.pc.in
@@ -1,12 +1,12 @@
-prefix=@{var:prefix}
+prefix=%{prefix}
 exec_prefix=${prefix}
-libdir=${prefix}/@{var:libdir}
+libdir=${prefix}/%{libdir}
 includedir=${prefix}/include
 
 Name: Botan
 Description: Multi-platform C++ crypto library
-Version: @{var:version}
+Version: %{version}
 
 Libs: -L${libdir} -lbotan
-Libs.private: @{var:link_to}
+Libs.private: %{link_to}
 Cflags: -I${includedir}
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index d49f976fb..496826d91 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -2,14 +2,14 @@
 #ifndef BOTAN_BUILD_CONFIG_H__
 #define BOTAN_BUILD_CONFIG_H__
 
-/* This file was automatically generated @{var:timestamp} UTC */
+/* This file was automatically generated %{timestamp} UTC */
 
-#define BOTAN_VERSION_MAJOR @{var:version_major}
-#define BOTAN_VERSION_MINOR @{var:version_minor}
-#define BOTAN_VERSION_PATCH @{var:version_patch}
+#define BOTAN_VERSION_MAJOR %{version_major}
+#define BOTAN_VERSION_MINOR %{version_minor}
+#define BOTAN_VERSION_PATCH %{version_patch}
 
 #ifndef BOTAN_DLL
-  #define BOTAN_DLL @{var:dll_export_flags}
+  #define BOTAN_DLL %{dll_export_flags}
 #endif
 
 /* Chunk sizes */
@@ -17,7 +17,7 @@
 #define BOTAN_MEM_POOL_CHUNK_SIZE 64*1024
 
 /* BigInt toggles */
-#define BOTAN_MP_WORD_BITS @{var:mp_bits}
+#define BOTAN_MP_WORD_BITS %{mp_bits}
 #define BOTAN_KARAT_MUL_THRESHOLD 32
 #define BOTAN_KARAT_SQR_THRESHOLD 32
 #define BOTAN_PRIVATE_KEY_OP_BLINDING_BITS 64
@@ -38,21 +38,21 @@
 
 /* Target identification and feature test macros */
 
-@{var:defines}
-@{var:local_config}
+%{defines}
+%{local_config}
 
 /*
-@{var:user}@@{var:hostname} ran '@{var:command-line}'
+%{user}@%{hostname} ran '%{command_line}'
 
 Target
 -------
-Compiler: @{var:cc} @{var:lib_opt} @{var:mach_opt}
-Arch: @{var:submodel}/@{var:arch}
-OS: @{var:os}
+Compiler: %{cc} %{lib_opt} %{mach_opt}
+Arch: %{submodel}/%{arch}
+OS: %{os}
 
 Modules
 -------
-@{var:mod-list}
+%{mod_list}
 */
 
 #endif
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index b730beab1..b1e651551 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -1,40 +1,40 @@
 ##################################################
 # Compiler Options                               #
 ##################################################
-CXX           = @{var:cc}
-LIB_OPT       = @{var:lib_opt}
-CHECK_OPT     = @{var:check_opt}
-MACH_OPT      = @{var:mach_opt}
-LANG_FLAGS    = @{var:lang_flags}
-WARN_FLAGS    = @{var:warn_flags}
-LINK_TO       = @{var:link_to}
+CXX           = %{cc}
+LIB_OPT       = %{lib_opt}
+CHECK_OPT     = %{check_opt}
+MACH_OPT      = %{mach_opt}
+LANG_FLAGS    = %{lang_flags}
+WARN_FLAGS    = %{warn_flags}
+LINK_TO       = %{link_to}
 
 ##################################################
 # Version Numbers                                #
 ##################################################
-MAJOR         = @{var:version_major}
-MINOR         = @{var:version_minor}
-PATCH         = @{var:version_patch}
+MAJOR         = %{version_major}
+MINOR         = %{version_minor}
+PATCH         = %{version_patch}
 
 VERSION       = $(MAJOR).$(MINOR).$(PATCH)
 
 ##################################################
 # Installation Settings                          #
 ##################################################
-DESTDIR       = @{var:prefix}
+DESTDIR       = %{prefix}
 
-LIBDIR        = $(DESTDIR)\@{var:libdir}
-HEADERDIR     = $(DESTDIR)\@{var:includedir}\botan
-DOCDIR        = $(DESTDIR)\@{var:docdir}\Botan-$(VERSION)
+LIBDIR        = $(DESTDIR)\%{libdir}
+HEADERDIR     = $(DESTDIR)\%{includedir}\botan
+DOCDIR        = $(DESTDIR)\%{docdir}\Botan-$(VERSION)
 
 ##################################################
 # Aliases for Common Programs                    #
 ##################################################
-AR            = @{var:ar_command}
+AR            = %{ar_command}
 CD            = @cd
 ECHO          = @echo
-INSTALL       = @{var:install_cmd_exec}
-INSTALL_CMD   = @{var:install_cmd_exec}
+INSTALL       = %{install_cmd_exec}
+INSTALL_CMD   = %{install_cmd_exec}
 MKDIR         = @md
 MKDIR_INSTALL = @md
 RM            = @del /Q
@@ -45,13 +45,13 @@ RMDIR         = @rmdir
 ##################################################
 CHECK         = check
 
-DOCS          = @{var:doc_files}
+DOCS          = %{doc_files}
 
-HEADERS       = @{var:include_files}
+HEADERS       = %{include_files}
 
-LIBOBJS       = @{var:lib_objs}
+LIBOBJS       = %{lib_objs}
 
-CHECKOBJS     = @{var:check_objs}
+CHECKOBJS     = %{check_objs}
 
 LIB_FLAGS     = $(LIB_OPT) $(MACH_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
 CHECK_FLAGS   = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
@@ -59,16 +59,16 @@ CHECK_FLAGS   = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
 LIBRARIES     = $(STATIC_LIB)
 
 LIBNAME       = libbotan
-STATIC_LIB    = $(LIBNAME).@{var:static_suffix}
+STATIC_LIB    = $(LIBNAME).%{static_suffix}
 
 all: $(LIBRARIES)
 
 ##################################################
 # Build Commands                                 #
 ##################################################
-@{var:lib_build_cmds}
+%{lib_build_cmds}
 
-@{var:check_build_cmds}
+%{check_build_cmds}
 
 ##################################################
 # Link Commands                                  #
@@ -93,15 +93,15 @@ static: $(STATIC_LIB)
 # Fake Targets                                   #
 ##################################################
 clean:
-	$(RM) @{var:build-dir}\lib\* @{var:build-dir}\checks\*
+	$(RM) %{build-dir}\lib\* %{build-dir}\checks\*
 	$(RM) $(LIBRARIES) $(CHECK)
 
 distclean: clean
-	$(RM) @{var:build-dir}\build.h
-	$(RM) @{var:build-dir}\include\botan\*
-	$(RMDIR) @{var:build-dir}\include\botan @{var:build-dir}\include
-	$(RMDIR) @{var:build-dir}\lib @{var:build-dir}\checks
-	$(RMDIR) @{var:build-dir}
+	$(RM) %{build-dir}\build.h
+	$(RM) %{build-dir}\include\botan\*
+	$(RMDIR) %{build-dir}\include\botan %{build-dir}\include
+	$(RMDIR) %{build-dir}\lib %{build-dir}\checks
+	$(RMDIR) %{build-dir}
 	$(RM) Makefile
 
 ##################################################
diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in
index 4025eed29..95859d16d 100644
--- a/src/build-data/makefile/unix.in
+++ b/src/build-data/makefile/unix.in
@@ -1,67 +1,67 @@
 ##################################################
 # Compiler Options                               #
 ##################################################
-CXX           = @{var:cc}
-LIB_OPT       = @{var:lib_opt}
-CHECK_OPT     = @{var:check_opt}
-MACH_OPT      = @{var:mach_opt}
-LANG_FLAGS    = @{var:lang_flags}
-WARN_FLAGS    = @{var:warn_flags}
-LINK_TO       = @{var:link_to}
+CXX           = %{cc}
+LIB_OPT       = %{lib_opt}
+CHECK_OPT     = %{check_opt}
+MACH_OPT      = %{mach_opt}
+LANG_FLAGS    = %{lang_flags}
+WARN_FLAGS    = %{warn_flags}
+LINK_TO       = %{link_to}
 
 ##################################################
 # Version Numbers                                #
 ##################################################
-VERSION       = @{var:version}
+VERSION       = %{version}
 
 ##################################################
 # Installation Settings                          #
 ##################################################
-DESTDIR       = @{var:prefix}
+DESTDIR       = %{prefix}
 
 BINDIR        = $(DESTDIR)/bin
-LIBDIR        = $(DESTDIR)/@{var:libdir}
-HEADERDIR     = $(DESTDIR)/@{var:includedir}/botan
-DOCDIR        = $(DESTDIR)/@{var:docdir}/Botan-$(VERSION)
+LIBDIR        = $(DESTDIR)/%{libdir}
+HEADERDIR     = $(DESTDIR)/%{includedir}/botan
+DOCDIR        = $(DESTDIR)/%{docdir}/Botan-$(VERSION)
 PKGCONF_DIR   = $(LIBDIR)/pkgconfig
 
-CONFIG_SCRIPT = @{var:botan-config}
-PKGCONFIG     = @{var:botan-pkgconfig}
+CONFIG_SCRIPT = %{botan_config}
+PKGCONFIG     = %{botan_pkgconfig}
 
 ##################################################
 # Aliases for Common Programs                    #
 ##################################################
-AR               = @{var:ar_command}
+AR               = %{ar_command}
 CD               = @cd
 ECHO             = @echo
-INSTALL_CMD_EXEC = @{var:install_cmd_exec}
-INSTALL_CMD_DATA = @{var:install_cmd_data}
+INSTALL_CMD_EXEC = %{install_cmd_exec}
+INSTALL_CMD_DATA = %{install_cmd_data}
 LN               = ln -fs
 MKDIR            = @mkdir
 MKDIR_INSTALL    = @umask 022; mkdir -p -m 755
-RANLIB           = @{var:ranlib_command}
+RANLIB           = %{ranlib_command}
 RM               = @rm -f
 RM_R             = @rm -rf
 
 ##################################################
 # File Lists                                     #
 ##################################################
-CHECK         = @{var:check_prefix}check
+CHECK         = %{check_prefix}check
 
-DOCS          = @{var:doc_files}
+DOCS          = %{doc_files}
 
-HEADERS       = @{var:include_files}
+HEADERS       = %{include_files}
 
-LIBOBJS       = @{var:lib_objs}
+LIBOBJS       = %{lib_objs}
 
-CHECKOBJS     = @{var:check_objs}
+CHECKOBJS     = %{check_objs}
 
 LIB_FLAGS     = $(LIB_OPT) $(MACH_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
 CHECK_FLAGS   = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
 
 LIBRARIES     = $(STATIC_LIB)
 
-LIBNAME       = @{var:lib_prefix}libbotan
+LIBNAME       = %{lib_prefix}libbotan
 STATIC_LIB    = $(LIBNAME).a
 
 all: $(LIBRARIES)
@@ -69,9 +69,9 @@ all: $(LIBRARIES)
 ##################################################
 # Build Commands                                 #
 ##################################################
-@{var:lib_build_cmds}
+%{lib_build_cmds}
 
-@{var:check_build_cmds}
+%{check_build_cmds}
 
 ##################################################
 # Link Commands                                  #
@@ -92,15 +92,15 @@ $(STATIC_LIB): $(LIBOBJS)
 static: $(STATIC_LIB)
 
 doxygen:
-	doxygen @{var:doc-dir}/botan.doxy
+	doxygen %{doc_src_dir}/botan.doxy
 
 clean:
-	$(RM_R) @{var:build-dir}/lib/* @{var:build-dir}/checks/*
+	$(RM_R) %{build-dir}/lib/* %{build-dir}/checks/*
 	$(RM) $(LIBRARIES) $(SYMLINK) $(CHECK)
 
 distclean: clean
-	$(RM_R) @{var:build-dir}
-	$(RM_R) @{var:doc-dir}/doxygen @{var:doc-dir}/botan.doxy
+	$(RM_R) %{build-dir}
+	$(RM_R) %{doc_src_dir}/doxygen %{doc_src_dir}/botan.doxy
 	$(RM) Makefile $(CONFIG_SCRIPT) $(PKGCONFIG)
 
 install: $(LIBRARIES)
diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in
index 5b1522f70..f718d1160 100644
--- a/src/build-data/makefile/unix_shr.in
+++ b/src/build-data/makefile/unix_shr.in
@@ -1,91 +1,91 @@
 ##################################################
 # Compiler Options                               #
 ##################################################
-CXX           = @{var:cc}
-LIB_OPT       = @{var:lib_opt}
-CHECK_OPT     = @{var:check_opt}
-MACH_OPT      = @{var:mach_opt}
-LANG_FLAGS    = @{var:lang_flags}
-WARN_FLAGS    = @{var:warn_flags}
-SO_OBJ_FLAGS  = @{var:shared_flags}
-SO_LINK_CMD   = @{var:so_link}
-LINK_TO       = @{var:link_to}
+CXX           = %{cc}
+LIB_OPT       = %{lib_opt}
+CHECK_OPT     = %{check_opt}
+MACH_OPT      = %{mach_opt}
+LANG_FLAGS    = %{lang_flags}
+WARN_FLAGS    = %{warn_flags}
+SO_OBJ_FLAGS  = %{shared_flags}
+SO_LINK_CMD   = %{so_link}
+LINK_TO       = %{link_to}
 
 ##################################################
 # Version Numbers                                #
 ##################################################
-VERSION       = @{var:version}
-SO_VERSION    = @{var:so_version}
+VERSION       = %{version}
+SO_VERSION    = %{so_version}
 
 ##################################################
 # Installation Settings                          #
 ##################################################
-DESTDIR       = @{var:prefix}
+DESTDIR       = %{prefix}
 
 BINDIR        = $(DESTDIR)/bin
-LIBDIR        = $(DESTDIR)/@{var:libdir}
-HEADERDIR     = $(DESTDIR)/@{var:includedir}/botan
-DOCDIR        = $(DESTDIR)/@{var:docdir}/Botan-$(VERSION)
+LIBDIR        = $(DESTDIR)/%{libdir}
+HEADERDIR     = $(DESTDIR)/%{includedir}/botan
+DOCDIR        = $(DESTDIR)/%{docdir}/Botan-$(VERSION)
 PKGCONF_DIR   = $(LIBDIR)/pkgconfig
 
-CONFIG_SCRIPT = @{var:botan-config}
-PKGCONFIG     = @{var:botan-pkgconfig}
+CONFIG_SCRIPT = %{botan_config}
+PKGCONFIG     = %{botan_pkgconfig}
 
 ##################################################
 # Aliases for Common Programs                    #
 ##################################################
-AR               = @{var:ar_command}
+AR               = %{ar_command}
 CD               = @cd
 ECHO             = @echo
-INSTALL_CMD_EXEC = @{var:install_cmd_exec}
-INSTALL_CMD_DATA = @{var:install_cmd_data}
+INSTALL_CMD_EXEC = %{install_cmd_exec}
+INSTALL_CMD_DATA = %{install_cmd_data}
 LN               = ln -fs
 MKDIR            = @mkdir
 MKDIR_INSTALL    = @umask 022; mkdir -p -m 755
-RANLIB           = @{var:ranlib_command}
+RANLIB           = %{ranlib_command}
 RM               = @rm -f
 RM_R             = @rm -rf
 
 ##################################################
 # File Lists                                     #
 ##################################################
-CHECK         = @{var:check_prefix}check
+CHECK         = %{check_prefix}check
 
-DOCS          = @{var:doc_files}
+DOCS          = %{doc_files}
 
-HEADERS       = @{var:include_files}
+HEADERS       = %{include_files}
 
-LIBOBJS       = @{var:lib_objs}
+LIBOBJS       = %{lib_objs}
 
-CHECKOBJS     = @{var:check_objs}
+CHECKOBJS     = %{check_objs}
 
 LIB_FLAGS     = $(LIB_OPT) $(MACH_OPT) $(LANG_FLAGS) $(WARN_FLAGS) $(SO_OBJ_FLAGS)
 CHECK_FLAGS   = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
 
 LIBRARIES     = $(STATIC_LIB) $(SHARED_LIB)
 
-LIBNAME       = @{var:lib_prefix}libbotan
+LIBNAME       = %{lib_prefix}libbotan
 STATIC_LIB    = $(LIBNAME).a
 
-SHARED_LIB    = $(LIBNAME)-$(SO_VERSION).@{var:so_suffix}
-SONAME        = $(LIBNAME)-$(SO_VERSION).@{var:so_suffix}
+SHARED_LIB    = $(LIBNAME)-$(SO_VERSION).%{so_suffix}
+SONAME        = $(LIBNAME)-$(SO_VERSION).%{so_suffix}
 
-SYMLINK       = libbotan.@{var:so_suffix}
+SYMLINK       = libbotan.%{so_suffix}
 
 all: $(LIBRARIES)
 
 ##################################################
 # Build Commands                                 #
 ##################################################
-@{var:lib_build_cmds}
+%{lib_build_cmds}
 
-@{var:check_build_cmds}
+%{check_build_cmds}
 
 ##################################################
 # Link Commands                                  #
 ##################################################
 $(CHECK): $(LIBRARIES) $(CHECKOBJS)
-	$(CXX) $(LDFLAGS) $(CHECKOBJS) -o $(CHECK) -L. -lbotan-@{var:so_version} $(LINK_TO)
+	$(CXX) $(LDFLAGS) $(CHECKOBJS) -o $(CHECK) -L. -lbotan-%{so_version} $(LINK_TO)
 
 $(STATIC_LIB): $(LIBOBJS)
 	$(RM) $(STATIC_LIB)
@@ -106,15 +106,15 @@ static: $(STATIC_LIB)
 shared: $(SHARED_LIB)
 
 doxygen:
-	doxygen @{var:doc-dir}/botan.doxy
+	doxygen %{doc_src_dir}/botan.doxy
 
 clean:
-	$(RM_R) @{var:build-dir}/lib/* @{var:build-dir}/checks/*
+	$(RM_R) %{build_dir}/lib/* %{build_dir}/checks/*
 	$(RM) $(LIBRARIES) $(SYMLINK) $(CHECK)
 
 distclean: clean
-	$(RM_R) @{var:build-dir}
-	$(RM_R) @{var:doc-dir}/doxygen @{var:doc-dir}/botan.doxy
+	$(RM_R) %{build_dir}
+	$(RM_R) %{doc_src_dir}/doxygen %{doc_src_dir}/botan.doxy
 	$(RM) Makefile $(CONFIG_SCRIPT) $(PKGCONFIG)
 
 install: $(LIBRARIES)
diff --git a/src/build-data/os/darwin b/src/build-data/os/darwin
index aa28dc59b..298621216 100644
--- a/src/build-data/os/darwin
+++ b/src/build-data/os/darwin
@@ -14,13 +14,6 @@ doc_dir doc
 all
 </supports_shared>
 
-<arch>
-ia32
-amd64
-ppc
-ppc64 # g5!
-</arch>
-
 <aliases>
 macosx
 </aliases>
diff --git a/src/build-data/os/defaults b/src/build-data/os/defaults
index 88fd82252..5648643a9 100644
--- a/src/build-data/os/defaults
+++ b/src/build-data/os/defaults
@@ -15,5 +15,5 @@ header_dir include
 lib_dir lib
 doc_dir share/doc
 
-install_cmd_data install -m 644
-install_cmd_exec install -m 755
+install_cmd_data "install -m 644"
+install_cmd_exec "install -m 755"
diff --git a/src/build-data/os/mingw b/src/build-data/os/mingw
index 8c41fbc21..eb25017fc 100644
--- a/src/build-data/os/mingw
+++ b/src/build-data/os/mingw
@@ -13,8 +13,8 @@ header_dir include
 lib_dir lib
 doc_dir share/doc
 
-install_cmd_data install -m 644
-install_cmd_exec install -m 755
+install_cmd_data "install -m 644"
+install_cmd_exec "install -m 755"
 
 <aliases>
 msys
diff --git a/src/build-data/os/windows b/src/build-data/os/windows
index 823c60d6c..a04d609b8 100644
--- a/src/build-data/os/windows
+++ b/src/build-data/os/windows
@@ -9,8 +9,8 @@ static_suffix lib
 install_root c:\Botan
 doc_dir docs
 
-install_cmd_data copy
-install_cmd_exec copy
+install_cmd_data "copy"
+install_cmd_exec "copy"
 
 <target_features>
 win32_virtual_lock
diff --git a/src/mutex/info.txt b/src/mutex/info.txt
new file mode 100644
index 000000000..ff79bf753
--- /dev/null
+++ b/src/mutex/info.txt
@@ -0,0 +1,9 @@
+realname "Mutex Wrappers"
+
+define MUTEX_WRAPPERS
+
+load_on auto
+
+<add>
+mutex.h
+</add>