67 lines
2.2 KiB
Diff
67 lines
2.2 KiB
Diff
|
From 16bcaaee1c28b972e0cc6a542f511af44306ce6c 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:43:21 +0200
|
||
|
|
Subject: [PATCH] Use pkg-config for libupnpp
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Use pkg-config for libupnpp to fix build issues when cross-compiling and
|
||
|
|
building upmpdcli statically.
|
||
|
|
|
||
|
|
Building upmpdcli aborts because of an unsafe header inclusion of
|
||
|
|
`/usr/include/libupnpp`. Using `{prefix}` to get the header path is wrong for
|
||
|
|
cross-compilation. Instead of hard-coding the flags for libupnpp use pkg-config
|
||
|
|
to get the correct ones.
|
||
|
|
|
||
|
|
Upstream-status: https://github.com/medoc92/upmpdcli/pull/49
|
||
|
|
|
||
|
|
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||
|
|
---
|
||
|
|
Makefile.am | 2 +-
|
||
|
|
configure.ac | 8 ++++----
|
||
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile.am b/Makefile.am
|
||
|
|
index d0c10a4..5c83aa1 100644
|
||
|
|
--- a/Makefile.am
|
||
|
|
+++ b/Makefile.am
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
AM_CPPFLAGS = -DDEBUG -g -Wall \
|
||
|
|
- -I${prefix}/include/libupnpp \
|
||
|
|
+ $(upnpp_CFLAGS) \
|
||
|
|
-I$(top_srcdir)/src \
|
||
|
|
-DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\"
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 108dcce..a165b5d 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -35,10 +35,10 @@ dnl AC_CHECK_LIB([upnp], [UpnpInit], [], AC_MSG_ERROR([libupnp not found]))
|
||
|
|
dnl AC_CHECK_LIB([curl], [curl_easy_init], [],AC_MSG_ERROR([libcurl not found]))
|
||
|
|
dnl AC_CHECK_LIB([expat], [XML_ParserCreate], [],AC_MSG_ERROR([libexpat not found]))
|
||
|
|
|
||
|
|
-AC_CHECK_LIB([upnpp], [getsyshwaddr], [], [AC_MSG_ERROR([libupnpp])])
|
||
|
|
+PKG_CHECK_MODULES([upnpp], [libupnpp], [], [AC_MSG_ERROR([libupnpp])])
|
||
|
|
AC_CHECK_LIB([mpdclient], [mpd_connection_new], [],
|
||
|
|
AC_MSG_ERROR([libmpdclient not found]))
|
||
|
|
-SCCTL_LIBS=$LIBS
|
||
|
|
+SCCTL_LIBS="$LIBS $upnpp_LIBS"
|
||
|
|
|
||
|
|
AC_CHECK_LIB([microhttpd], [MHD_queue_response], [], [])
|
||
|
|
|
||
|
|
@@ -56,8 +56,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(
|
||
|
|
[AC_MSG_ERROR([libjsoncpp not found.])])
|
||
|
|
AC_LANG_POP
|
||
|
|
|
||
|
|
-UPMPDCLI_LIBS=$LIBS
|
||
|
|
-echo "UPMPDCLI_LIBS=$LIBS"
|
||
|
|
+UPMPDCLI_LIBS="$LIBS $upnpp_LIBS"
|
||
|
|
+echo "UPMPDCLI_LIBS=$UPMPDCLI_LIBS"
|
||
|
|
|
||
|
|
LIBS=""
|
||
|
|
|
||
|
|
--
|
||
|
|
2.9.3
|
||
|
|
|