aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac31
1 files changed, 30 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 3d68ee9b0..fd1642839 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,13 +208,42 @@ AC_PATH_TARGET_TOOL(VAR_IPTABLES_BINARY, iptables, false)
208 208
209if test x"$VAR_IPTABLES_BINARY" != x"false" 209if test x"$VAR_IPTABLES_BINARY" != x"false"
210then 210then
211 if test -x "/sbin/iptables"
212 then
213 VAR_IPTABLES_BINARY="/sbin/iptables"
214 elif test -x "/usr/sbin/iptables"
215 then
216 VAR_IPTABLES_BINARY="/usr/sbin/iptables"
217 fi
218fi
219
220if test x"$VAR_IPTABLES_BINARY" != x"false"
221then
211AC_DEFINE_UNQUOTED([IPTABLES], "$VAR_IPTABLES_BINARY", [Path to iptables]) 222AC_DEFINE_UNQUOTED([IPTABLES], "$VAR_IPTABLES_BINARY", [Path to iptables])
212else 223else
213AC_MSG_WARN([warning: 'iptables' not found.]) 224AC_MSG_WARN([warning: 'iptables' not found.])
214fi 225fi
215 226
227AC_PATH_TARGET_TOOL(VAR_IFCONFIG_BINARY, ifconfig, false)
228
216AC_CHECK_PROG(VAR_IFCONFIG_BINARY, ifconfig, true, false) 229AC_CHECK_PROG(VAR_IFCONFIG_BINARY, ifconfig, true, false)
230if test x"$VAR_IFCONFIG_BINARY" != x"false"
231then
232 if test -x "/sbin/ifconfig"
233 then
234 VAR_IFCONFIG_BINARY="/sbin/ifconfig"
235 elif test -x "/usr/sbin/ifconfig"
236 then
237 VAR_IFCONFIG_BINARY="/usr/sbin/ifconfig"
238 fi
239fi
240if test x"$VAR_IFCONFIG_BINARY" != x"false"
241then
242AC_DEFINE_UNQUOTED([IFCONFIG], "$VAR_IFCONFIG_BINARY", [Path to ifconfig])
243else
217AC_MSG_WARN([warning: 'ifconfig' not found.]) 244AC_MSG_WARN([warning: 'ifconfig' not found.])
245fi
246
218 247
219# miniupnpc / upnpc binary is a soft runtime requirement 248# miniupnpc / upnpc binary is a soft runtime requirement
220AC_PATH_TARGET_TOOL(VAR_UPNPC_BINARY, upnpc, false) 249AC_PATH_TARGET_TOOL(VAR_UPNPC_BINARY, upnpc, false)
@@ -930,7 +959,7 @@ postgres=false
930# even running the check for postgres breaks emscripten ... 959# even running the check for postgres breaks emscripten ...
931if test "$taler_only" != yes; then 960if test "$taler_only" != yes; then
932 AX_LIB_POSTGRESQL([9.5]) 961 AX_LIB_POSTGRESQL([9.5])
933 if test "$found_postgresql" = "yes"; then 962 if test "x$found_postgresql" = "xyes"; then
934 CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" 963 CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
935 AC_CHECK_HEADERS([libpq-fe.h], 964 AC_CHECK_HEADERS([libpq-fe.h],
936 postgres=true) 965 postgres=true)