From 67d9190279a1961769d2de2808667b44d04d8868 Mon Sep 17 00:00:00 2001 From: Argus Date: Wed, 25 Jan 2017 15:18:04 +0000 Subject: [PATCH] mythzmserver: fix building the server standalone We no longer require mythconfig.h to be present. Fixes #12966 Signed-off-by: Paul Harrison (cherry picked from commit 11ad81e474686172b75b9824b8b391ced35a410b) --- mythplugins/mythzoneminder/mythzmserver/README | 3 --- mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 2 -- 2 files changed, 5 deletions(-) diff --git a/mythplugins/mythzoneminder/mythzmserver/README b/mythplugins/mythzoneminder/mythzmserver/README index 84cbc1fff76..24dd378db6c 100644 --- a/mythplugins/mythzoneminder/mythzmserver/README +++ b/mythplugins/mythzoneminder/mythzmserver/README @@ -17,9 +17,6 @@ The server is designed to be as lean as possible and doesn't require Myth or QT be installed in order to compile or run. It does require the mysql client library but that must already be installed for ZM to run. -It's best to run ./configure in the mythplugins directory before copying the source to -the server machine to make sure the config.h is created properly. - Copy the mythzmserver directory to the machine where you want to run the server. run :- 'make -f Makefile.standalone' diff --git a/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp index 5511df2c101..9405d79bd73 100644 --- a/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp +++ b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp @@ -40,8 +40,6 @@ # endif // !CONFIG_CYGWIN #endif -#include "mythtv/mythconfig.h" - #if CONFIG_DARWIN #define MSG_NOSIGNAL 0 // Apple also has SO_NOSIGPIPE? #endif