diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-06-26 13:43:09 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-06-26 13:43:19 +0200 |
commit | 62bf68287df9470ca6fb9134831cd137c06e0c22 (patch) | |
tree | 044e080b2f864a551efe7814339c7e815efb07b5 /configure.ac | |
parent | 0759e1e79accb055a4d175729b631d42486b08dc (diff) | |
download | gnunet-62bf68287df9470ca6fb9134831cd137c06e0c22.tar.gz gnunet-62bf68287df9470ca6fb9134831cd137c06e0c22.zip |
fix postgres version check on Debian
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 31 |
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 | ||
209 | if test x"$VAR_IPTABLES_BINARY" != x"false" | 209 | if test x"$VAR_IPTABLES_BINARY" != x"false" |
210 | then | 210 | then |
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 | ||
218 | fi | ||
219 | |||
220 | if test x"$VAR_IPTABLES_BINARY" != x"false" | ||
221 | then | ||
211 | AC_DEFINE_UNQUOTED([IPTABLES], "$VAR_IPTABLES_BINARY", [Path to iptables]) | 222 | AC_DEFINE_UNQUOTED([IPTABLES], "$VAR_IPTABLES_BINARY", [Path to iptables]) |
212 | else | 223 | else |
213 | AC_MSG_WARN([warning: 'iptables' not found.]) | 224 | AC_MSG_WARN([warning: 'iptables' not found.]) |
214 | fi | 225 | fi |
215 | 226 | ||
227 | AC_PATH_TARGET_TOOL(VAR_IFCONFIG_BINARY, ifconfig, false) | ||
228 | |||
216 | AC_CHECK_PROG(VAR_IFCONFIG_BINARY, ifconfig, true, false) | 229 | AC_CHECK_PROG(VAR_IFCONFIG_BINARY, ifconfig, true, false) |
230 | if test x"$VAR_IFCONFIG_BINARY" != x"false" | ||
231 | then | ||
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 | ||
239 | fi | ||
240 | if test x"$VAR_IFCONFIG_BINARY" != x"false" | ||
241 | then | ||
242 | AC_DEFINE_UNQUOTED([IFCONFIG], "$VAR_IFCONFIG_BINARY", [Path to ifconfig]) | ||
243 | else | ||
217 | AC_MSG_WARN([warning: 'ifconfig' not found.]) | 244 | AC_MSG_WARN([warning: 'ifconfig' not found.]) |
245 | fi | ||
246 | |||
218 | 247 | ||
219 | # miniupnpc / upnpc binary is a soft runtime requirement | 248 | # miniupnpc / upnpc binary is a soft runtime requirement |
220 | AC_PATH_TARGET_TOOL(VAR_UPNPC_BINARY, upnpc, false) | 249 | AC_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 ... |
931 | if test "$taler_only" != yes; then | 960 | if 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) |