diff options
author | ng0 <ng0@n0.is> | 2019-11-16 13:43:33 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-11-16 13:43:33 +0000 |
commit | be91802c1a57c0d37247a15153958cd9bb2155d1 (patch) | |
tree | 91862329afb338e827db0e46d19536f76e56bde0 /configure.ac | |
parent | bfb22f3f3d81a786c5698e92e80bb8da250e3faf (diff) | |
download | gnunet-be91802c1a57c0d37247a15153958cd9bb2155d1.tar.gz gnunet-be91802c1a57c0d37247a15153958cd9bb2155d1.zip |
addition to previous commit, properly implement make lint.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 14c2786ef..6f3b5f1bc 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -222,10 +222,17 @@ AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported])) | |||
222 | AC_CHECK_PROG(VAR_GETOPT_BINARY, getopt, true, false) | 222 | AC_CHECK_PROG(VAR_GETOPT_BINARY, getopt, true, false) |
223 | AM_CONDITIONAL(HAVE_GETOPT_BINARY, $VAR_GETOPT_BINARY) | 223 | AM_CONDITIONAL(HAVE_GETOPT_BINARY, $VAR_GETOPT_BINARY) |
224 | 224 | ||
225 | AC_CHECK_PROGS(PKG_CONFIG, [pkgconf, pkg-config], false) | ||
226 | AM_CONDITIONAL(HAVE_PKG_CONFIG, test x$PKG_CONFIG != xfalse) | ||
227 | |||
225 | AC_CHECK_PROG(VAR_SSH_BINARY, ssh, true, false) | 228 | AC_CHECK_PROG(VAR_SSH_BINARY, ssh, true, false) |
226 | AM_CONDITIONAL(HAVE_SSH_BINARY, $VAR_SSH_BINARY) | 229 | AM_CONDITIONAL(HAVE_SSH_BINARY, $VAR_SSH_BINARY) |
227 | AM_CONDITIONAL(HAVE_SSH_KEY, ssh -D 12345 -o "BatchMode yes" -o "UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o "StrictHostKeyChecking no" 127.0.0.1 echo -n) | 230 | AC_MSG_CHECKING(for SSH key) |
228 | rm -f /tmp/gnunet_test_cosks_ssh_garbage | 231 | AM_CONDITIONAL(HAVE_SSH_KEY, ssh -D 12345 -o "BatchMode yes" -o "UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o "StrictHostKeyChecking no" 127.0.0.1 echo -n) |
232 | if test -f /tmp/gnunet_test_cosks_ssh_garbage; then | ||
233 | rm -f /tmp/gnunet_test_cosks_ssh_garbage | ||
234 | fi | ||
235 | |||
229 | 236 | ||
230 | # autotools' m4 for python has no maximum version! | 237 | # autotools' m4 for python has no maximum version! |
231 | # python3.4 - python3.8 for tests (3.8 unchecked) | 238 | # python3.4 - python3.8 for tests (3.8 unchecked) |
@@ -316,6 +323,10 @@ AS_IF([test x"$VAR_UPNPC_BINARY" != x"false"], | |||
316 | [AC_MSG_WARN([warning: 'upnpc' binary not found.])]) | 323 | [AC_MSG_WARN([warning: 'upnpc' binary not found.])]) |
317 | 324 | ||
318 | 325 | ||
326 | # checkbashisms | ||
327 | AC_CHECK_PROGS(CHECKBASHISMS_BINARY, [checkbashisms checkbashisms.pl], false) | ||
328 | AM_CONDITIONAL(HAVE_CHECKBASHISMS, test x$CHECKBASHISMS_BINARY != xfalse) | ||
329 | |||
319 | # uncrustify | 330 | # uncrustify |
320 | # TODO: maybe add flag to pass location | 331 | # TODO: maybe add flag to pass location |
321 | AC_CHECK_PROG(UNCRUSTIFY_BINARY, uncrustify, true) | 332 | AC_CHECK_PROG(UNCRUSTIFY_BINARY, uncrustify, true) |
@@ -1035,7 +1046,7 @@ AS_IF([test x$ltdl = x1], | |||
1035 | [ | 1046 | [ |
1036 | AC_MSG_RESULT([libltdl found]) | 1047 | AC_MSG_RESULT([libltdl found]) |
1037 | ],[ | 1048 | ],[ |
1038 | AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool), try installing libltdl-dev]) | 1049 | AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool).]) |
1039 | ]) | 1050 | ]) |
1040 | # restore LIBS | 1051 | # restore LIBS |
1041 | LIBS=$SAVE_LIBS | 1052 | LIBS=$SAVE_LIBS |
@@ -1106,8 +1117,7 @@ AS_IF([test x$my_with_libidn2 = x1], | |||
1106 | [Define to 1 if you have 'libidn2' (-lidn2).])], | 1117 | [Define to 1 if you have 'libidn2' (-lidn2).])], |
1107 | [MISSING_DEPS="${MISSING_DEPS}${MISSING_SEP}libidn2" | 1118 | [MISSING_DEPS="${MISSING_DEPS}${MISSING_SEP}libidn2" |
1108 | MISSING_SEP=", "])]) | 1119 | MISSING_SEP=", "])]) |
1109 | AM_CONDITIONAL(HAVE_LIBIDN2, | 1120 | AM_CONDITIONAL(HAVE_LIBIDN2, test x$working_libidn2 = x1) |
1110 | test x$working_libidn2 = x1) | ||
1111 | AS_IF([test x$working_libidn2 = x0], | 1121 | AS_IF([test x$working_libidn2 = x0], |
1112 | [AS_IF([test x$my_with_libidn = x1], | 1122 | [AS_IF([test x$my_with_libidn = x1], |
1113 | [AC_MSG_NOTICE([Checking for libidn]) | 1123 | [AC_MSG_NOTICE([Checking for libidn]) |
@@ -1261,9 +1271,9 @@ AC_SUBST(SQLITE_LDFLAGS) | |||
1261 | LDFLAGS=$SAVE_LDFLAGS | 1271 | LDFLAGS=$SAVE_LDFLAGS |
1262 | CPPFLAGS=$SAVE_CPPFLAGS | 1272 | CPPFLAGS=$SAVE_CPPFLAGS |
1263 | 1273 | ||
1264 | # test for postgres | 1274 | # test for postgres: |
1265 | postgres=false | 1275 | postgres=false |
1266 | # even running the check for postgres breaks emscripten ... | 1276 | # even running the check for postgres breaks emscripten |
1267 | AS_IF([test "$taler_only" != yes], | 1277 | AS_IF([test "$taler_only" != yes], |
1268 | [AX_LIB_POSTGRESQL([9.5], | 1278 | [AX_LIB_POSTGRESQL([9.5], |
1269 | [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" | 1279 | [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" |
@@ -1271,8 +1281,11 @@ AS_IF([test "$taler_only" != yes], | |||
1271 | postgres=true) | 1281 | postgres=true) |
1272 | ], | 1282 | ], |
1273 | [AC_MSG_RESULT([no postgres])])]) | 1283 | [AC_MSG_RESULT([no postgres])])]) |
1274 | AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) | ||
1275 | 1284 | ||
1285 | AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) | ||
1286 | AS_IF([test "x$postgres" = xtrue], | ||
1287 | [AC_DEFINE([HAVE_POSTGRESQL],[1],[Have PostgreSQL])], | ||
1288 | [AC_DEFINE([HAVE_POSTGRESQL],[0],[Lacking PostgreSQL])]) | ||
1276 | 1289 | ||
1277 | LDFLAGS=$SAVE_LDFLAGS | 1290 | LDFLAGS=$SAVE_LDFLAGS |
1278 | CPPFLAGS=$SAVE_CPPFLAGS | 1291 | CPPFLAGS=$SAVE_CPPFLAGS |
@@ -1781,7 +1794,6 @@ doc/man/Makefile | |||
1781 | doc/doxygen/Makefile | 1794 | doc/doxygen/Makefile |
1782 | doc/handbook/Makefile | 1795 | doc/handbook/Makefile |
1783 | doc/tutorial/Makefile | 1796 | doc/tutorial/Makefile |
1784 | lint/Makefile | ||
1785 | m4/Makefile | 1797 | m4/Makefile |
1786 | po/Makefile.in | 1798 | po/Makefile.in |
1787 | src/Makefile | 1799 | src/Makefile |