diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 4a2f148ff..b82a72fec 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -19,9 +19,9 @@ | |||
19 | # Process this file with autoconf to produce a configure script. | 19 | # Process this file with autoconf to produce a configure script. |
20 | # | 20 | # |
21 | # | 21 | # |
22 | AC_PREREQ(2.61) | 22 | AC_PREREQ([2.71]) |
23 | # Checks for programs. | 23 | # Checks for programs. |
24 | AC_INIT([gnunet], [0.14.1], [bug-gnunet@gnu.org]) | 24 | AC_INIT([gnunet],[0.14.1],[bug-gnunet@gnu.org]) |
25 | AC_CONFIG_AUX_DIR([build-aux]) | 25 | AC_CONFIG_AUX_DIR([build-aux]) |
26 | 26 | ||
27 | # check for legacy option that is no longer supported (#5627) and fail hard | 27 | # check for legacy option that is no longer supported (#5627) and fail hard |
@@ -35,14 +35,13 @@ AC_ARG_WITH(nssdir, | |||
35 | 35 | ||
36 | AC_CANONICAL_TARGET | 36 | AC_CANONICAL_TARGET |
37 | AC_CANONICAL_HOST | 37 | AC_CANONICAL_HOST |
38 | AC_CANONICAL_SYSTEM | ||
39 | AM_INIT_AUTOMAKE | 38 | AM_INIT_AUTOMAKE |
40 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AM_DEFAULT_VERBOSITY=1 AC_SUBST(AM_DEFAULT_VERBOSITY)]) | 39 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AM_DEFAULT_VERBOSITY=1 AC_SUBST(AM_DEFAULT_VERBOSITY)]) |
41 | AC_CONFIG_HEADERS([gnunet_config.h]) | 40 | AC_CONFIG_HEADERS([gnunet_config.h]) |
42 | AH_TOP([#define _GNU_SOURCE 1]) | 41 | AH_TOP([#define _GNU_SOURCE 1]) |
43 | AC_CONFIG_MACRO_DIR([m4]) | 42 | AC_CONFIG_MACRO_DIR([m4]) |
44 | AC_PROG_AWK | 43 | AC_PROG_AWK |
45 | AC_PROG_CC_C99 | 44 | AC_PROG_CC |
46 | AC_PROG_OBJC | 45 | AC_PROG_OBJC |
47 | AC_PROG_INSTALL | 46 | AC_PROG_INSTALL |
48 | AC_PROG_LN_S | 47 | AC_PROG_LN_S |
@@ -416,16 +415,7 @@ gcrypt=0 | |||
416 | NEED_LIBGCRYPT_API=1 | 415 | NEED_LIBGCRYPT_API=1 |
417 | NEED_LIBGCRYPT_VERSION=1.6.0 | 416 | NEED_LIBGCRYPT_VERSION=1.6.0 |
418 | 417 | ||
419 | # Check if we have libgcrypt >= 1.9. Some things do not work with it | 418 | AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1) |
420 | gcrypt19=0 | ||
421 | AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:1.9.0", | ||
422 | [AC_MSG_WARN(["Some subsystems do not work with gcrypt >=1.9.0"]) | ||
423 | gcrypt=1 | ||
424 | gcrypt19=1], | ||
425 | [AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1)] | ||
426 | ) | ||
427 | AM_CONDITIONAL(HAVE_NOLIBGCRYPT19, | ||
428 | [test "$gcrypt19" = 0]) | ||
429 | AC_CHECK_DECLS([gcry_mpi_set_opaque_copy], [], [], [[#include <gcrypt.h>]]) | 419 | AC_CHECK_DECLS([gcry_mpi_set_opaque_copy], [], [], [[#include <gcrypt.h>]]) |
430 | 420 | ||
431 | AS_IF([test $gcrypt = 0], | 421 | AS_IF([test $gcrypt = 0], |
@@ -1323,7 +1313,6 @@ LIBS=$SAVE_LIBS | |||
1323 | 1313 | ||
1324 | # Checks for standard header files. | 1314 | # Checks for standard header files. |
1325 | AC_HEADER_DIRENT | 1315 | AC_HEADER_DIRENT |
1326 | AC_HEADER_STDC | ||
1327 | 1316 | ||
1328 | # Check for headers that are ALWAYS required | 1317 | # Check for headers that are ALWAYS required |
1329 | AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files: fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h])) | 1318 | AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files: fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h])) |
@@ -1544,7 +1533,8 @@ AM_GNU_GETTEXT_VERSION([0.18.1]) | |||
1544 | AC_TYPE_PID_T | 1533 | AC_TYPE_PID_T |
1545 | AC_TYPE_SIZE_T | 1534 | AC_TYPE_SIZE_T |
1546 | AC_TYPE_MODE_T | 1535 | AC_TYPE_MODE_T |
1547 | AC_HEADER_TIME | 1536 | AC_CHECK_HEADERS_ONCE([sys/time.h]) |
1537 | |||
1548 | AC_HEADER_STAT | 1538 | AC_HEADER_STAT |
1549 | AC_HEADER_STDBOOL | 1539 | AC_HEADER_STDBOOL |
1550 | AC_STRUCT_TM | 1540 | AC_STRUCT_TM |
@@ -1580,7 +1570,6 @@ AC_FUNC_MEMCMP | |||
1580 | AC_FUNC_SELECT_ARGTYPES | 1570 | AC_FUNC_SELECT_ARGTYPES |
1581 | AC_FUNC_CHOWN | 1571 | AC_FUNC_CHOWN |
1582 | 1572 | ||
1583 | AC_TYPE_SIGNAL | ||
1584 | AC_FUNC_STAT | 1573 | AC_FUNC_STAT |
1585 | AC_FUNC_STRFTIME | 1574 | AC_FUNC_STRFTIME |
1586 | AC_FUNC_VPRINTF | 1575 | AC_FUNC_VPRINTF |