diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index 2e0bda700..80ad72c61 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -232,7 +232,7 @@ then | |||
232 | *** You need libgcrypt to build this program. | 232 | *** You need libgcrypt to build this program. |
233 | ** This library is for example available at | 233 | ** This library is for example available at |
234 | *** ftp://ftp.gnupg.org/gcrypt/libgcrypt/ | 234 | *** ftp://ftp.gnupg.org/gcrypt/libgcrypt/ |
235 | *** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) | 235 | *** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) |
236 | *** is required.) | 236 | *** is required.) |
237 | ***]]) | 237 | ***]]) |
238 | fi | 238 | fi |
@@ -296,10 +296,10 @@ AC_LANG_PUSH(C) | |||
296 | LIBS="$LIBS $LIBGCRYPT_LIBS" | 296 | LIBS="$LIBS $LIBGCRYPT_LIBS" |
297 | CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS" | 297 | CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS" |
298 | AC_RUN_IFELSE( | 298 | AC_RUN_IFELSE( |
299 | [AC_LANG_PROGRAM([#include <gcrypt.h> | 299 | [AC_LANG_PROGRAM([#include <gcrypt.h> |
300 | #include <stdio.h>], [[ | 300 | #include <stdio.h>], [[ |
301 | gcry_md_hd_t mac; | 301 | gcry_md_hd_t mac; |
302 | 302 | ||
303 | unsigned char data[] = { 0xbf, 0x16, 0x6e, 0x46, 0x3a, 0x6c, 0xf3, 0x93, 0xa7, 0x72, | 303 | unsigned char data[] = { 0xbf, 0x16, 0x6e, 0x46, 0x3a, 0x6c, 0xf3, 0x93, 0xa7, 0x72, |
304 | 0x11, 0xa1, 0xdc, 0x0b, 0x07, 0xdb, 0x1a, 0x5e, 0xd9, 0xb9, 0x81, 0xbe, | 304 | 0x11, 0xa1, 0xdc, 0x0b, 0x07, 0xdb, 0x1a, 0x5e, 0xd9, 0xb9, 0x81, 0xbe, |
305 | 0xea, 0xe4, 0x31, 0x5f, 0x24, 0xff, 0xfe, 0x50, 0x8a, 0xde }; | 305 | 0xea, 0xe4, 0x31, 0x5f, 0x24, 0xff, 0xfe, 0x50, 0x8a, 0xde }; |
@@ -310,33 +310,33 @@ AC_RUN_IFELSE( | |||
310 | 0xd, 0xba, 0x17, 0x7d, 0xd3, 0x10, 0xb1, 0x37, 0x41, 0x91, 0x7d, 0xeb, | 310 | 0xd, 0xba, 0x17, 0x7d, 0xd3, 0x10, 0xb1, 0x37, 0x41, 0x91, 0x7d, 0xeb, |
311 | 0x1, 0x4d, 0x71, 0xe8, 0x59, 0x71, 0x42, 0x8e, 0xd6, 0xf3, 0x29, 0x3b, | 311 | 0x1, 0x4d, 0x71, 0xe8, 0x59, 0x71, 0x42, 0x8e, 0xd6, 0xf3, 0x29, 0x3b, |
312 | 0x90, 0xf2, 0xd1, 0xaf, 0x65, 0x1e, 0xb3}; | 312 | 0x90, 0xf2, 0xd1, 0xaf, 0x65, 0x1e, 0xb3}; |
313 | 313 | ||
314 | if (!gcry_check_version (GCRYPT_VERSION)) | 314 | if (!gcry_check_version (GCRYPT_VERSION)) |
315 | { | 315 | { |
316 | fprintf (stderr, "Version mismatch %s <-> %s \n", gcry_check_version (NULL), GCRYPT_VERSION); | 316 | fprintf (stderr, "Version mismatch %s <-> %s \n", gcry_check_version (NULL), GCRYPT_VERSION); |
317 | return 1; | 317 | return 1; |
318 | } | 318 | } |
319 | 319 | ||
320 | gcry_control (GCRYCTL_DISABLE_SECMEM, 0); | 320 | gcry_control (GCRYCTL_DISABLE_SECMEM, 0); |
321 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); | 321 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); |
322 | 322 | ||
323 | if (gcry_md_open(&mac, GCRY_MD_SHA512, GCRY_MD_FLAG_HMAC) != GPG_ERR_NO_ERROR) | 323 | if (gcry_md_open(&mac, GCRY_MD_SHA512, GCRY_MD_FLAG_HMAC) != GPG_ERR_NO_ERROR) |
324 | { | 324 | { |
325 | fprintf (stderr, "gcry_md_open error\n"); | 325 | fprintf (stderr, "gcry_md_open error\n"); |
326 | return 2; | 326 | return 2; |
327 | } | 327 | } |
328 | 328 | ||
329 | gcry_md_setkey (mac, key, sizeof (key)); | 329 | gcry_md_setkey (mac, key, sizeof (key)); |
330 | gcry_md_write (mac, data, sizeof (data)); | 330 | gcry_md_write (mac, data, sizeof (data)); |
331 | 331 | ||
332 | if (memcmp(gcry_md_read (mac, 0), result, gcry_md_get_algo_dlen (gcry_md_get_algo (mac))) != 0) | 332 | if (memcmp(gcry_md_read (mac, 0), result, gcry_md_get_algo_dlen (gcry_md_get_algo (mac))) != 0) |
333 | { | 333 | { |
334 | fprintf (stderr, "memcmp error\n"); | 334 | fprintf (stderr, "memcmp error\n"); |
335 | return 3; | 335 | return 3; |
336 | } | 336 | } |
337 | 337 | ||
338 | gcry_md_close (mac); | 338 | gcry_md_close (mac); |
339 | 339 | ||
340 | return 0; | 340 | return 0; |
341 | ]])], | 341 | ]])], |
342 | [AC_MSG_RESULT([yes])], | 342 | [AC_MSG_RESULT([yes])], |
@@ -425,7 +425,7 @@ if test "$libidn" != "no"; then | |||
425 | fi | 425 | fi |
426 | AC_CHECK_HEADER(idna.h, | 426 | AC_CHECK_HEADER(idna.h, |
427 | AC_CHECK_LIB(idn, stringprep_check_version, | 427 | AC_CHECK_LIB(idn, stringprep_check_version, |
428 | [libidn=yes LIBS="${LIBS} -lidn"], | 428 | [libidn=yes LIBS="${LIBS} -lidn"], |
429 | AC_MSG_FAILURE([GNUnet requires libidn])), | 429 | AC_MSG_FAILURE([GNUnet requires libidn])), |
430 | AC_MSG_FAILURE([GNUnet requires libidn])) | 430 | AC_MSG_FAILURE([GNUnet requires libidn])) |
431 | fi | 431 | fi |
@@ -437,7 +437,7 @@ LIBS=$SAVE_LIBS | |||
437 | 437 | ||
438 | AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false]) | 438 | AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false]) |
439 | # GLPK must support glpk_init_env, version >= 4.43 | 439 | # GLPK must support glpk_init_env, version >= 4.43 |
440 | AC_CHECK_LIB([glpk],[glp_init_env],,[gplk=false]) | 440 | AC_CHECK_LIB([glpk],[glp_init_env],,[gplk=false]) |
441 | # GLPK must support atm MLP presolving, version >= 4.32 | 441 | # GLPK must support atm MLP presolving, version >= 4.32 |
442 | AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]]) | 442 | AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]]) |
443 | if test x$gplk = xfalse | 443 | if test x$gplk = xfalse |
@@ -901,7 +901,7 @@ then | |||
901 | AC_DEFINE([FRAMEWORK_BUILD], 1, [Build a Mac OS X Framework]) | 901 | AC_DEFINE([FRAMEWORK_BUILD], 1, [Build a Mac OS X Framework]) |
902 | GN_INTLINCL='-I$(top_srcdir)/src/intlemu' | 902 | GN_INTLINCL='-I$(top_srcdir)/src/intlemu' |
903 | GN_LIBINTL='$(top_builddir)/src/intlemu/libintlemu.la -framework CoreFoundation' | 903 | GN_LIBINTL='$(top_builddir)/src/intlemu/libintlemu.la -framework CoreFoundation' |
904 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$GN_INTLINCL]) | 904 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$GN_INTLINCL]) |
905 | fi | 905 | fi |
906 | 906 | ||
907 | GN_LIB_LDFLAGS="-export-dynamic -no-undefined" | 907 | GN_LIB_LDFLAGS="-export-dynamic -no-undefined" |
@@ -1257,7 +1257,7 @@ AC_LINK_IFELSE( | |||
1257 | 1257 | ||
1258 | else | 1258 | else |
1259 | AC_MSG_CHECKING(whether to enable windows workarounds) | 1259 | AC_MSG_CHECKING(whether to enable windows workarounds) |
1260 | AC_ARG_ENABLE([windows_workarounds], | 1260 | AC_ARG_ENABLE([windows_workarounds], |
1261 | [AS_HELP_STRING([--enable-windows_workarounds], [enable workarounds used on Windows (only useful for test cases)])], | 1261 | [AS_HELP_STRING([--enable-windows_workarounds], [enable workarounds used on Windows (only useful for test cases)])], |
1262 | [enable_workarounds=${enableval}], | 1262 | [enable_workarounds=${enableval}], |
1263 | [enable_workarounds=no]) | 1263 | [enable_workarounds=no]) |
@@ -1273,10 +1273,10 @@ AC_DEFINE_UNQUOTED([ENABLE_WINDOWS_WORKAROUNDS], $workarounds, [enable workaroun | |||
1273 | 1273 | ||
1274 | # gcov compilation | 1274 | # gcov compilation |
1275 | AC_MSG_CHECKING(whether to compile with support for code coverage analysis) | 1275 | AC_MSG_CHECKING(whether to compile with support for code coverage analysis) |
1276 | AC_ARG_ENABLE([coverage], | 1276 | AC_ARG_ENABLE([coverage], |
1277 | AS_HELP_STRING([--enable-coverage], | 1277 | AS_HELP_STRING([--enable-coverage], |
1278 | [compile the library with code coverage support]), | 1278 | [compile the library with code coverage support]), |
1279 | [use_gcov=${enableval}], | 1279 | [use_gcov=${enableval}], |
1280 | [use_gcov=no]) | 1280 | [use_gcov=no]) |
1281 | AC_MSG_RESULT($use_gcov) | 1281 | AC_MSG_RESULT($use_gcov) |
1282 | AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) | 1282 | AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) |
@@ -1303,14 +1303,14 @@ else | |||
1303 | AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-`svnversion -n`"], [repository svn version]) | 1303 | AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-`svnversion -n`"], [repository svn version]) |
1304 | fi | 1304 | fi |
1305 | 1305 | ||
1306 | AC_CONFIG_FILES([ | 1306 | AC_CONFIG_FILES([ |
1307 | Makefile | 1307 | Makefile |
1308 | contrib/Makefile | 1308 | contrib/Makefile |
1309 | doc/Makefile | 1309 | doc/Makefile |
1310 | doc/man/Makefile | 1310 | doc/man/Makefile |
1311 | doc/doxygen/Makefile | 1311 | doc/doxygen/Makefile |
1312 | m4/Makefile | 1312 | m4/Makefile |
1313 | po/Makefile.in | 1313 | po/Makefile.in |
1314 | src/Makefile | 1314 | src/Makefile |
1315 | src/arm/Makefile | 1315 | src/arm/Makefile |
1316 | src/arm/arm.conf | 1316 | src/arm/arm.conf |
@@ -1344,6 +1344,7 @@ src/fs/fs.conf | |||
1344 | src/gns/Makefile | 1344 | src/gns/Makefile |
1345 | src/gns/gns.conf | 1345 | src/gns/gns.conf |
1346 | src/gns/nss/Makefile | 1346 | src/gns/nss/Makefile |
1347 | src/gnsrecord/Makefile | ||
1347 | src/hello/Makefile | 1348 | src/hello/Makefile |
1348 | src/identity/Makefile | 1349 | src/identity/Makefile |
1349 | src/identity/identity.conf | 1350 | src/identity/identity.conf |
@@ -1519,7 +1520,7 @@ Make sure that '/var/lib/gnunet' is owned (and writable) by user | |||
1519 | 1520 | ||
1520 | After that, run (if necessary as 'root') | 1521 | After that, run (if necessary as 'root') |
1521 | make install | 1522 | make install |
1522 | to install everything. | 1523 | to install everything. |
1523 | 1524 | ||
1524 | Each GNUnet user should be added to the 'gnunet' group (may | 1525 | Each GNUnet user should be added to the 'gnunet' group (may |
1525 | require fresh login to come into effect): | 1526 | require fresh login to come into effect): |
@@ -1527,8 +1528,8 @@ require fresh login to come into effect): | |||
1527 | (run the above command as root once for each of your users, replacing | 1528 | (run the above command as root once for each of your users, replacing |
1528 | "$USERNAME" with the respective login names). If you have a global IP | 1529 | "$USERNAME" with the respective login names). If you have a global IP |
1529 | address, no further configuration is required. | 1530 | address, no further configuration is required. |
1530 | 1531 | ||
1531 | Optionally, download and compile gnunet-gtk to get a GUI for | 1532 | Optionally, download and compile gnunet-gtk to get a GUI for |
1532 | file-sharing and configuration. This is particularly recommended | 1533 | file-sharing and configuration. This is particularly recommended |
1533 | if your network setup is non-trivial, as gnunet-setup can be | 1534 | if your network setup is non-trivial, as gnunet-setup can be |
1534 | used to test in the GUI if your network configuration is working. | 1535 | used to test in the GUI if your network configuration is working. |