aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-06-09 09:55:11 +0000
committerChristian Grothoff <christian@grothoff.org>2015-06-09 09:55:11 +0000
commit83da6bcc7751ee11905e3f8f3adcfe33d2b926bc (patch)
treead6105123cf7c42309c4dfaa8e0a74e5bd738b1a /configure.ac
parent37989871e45861de329ae57fb351ca3b47e453f0 (diff)
downloadgnunet-83da6bcc7751ee11905e3f8f3adcfe33d2b926bc.tar.gz
gnunet-83da6bcc7751ee11905e3f8f3adcfe33d2b926bc.zip
-avoid concurrent modification trouble when handing peer disconnect
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac115
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
491fi 491fi
492 492
493 493
494# libidn
495AC_MSG_CHECKING([if Libidn can be used])
496AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]],
497 [Support IDN (needs GNU Libidn)]),
498libidn=$withval, libidn=yes)
499if test "$libidn" != "no"; then
500 if test "$libidn" != "yes"; then
501 LDFLAGS="${LDFLAGS} -L$libidn/lib"
502 CPPFLAGS="${CPPFLAGS} -I$libidn/include"
503 fi
504fi
505libidn=no
506AC_CHECK_HEADER(idna.h,
507 AC_CHECK_LIB(idn, stringprep_check_version,
508 [libidn=yes LIBS="${LIBS} -lidn"], []), [])
509if test "$libidn" != "yes"; then
510 AC_MSG_FAILURE([GNUnet requires libidn.
511libidn-1.13 should be sufficient, newer versions work too.])
512fi
513AC_MSG_RESULT($libidn)
514 494
515# restore LIBS 495# restore LIBS
516LIBS=$SAVE_LIBS 496LIBS=$SAVE_LIBS
@@ -639,7 +619,69 @@ fi
639# restore LIBS 619# restore LIBS
640LIBS=$SAVE_LIBS 620LIBS=$SAVE_LIBS
641 621
622
623# libidn
624AC_MSG_CHECKING([if Libidn can be used])
625AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]],
626 [Support IDN (needs GNU Libidn)]),
627libidn=$withval, libidn=yes)
628if test "$libidn" != "no"; then
629 if test "$libidn" != "yes"; then
630 LDFLAGS="${LDFLAGS} -L$libidn/lib"
631 CPPFLAGS="${CPPFLAGS} -I$libidn/include"
632 fi
642fi 633fi
634libidn=no
635AC_CHECK_HEADER(idna.h,
636 AC_CHECK_LIB(idn, stringprep_check_version,
637 [libidn=yes LIBS="${LIBS} -lidn"], []), [])
638if test "$libidn" != "yes"; then
639 AC_MSG_FAILURE([GNUnet requires libidn.
640libidn-1.13 should be sufficient, newer versions work too.])
641fi
642AC_MSG_RESULT($libidn)
643
644
645# test for zlib
646SAVE_LDFLAGS=$LDFLAGS
647SAVE_CPPFLAGS=$CPPFLAGS
648AC_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 ])
659AC_CHECK_HEADER(zlib.h,
660 [],
661 [AC_MSG_ERROR([GNUnet requires zlib])])
662AC_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])])
672AC_SUBST(Z_CFLAGS)
673AC_SUBST(Z_LIBS)
674
675
676
677# restore LIBS
678LIBS=$SAVE_LIBS
679
680
681fi
682
683# check for iconv
684AM_ICONV
643 685
644# test for libunistring 686# test for libunistring
645gl_LIBUNISTRING 687gl_LIBUNISTRING
@@ -722,36 +764,6 @@ if test "$found_postgresql" = "yes"; then
722fi 764fi
723AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) 765AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
724 766
725# test for zlib
726SAVE_LDFLAGS=$LDFLAGS
727SAVE_CPPFLAGS=$CPPFLAGS
728AC_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 ])
739AC_CHECK_HEADER(zlib.h,
740 [],
741 [AC_MSG_ERROR([GNUnet requires zlib])])
742AC_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])])
752AC_SUBST(Z_CFLAGS)
753AC_SUBST(Z_LIBS)
754
755LDFLAGS=$SAVE_LDFLAGS 767LDFLAGS=$SAVE_LDFLAGS
756CPPFLAGS=$SAVE_CPPFLAGS 768CPPFLAGS=$SAVE_CPPFLAGS
757 769
@@ -930,9 +942,6 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
930AM_GNU_GETTEXT([external]) 942AM_GNU_GETTEXT([external])
931AM_GNU_GETTEXT_VERSION([0.19.3]) 943AM_GNU_GETTEXT_VERSION([0.19.3])
932 944
933# check for iconv
934AM_ICONV
935
936# Checks for standard typedefs, structures, and compiler characteristics. 945# Checks for standard typedefs, structures, and compiler characteristics.
937AC_TYPE_PID_T 946AC_TYPE_PID_T
938AC_TYPE_SIZE_T 947AC_TYPE_SIZE_T