Rebase against 215e2d7fed58ccd7c5e55ad536fb311608b51d26.

This commit is contained in:
Sebastian Lackner
2016-02-25 22:13:42 +01:00
parent cb4a7e6782
commit 66cad5b6ae
16 changed files with 115 additions and 314 deletions

View File

@@ -1,4 +1,4 @@
From 7128a10cb4d1febc06bac49191c36fc1561141b0 Mon Sep 17 00:00:00 2001
From 57f3079d00eb226013528e2171e19f9aa7e31282 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: msidb: Add stub tool for manipulating MSI databases.
@@ -13,16 +13,16 @@ 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 bb879b0..06a0d24 100644
index 9e0dcd9..7989ec6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3514,6 +3514,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[install,po])
@@ -3474,6 +3474,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[clean,install])
WINE_CONFIG_PROGRAM(lodctr,,[install])
WINE_CONFIG_PROGRAM(mofcomp,,[install])
WINE_CONFIG_PROGRAM(mshta,,[install])
+WINE_CONFIG_PROGRAM(msidb,,[install,installbin])
WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage])
WINE_CONFIG_PROGRAM(net,,[install,po])
WINE_CONFIG_PROGRAM(net,,[clean,install])
WINE_CONFIG_PROGRAM(netsh,,[install])
diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in
new file mode 100644
@@ -198,5 +198,5 @@ index 0000000..43cc519
+ return 0;
+}
--
2.6.1
2.7.1