Rebase against f9e1dbb83d850a2f7cb17079e02de139e2f8b920

This commit is contained in:
Alistair Leslie-Hughes
2018-02-23 09:33:49 +11:00
parent 84fb9656a1
commit 9d84ed42f1
42 changed files with 412 additions and 677 deletions

View File

@@ -1,7 +1,8 @@
From b252ccdcbb84f5aef2d83b1324598b93b6ac2bba Mon Sep 17 00:00:00 2001
From a2444d61bf9783943ce1d8e7e4a1eb7fe7f36e04 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
Date: Tue, 15 Sep 2015 17:44:33 -0600
Subject: [PATCH] msidb: Add stub tool for manipulating MSI databases.
Subject: [PATCH] msidb: Add stub tool for manipulating MSI
databases.
Signed-off-by: Erich E. Hoover <erich.e.hoover@wine-staging.com>
---
@@ -13,17 +14,17 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@wine-staging.com>
create mode 100644 programs/msidb/main.c
diff --git a/configure.ac b/configure.ac
index e1a20cc..6f61b42 100644
index 6e9f9c9..af61142 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3855,6 +3855,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[install])
WINE_CONFIG_PROGRAM(lodctr,,[install])
WINE_CONFIG_PROGRAM(mofcomp,,[install])
WINE_CONFIG_PROGRAM(mshta,,[install])
@@ -3866,6 +3866,7 @@ WINE_CONFIG_PROGRAM(ipconfig)
WINE_CONFIG_PROGRAM(lodctr)
WINE_CONFIG_PROGRAM(mofcomp)
WINE_CONFIG_PROGRAM(mshta)
+WINE_CONFIG_PROGRAM(msidb,,[install,installbin])
WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage])
WINE_CONFIG_PROGRAM(msinfo32,,[install])
WINE_CONFIG_PROGRAM(net,,[install])
WINE_CONFIG_PROGRAM(msiexec)
WINE_CONFIG_PROGRAM(msinfo32)
WINE_CONFIG_PROGRAM(net)
diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in
new file mode 100644
index 0000000..dae699c