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 9d1c1de2572a3a891ff7e2c4ad3c10798f8e138e Mon Sep 17 00:00:00 2001
From 6c0b9fc4b26ba0f2efaa9fca6e12fef3c27bd2ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 11 Feb 2016 20:13:58 +0100
Subject: programs/shutdown: Add stub implementation.
@@ -12,16 +12,16 @@ Subject: programs/shutdown: Add stub implementation.
create mode 100644 programs/shutdown/main.c
diff --git a/configure.ac b/configure.ac
index 76fb87d..f6e2a2e 100644
index 9e0dcd9..d11f5e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3487,6 +3487,7 @@ WINE_CONFIG_PROGRAM(secedit,,[install])
@@ -3502,6 +3502,7 @@ WINE_CONFIG_PROGRAM(secedit,,[install])
WINE_CONFIG_PROGRAM(servicemodelreg,,[install])
WINE_CONFIG_PROGRAM(services,,[clean,install])
WINE_CONFIG_TEST(programs/services/tests)
+WINE_CONFIG_PROGRAM(shutdown,,[install])
WINE_CONFIG_PROGRAM(spoolsv,,[install])
WINE_CONFIG_PROGRAM(start,,[install,po])
WINE_CONFIG_PROGRAM(start,,[clean,install])
WINE_CONFIG_PROGRAM(svchost,,[install])
diff --git a/programs/shutdown/Makefile.in b/programs/shutdown/Makefile.in
new file mode 100644