status-im/miniupnp
2
0
Fork 0
mirror of https://github.com/status-im/miniupnp.git synced 2025-02-10 05:03:50 +00:00
Code Issues Projects Releases Wiki Activity

miniupnpd: Makefile: remove obsolete parts of libiptc detection

Browse Source 
If for some inexplicable reason there is no pkg-config in the system,
we are able to detect libiptc 1.4.3+ in configure via testing for
xtables.h, so the Gentoo-specific hack seems obsolete.
This commit is contained in:
Ivan Shapovalov 2024-09-03 14:08:53 +02:00 committed by Thomas Bernard
parent 1ee9301092
commit a1b4085de6
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
miniupnpd/Makefile.linux
View File

@ -72,20 +72,6 @@ NETFILTER_SCRIPTS = $(addprefix $(SRCDIR)/netfilter/, \
ip6tables_init.sh ip6tables_removeall.sh \ ip6tables_init.sh ip6tables_removeall.sh \
miniupnpd_functions.sh) miniupnpd_functions.sh)
ifneq ($(IPTABLES_PCFILE_FOUND),1)
ifeq "$(wildcard /etc/gentoo-release )" ""
LDLIBS ?= -liptc
else # gentoo
# the following is better, at least on gentoo with iptables 1.4.6
# see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1618
# and http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=2183
LDLIBS ?= -lip4tc
CPPFLAGS := -DIPTABLES_143 $(CPPFLAGS)
endif
endif # ifneq ($(IPTABLES_PCFILE_FOUND),1)
#LDLIBS += -lnfnetlink #LDLIBS += -lnfnetlink
# OpenWrt packager disables https server for IGD v2 and hardcodes libuuid support # OpenWrt packager disables https server for IGD v2 and hardcodes libuuid support

3
miniupnpd/configure vendored
View File

@ -609,10 +609,9 @@ case $FW in
echo "#define USE_IPTABLES 1" >> ${CONFIGFILE} echo "#define USE_IPTABLES 1" >> ${CONFIGFILE}
if [ "$PKG_CONFIG" ] ; then if [ "$PKG_CONFIG" ] ; then
if pkg_detect --atleast-version=1.4.3 libiptc; then if pkg_detect --atleast-version=1.4.3 libiptc; then
echo "IPTABLES_PCFILE_FOUND = 1" >> ${CONFIG_MK}
IPTABLES_143=1 IPTABLES_143=1
elif pkg_detect libiptc; then elif pkg_detect libiptc; then
echo "IPTABLES_PCFILE_FOUND = 1" >> ${CONFIG_MK} :
else else
echo "Warning: no libiptc pkg-config found" echo "Warning: no libiptc pkg-config found"
fi fi