diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-06-09 09:55:11 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-06-09 09:55:11 +0000 |
commit | 83da6bcc7751ee11905e3f8f3adcfe33d2b926bc (patch) | |
tree | ad6105123cf7c42309c4dfaa8e0a74e5bd738b1a /configure.ac | |
parent | 37989871e45861de329ae57fb351ca3b47e453f0 (diff) | |
download | gnunet-83da6bcc7751ee11905e3f8f3adcfe33d2b926bc.tar.gz gnunet-83da6bcc7751ee11905e3f8f3adcfe33d2b926bc.zip |
-avoid concurrent modification trouble when handing peer disconnect
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 115 |
1 files changed, 62 insertions, 53 deletions
diff --git a/configure.ac b/configure.ac index 3072684fc..67633b107 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -491,26 +491,6 @@ else | |||
491 | fi | 491 | fi |
492 | 492 | ||
493 | 493 | ||
494 | # libidn | ||
495 | AC_MSG_CHECKING([if Libidn can be used]) | ||
496 | AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]], | ||
497 | [Support IDN (needs GNU Libidn)]), | ||
498 | libidn=$withval, libidn=yes) | ||
499 | if test "$libidn" != "no"; then | ||
500 | if test "$libidn" != "yes"; then | ||
501 | LDFLAGS="${LDFLAGS} -L$libidn/lib" | ||
502 | CPPFLAGS="${CPPFLAGS} -I$libidn/include" | ||
503 | fi | ||
504 | fi | ||
505 | libidn=no | ||
506 | AC_CHECK_HEADER(idna.h, | ||
507 | AC_CHECK_LIB(idn, stringprep_check_version, | ||
508 | [libidn=yes LIBS="${LIBS} -lidn"], []), []) | ||
509 | if test "$libidn" != "yes"; then | ||
510 | AC_MSG_FAILURE([GNUnet requires libidn. | ||
511 | libidn-1.13 should be sufficient, newer versions work too.]) | ||
512 | fi | ||
513 | AC_MSG_RESULT($libidn) | ||
514 | 494 | ||
515 | # restore LIBS | 495 | # restore LIBS |
516 | LIBS=$SAVE_LIBS | 496 | LIBS=$SAVE_LIBS |
@@ -639,7 +619,69 @@ fi | |||
639 | # restore LIBS | 619 | # restore LIBS |
640 | LIBS=$SAVE_LIBS | 620 | LIBS=$SAVE_LIBS |
641 | 621 | ||
622 | |||
623 | # libidn | ||
624 | AC_MSG_CHECKING([if Libidn can be used]) | ||
625 | AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]], | ||
626 | [Support IDN (needs GNU Libidn)]), | ||
627 | libidn=$withval, libidn=yes) | ||
628 | if test "$libidn" != "no"; then | ||
629 | if test "$libidn" != "yes"; then | ||
630 | LDFLAGS="${LDFLAGS} -L$libidn/lib" | ||
631 | CPPFLAGS="${CPPFLAGS} -I$libidn/include" | ||
632 | fi | ||
642 | fi | 633 | fi |
634 | libidn=no | ||
635 | AC_CHECK_HEADER(idna.h, | ||
636 | AC_CHECK_LIB(idn, stringprep_check_version, | ||
637 | [libidn=yes LIBS="${LIBS} -lidn"], []), []) | ||
638 | if test "$libidn" != "yes"; then | ||
639 | AC_MSG_FAILURE([GNUnet requires libidn. | ||
640 | libidn-1.13 should be sufficient, newer versions work too.]) | ||
641 | fi | ||
642 | AC_MSG_RESULT($libidn) | ||
643 | |||
644 | |||
645 | # test for zlib | ||
646 | SAVE_LDFLAGS=$LDFLAGS | ||
647 | SAVE_CPPFLAGS=$CPPFLAGS | ||
648 | AC_ARG_WITH(zlib, | ||
649 | [ --with-zlib[[=DIR]] use libz in DIR], | ||
650 | [AS_IF([test "$withval" = "no"], | ||
651 | [AC_MSG_ERROR([GNUnet requires zlib])], | ||
652 | [test "$withval" != "yes"], | ||
653 | [ | ||
654 | Z_DIR=$withval | ||
655 | CPPFLAGS="${CPPFLAGS} -I$withval/include" | ||
656 | LDFLAGS="${LDFLAGS} -L$withval/lib" | ||
657 | ]) | ||
658 | ]) | ||
659 | AC_CHECK_HEADER(zlib.h, | ||
660 | [], | ||
661 | [AC_MSG_ERROR([GNUnet requires zlib])]) | ||
662 | AC_CHECK_LIB(z, compress2, | ||
663 | [ | ||
664 | AC_DEFINE([HAVE_ZLIB], [], [Have compression library]) | ||
665 | if test "x${Z_DIR}" != "x"; then | ||
666 | Z_CFLAGS="-I${Z_DIR}/include" | ||
667 | Z_LIBS="-L${Z_DIR}/lib -lz" | ||
668 | else | ||
669 | Z_LIBS="-lz" | ||
670 | fi], | ||
671 | [AC_MSG_ERROR([GNUnet requires zlib])]) | ||
672 | AC_SUBST(Z_CFLAGS) | ||
673 | AC_SUBST(Z_LIBS) | ||
674 | |||
675 | |||
676 | |||
677 | # restore LIBS | ||
678 | LIBS=$SAVE_LIBS | ||
679 | |||
680 | |||
681 | fi | ||
682 | |||
683 | # check for iconv | ||
684 | AM_ICONV | ||
643 | 685 | ||
644 | # test for libunistring | 686 | # test for libunistring |
645 | gl_LIBUNISTRING | 687 | gl_LIBUNISTRING |
@@ -722,36 +764,6 @@ if test "$found_postgresql" = "yes"; then | |||
722 | fi | 764 | fi |
723 | AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) | 765 | AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) |
724 | 766 | ||
725 | # test for zlib | ||
726 | SAVE_LDFLAGS=$LDFLAGS | ||
727 | SAVE_CPPFLAGS=$CPPFLAGS | ||
728 | AC_ARG_WITH(zlib, | ||
729 | [ --with-zlib[[=DIR]] use libz in DIR], | ||
730 | [AS_IF([test "$withval" = "no"], | ||
731 | [AC_MSG_ERROR([GNUnet requires zlib])], | ||
732 | [test "$withval" != "yes"], | ||
733 | [ | ||
734 | Z_DIR=$withval | ||
735 | CPPFLAGS="${CPPFLAGS} -I$withval/include" | ||
736 | LDFLAGS="${LDFLAGS} -L$withval/lib" | ||
737 | ]) | ||
738 | ]) | ||
739 | AC_CHECK_HEADER(zlib.h, | ||
740 | [], | ||
741 | [AC_MSG_ERROR([GNUnet requires zlib])]) | ||
742 | AC_CHECK_LIB(z, compress2, | ||
743 | [ | ||
744 | AC_DEFINE([HAVE_ZLIB], [], [Have compression library]) | ||
745 | if test "x${Z_DIR}" != "x"; then | ||
746 | Z_CFLAGS="-I${Z_DIR}/include" | ||
747 | Z_LIBS="-L${Z_DIR}/lib -lz" | ||
748 | else | ||
749 | Z_LIBS="-lz" | ||
750 | fi], | ||
751 | [AC_MSG_ERROR([GNUnet requires zlib])]) | ||
752 | AC_SUBST(Z_CFLAGS) | ||
753 | AC_SUBST(Z_LIBS) | ||
754 | |||
755 | LDFLAGS=$SAVE_LDFLAGS | 767 | LDFLAGS=$SAVE_LDFLAGS |
756 | CPPFLAGS=$SAVE_CPPFLAGS | 768 | CPPFLAGS=$SAVE_CPPFLAGS |
757 | 769 | ||
@@ -930,9 +942,6 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) | |||
930 | AM_GNU_GETTEXT([external]) | 942 | AM_GNU_GETTEXT([external]) |
931 | AM_GNU_GETTEXT_VERSION([0.19.3]) | 943 | AM_GNU_GETTEXT_VERSION([0.19.3]) |
932 | 944 | ||
933 | # check for iconv | ||
934 | AM_ICONV | ||
935 | |||
936 | # Checks for standard typedefs, structures, and compiler characteristics. | 945 | # Checks for standard typedefs, structures, and compiler characteristics. |
937 | AC_TYPE_PID_T | 946 | AC_TYPE_PID_T |
938 | AC_TYPE_SIZE_T | 947 | AC_TYPE_SIZE_T |