From 783ebbc0ca45fe8952f5fd9be36b4480b21e400c Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fabrice.fontaine@orange.com>
Date: Fri, 9 Mar 2012 16:45:48 +0100
Subject: [PATCH] Optimisation of --disable-webserver

Do not compile miniserver.c if --disable-webserver is used.
(cherry picked from commit 72eecacf560de1215c2a79779c5ac7cd04828d0d)
---
 ChangeLog                               | 6 ++++++
 upnp/src/api/upnpapi.c                  | 2 +-
 upnp/src/genlib/miniserver/miniserver.c | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0605ac0..bc444e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -318,6 +318,12 @@ Version 1.8.0
 Version 1.6.16
 *******************************************************************************
 
+2012-03-09 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
+
+	Optimisation of --disable-webserver
+
+	Do not compile miniserver.c if --disable-webserver is used.
+
 2012-03-09 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
 
 	Adding configure options
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index b1722d0..9051ebf 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -649,8 +649,8 @@ int UpnpFinish(void)
 		UpnpUnRegisterClient(client_handle);
 #endif
 	TimerThreadShutdown(&gTimerThread);
-	StopMiniServer();
 #if EXCLUDE_WEB_SERVER == 0
+	StopMiniServer();
 	web_server_destroy();
 #endif
 	ThreadPoolShutdown(&gMiniServerThreadPool);
diff --git a/upnp/src/genlib/miniserver/miniserver.c b/upnp/src/genlib/miniserver/miniserver.c
index 76f327a..d7b1f63 100644
--- a/upnp/src/genlib/miniserver/miniserver.c
+++ b/upnp/src/genlib/miniserver/miniserver.c
@@ -32,6 +32,8 @@
 
 #include "config.h"
 
+#if EXCLUDE_MINISERVER == 0
+
 /*!
  * \file
  *
@@ -970,3 +972,4 @@ int StopMiniServer()
 
 	return 0;
 }
+#endif /* EXCLUDE_MINISERVER */