Change the makefile template language somewhat. Previously variables

had been denoted with @{var:NAME}, this has changed to %{NAME}. This is
pretty much a wash for configure.pl but it makes it much easier to process
the templates using Python's string.Template. The logic being the 'var:'
prefix had been to support conditional statements in the templates (using
an 'if:' prefix), but this functionality was not being used and support
for it is removed from configure.pl in this revision.

For a similiar reason, rename a number of template variables with hyphens
in their name to use underscores instead. This is slightly more consistent
anyway (since many variable names had already used _ instead of -) but more
importantly makes them much easier to deal with using aforementioned Python
template code.

This should not result in any user-visible change (unless I messed up).

7 files changed, 121 insertions, 121 deletions

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)