Replaced config-win32.h with win/config.h.in

The original config-win32.h - a static header file - has been superceded by both
"domake-win" script and the new Python-based buildsystem. Transformed it into a
template file, win/config.h.in, which obtains the most commonly used build
parameters from win/settings.in.

Added support code to win/config.py and win/wb.py to preprocess win/config.h.in
and copy it to config.h, from where source and header files can find it.

Removed all references to config-win32.h. Also removed obsolete
PACKAGE_BUGREPORT and USE_PTHREAD variables from the win/config.h.in file.

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <davids@redhat.com>

1 files changed, 19 insertions, 18 deletions

diff --git a/win/config.py b/win/config.py
index 2c57004..b820510 100644
--- a/win/config.py
+++ b/win/config.py
@@ -1,20 +1,21 @@
-from wb import preprocess, autogen, mod_fn, home_fn, build_configure_h, build_version_m4_vars, build_autodefs, make_headers_objs, dict_def
-

-def main(config):

+from wb import preprocess, autogen, mod_fn, home_fn, build_config_h, build_configure_h, build_version_m4_vars, build_autodefs, make_headers_objs, dict_def
+
+def main(config):
+    build_config_h(config)
     build_configure_h(config, mod_fn(home_fn('configure.h')), head_comment='/* %s */\n\n' % autogen)
     build_version_m4_vars(mod_fn(mod_fn('version_m4_vars.tmp')), head_comment='/* %s */\n\n' % autogen)
-    build_autodefs(config, mod_fn('autodefs.h.in'), home_fn('autodefs.h'))

-    ho = make_headers_objs(home_fn('Makefile.am'))

-

-    preprocess(dict_def(config, [('HEADERS_OBJS', ho)]),

-               in_fn=mod_fn('msvc.mak.in'),

-               out_fn=home_fn('msvc.mak'),

-               quote_begin='@',

-               quote_end='@',

-               if_prefix='!',

-               head_comment='# %s\n\n' % autogen)

-

-# if we are run directly, and not loaded as a module

-if __name__ == "__main__":

-    from wb import config

-    main(config)

+    build_autodefs(config, mod_fn('autodefs.h.in'), home_fn('autodefs.h'))
+    ho = make_headers_objs(home_fn('Makefile.am'))
+
+    preprocess(dict_def(config, [('HEADERS_OBJS', ho)]),
+               in_fn=mod_fn('msvc.mak.in'),
+               out_fn=home_fn('msvc.mak'),
+               quote_begin='@',
+               quote_end='@',
+               if_prefix='!',
+               head_comment='# %s\n\n' % autogen)
+
+# if we are run directly, and not loaded as a module
+if __name__ == "__main__":
+    from wb import config
+    main(config)