diff options
author | Nils Gillmann <ng0@n0.is> | 2018-06-25 12:17:03 +0000 |
---|---|---|
committer | Nils Gillmann <ng0@n0.is> | 2018-06-25 12:17:03 +0000 |
commit | 67669ed0c7f9472cb9018579cc0e4fe83a7de1cf (patch) | |
tree | 820a5be8afa70d2d708112d66b022c43e46abac6 /configure.ac | |
parent | 99060cca6a0244ec271e63537c3d2ff1a6c161ab (diff) | |
download | gnunet-67669ed0c7f9472cb9018579cc0e4fe83a7de1cf.tar.gz gnunet-67669ed0c7f9472cb9018579cc0e4fe83a7de1cf.zip |
configure: Add initial upnpc code
Signed-off-by: Nils Gillmann <ng0@n0.is>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index fc44dcf5a..c8e316416 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -213,10 +213,19 @@ else | |||
213 | AC_MSG_WARN([warning: 'iptables' not found.]) | 213 | AC_MSG_WARN([warning: 'iptables' not found.]) |
214 | fi | 214 | fi |
215 | 215 | ||
216 | |||
217 | AC_CHECK_PROG(VAR_IFCONFIG_BINARY, ifconfig, true, false) | 216 | AC_CHECK_PROG(VAR_IFCONFIG_BINARY, ifconfig, true, false) |
218 | AC_MSG_WARN([warning: 'ifconfig' not found.]) | 217 | AC_MSG_WARN([warning: 'ifconfig' not found.]) |
219 | 218 | ||
219 | # miniupnpc / upnpc binary is a soft runtime requirement | ||
220 | AC_PATH_TARGET_TOOL(VAR_UPNPC_BINARY, upnpc, false) | ||
221 | |||
222 | if test x"$VAR_UPNPC_BINARY" != x"false" | ||
223 | then | ||
224 | AC_DEFINE_UNQUOTED([UPNPC], "$VAR_UPNPC_BINARY", [Path to upnpc binary]) | ||
225 | else | ||
226 | AC_MSG_WARN([warning: 'upnpc' binary not found.]) | ||
227 | fi | ||
228 | |||
220 | AC_CHECK_MEMBER(struct tm.tm_gmtoff, | 229 | AC_CHECK_MEMBER(struct tm.tm_gmtoff, |
221 | [AC_DEFINE(HAVE_TM_GMTOFF, 1, | 230 | [AC_DEFINE(HAVE_TM_GMTOFF, 1, |
222 | [Define if struct tm has the tm_gmtoff member.])], | 231 | [Define if struct tm has the tm_gmtoff member.])], |
@@ -1811,6 +1820,10 @@ then | |||
1811 | AC_MSG_NOTICE([WARNING: jansson library not found. json support will not be compiled.]) | 1820 | AC_MSG_NOTICE([WARNING: jansson library not found. json support will not be compiled.]) |
1812 | fi | 1821 | fi |
1813 | 1822 | ||
1823 | # | ||
1824 | # FIXME: `some modules' -> be more specific which exact modules. | ||
1825 | # | ||
1826 | |||
1814 | # warn user if iptables is not found | 1827 | # warn user if iptables is not found |
1815 | if test "$VAR_IPTABLES_BINARY" = "false" | 1828 | if test "$VAR_IPTABLES_BINARY" = "false" |
1816 | then | 1829 | then |
@@ -1823,6 +1836,12 @@ then | |||
1823 | AC_MSG_NOTICE([WARNING: ifconfig not found. some modules may not have full functionality.]) | 1836 | AC_MSG_NOTICE([WARNING: ifconfig not found. some modules may not have full functionality.]) |
1824 | fi | 1837 | fi |
1825 | 1838 | ||
1839 | # warn user if upnpc binary is not found | ||
1840 | if test "$VAR_UPNPC_BINARY" = "false" | ||
1841 | then | ||
1842 | AC_MSG_NOTICE([WARNING: upnpc binary not found. some modules may not have full functionality.]) | ||
1843 | fi | ||
1844 | |||
1826 | #gnutls | 1845 | #gnutls |
1827 | if test x$gnutls != xtrue | 1846 | if test x$gnutls != xtrue |
1828 | then | 1847 | then |