From 366e726821abce305ef2887effea443a24043511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
Date: Wed, 14 Sep 2016 11:46:22 +0200
Subject: [PATCH] Fix including header file log.h from libupnpp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The "log.{h,hxx}" header files are included from libupnpp.

As we are using the pkg-config file of libupnpp to get the header include path,
instead of the hardcoded `{prefix}/include/libupnpp` these files are not found.

Upstream-status: https://github.com/medoc92/upmpdcli/issues/46

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
---
 src/conftree.cpp                           | 2 +-
 src/execmd.cpp                             | 4 ++--
 src/mediaserver/cdplugins/cmdtalk.cpp      | 2 +-
 src/mediaserver/cdplugins/plgwithslave.cxx | 2 +-
 src/netcon.cpp                             | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/conftree.cpp b/src/conftree.cpp
index 12eb4b5..8a79812 100644
--- a/src/conftree.cpp
+++ b/src/conftree.cpp
@@ -42,7 +42,7 @@
 
 #include "pathut.h"
 #include "smallut.h"
-#include "log.h"
+#include "libupnpp/log.h"
 
 using namespace std;
 
diff --git a/src/execmd.cpp b/src/execmd.cpp
index 0db9032..9bf2971 100644
--- a/src/execmd.cpp
+++ b/src/execmd.cpp
@@ -53,7 +53,7 @@
 #include "netcon.h"
 #include "closefrom.h"
 #include "smallut.h"
-#include "log.h"
+#include "libupnpp/log.h"
 
 using namespace std;
 
@@ -1135,7 +1135,7 @@ void ReExec::reexec()
 #include <sstream>
 #include <vector>
 
-#include "log.h"
+#include "libupnpp/log.h"
 
 #include "execmd.h"
 #ifdef BUILDING_RECOLL
diff --git a/src/mediaserver/cdplugins/cmdtalk.cpp b/src/mediaserver/cdplugins/cmdtalk.cpp
index eddd68f..e19f7ea 100644
--- a/src/mediaserver/cdplugins/cmdtalk.cpp
+++ b/src/mediaserver/cdplugins/cmdtalk.cpp
@@ -24,7 +24,7 @@
 
 #include "smallut.h"
 #include "execmd.h"
-#include "log.h"
+#include "libupnpp/log.h"
 
 using namespace std;
 
diff --git a/src/mediaserver/cdplugins/plgwithslave.cxx b/src/mediaserver/cdplugins/plgwithslave.cxx
index 545805c..1ad44ef 100644
--- a/src/mediaserver/cdplugins/plgwithslave.cxx
+++ b/src/mediaserver/cdplugins/plgwithslave.cxx
@@ -35,7 +35,7 @@
 #include "cmdtalk.h"
 #include "pathut.h"
 #include "smallut.h"
-#include "log.hxx"
+#include "libupnpp/log.hxx"
 #include "main.hxx"
 #include "conftree.h"
 
diff --git a/src/netcon.cpp b/src/netcon.cpp
index 5674cf3..193d1cd 100644
--- a/src/netcon.cpp
+++ b/src/netcon.cpp
@@ -47,7 +47,7 @@
 
 #include <map>
 
-#include "log.h"
+#include "libupnpp/log.h"
 
 using namespace std;
 
@@ -1031,7 +1031,7 @@ NetconServLis::checkperms(void *cl, int)
 #include <signal.h>
 #include <string.h>
 
-#include "log.h"
+#include "libupnpp/log.h"
 
 #include "netcon.h"
 
-- 
2.9.3