diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 924b06849..76f627597 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | # This file is part of GNUnet. | 1 | # This file is part of GNUnet. |
2 | # (C) 2001--2016 GNUnet e.V. | 2 | # (C) 2001--2017 GNUnet e.V. |
3 | # | 3 | # |
4 | # GNUnet is free software; you can redistribute it and/or modify | 4 | # GNUnet is free software; you can redistribute it and/or modify |
5 | # it under the terms of the GNU General Public License as published | 5 | # it under the terms of the GNU General Public License as published |
@@ -811,13 +811,15 @@ AM_CONDITIONAL(HAVE_SQLITE, test x$sqlite = xtrue) | |||
811 | AC_SUBST(SQLITE_CPPFLAGS) | 811 | AC_SUBST(SQLITE_CPPFLAGS) |
812 | AC_SUBST(SQLITE_LDFLAGS) | 812 | AC_SUBST(SQLITE_LDFLAGS) |
813 | 813 | ||
814 | LDFLAGS=$SAVE_LDFLAGS | ||
815 | CPPFLAGS=$SAVE_CPPFLAGS | ||
816 | |||
814 | # test for postgres | 817 | # test for postgres |
815 | postgres=false | 818 | postgres=false |
816 | # even running the check for postgres breaks emscripten ... | 819 | # even running the check for postgres breaks emscripten ... |
817 | if test "$taler_only" != yes; then | 820 | if test "$taler_only" != yes; then |
818 | AX_LIB_POSTGRESQL([]) | 821 | AX_LIB_POSTGRESQL([9.5]) |
819 | if test "$found_postgresql" = "yes"; then | 822 | if test "$found_postgresql" = "yes"; then |
820 | CFLAGS="$CFLAGS $POSTGRESQL_CPPFLAGS" | ||
821 | CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" | 823 | CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" |
822 | AC_CHECK_HEADERS([libpq-fe.h], | 824 | AC_CHECK_HEADERS([libpq-fe.h], |
823 | postgres=true) | 825 | postgres=true) |
@@ -1030,6 +1032,16 @@ AC_CHECK_MEMBER([struct sockaddr_in.sin_len], | |||
1030 | #include <netinet/in.h> | 1032 | #include <netinet/in.h> |
1031 | ]) | 1033 | ]) |
1032 | 1034 | ||
1035 | AC_CHECK_MEMBER([struct sockaddr_un.sun_len], | ||
1036 | [ AC_DEFINE(HAVE_SOCKADDR_UN_SUN_LEN, 1, [Do we have sockaddr_un.sun_len?]) | ||
1037 | ], | ||
1038 | [], | ||
1039 | [ | ||
1040 | #include <sys/types.h> | ||
1041 | #include <sys/socket.h> | ||
1042 | #include <sys/un.h> | ||
1043 | ]) | ||
1044 | |||
1033 | 1045 | ||
1034 | 1046 | ||
1035 | # Checks for library functions. | 1047 | # Checks for library functions. |
@@ -1324,15 +1336,6 @@ AC_ARG_ENABLE([experimental], | |||
1324 | AC_MSG_RESULT($enable_experimental) | 1336 | AC_MSG_RESULT($enable_experimental) |
1325 | AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) | 1337 | AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) |
1326 | 1338 | ||
1327 | # FTBFS right now... | ||
1328 | AC_MSG_CHECKING(whether to compile ATS test code) | ||
1329 | AC_ARG_ENABLE([wachs], | ||
1330 | [AS_HELP_STRING([--enable-wachs], [enable compiling ATS test code])], | ||
1331 | [enable_wachs=${enableval}], | ||
1332 | [enable_wachs=no]) | ||
1333 | AC_MSG_RESULT($enable_wachs) | ||
1334 | AM_CONDITIONAL([HAVE_WACHS], [test "x$enable_wachs" = "xyes"]) | ||
1335 | |||
1336 | # should malicious code be compiled (should only be used for testing)? | 1339 | # should malicious code be compiled (should only be used for testing)? |
1337 | AC_MSG_CHECKING(whether to compile malicious code) | 1340 | AC_MSG_CHECKING(whether to compile malicious code) |
1338 | AC_ARG_ENABLE([malicious], | 1341 | AC_ARG_ENABLE([malicious], |
@@ -1630,6 +1633,7 @@ src/set/Makefile | |||
1630 | src/set/set.conf | 1633 | src/set/set.conf |
1631 | src/social/Makefile | 1634 | src/social/Makefile |
1632 | src/social/social.conf | 1635 | src/social/social.conf |
1636 | src/sq/Makefile | ||
1633 | src/statistics/Makefile | 1637 | src/statistics/Makefile |
1634 | src/statistics/statistics.conf | 1638 | src/statistics/statistics.conf |
1635 | src/template/Makefile | 1639 | src/template/Makefile |
@@ -1790,9 +1794,11 @@ then | |||
1790 | AC_MSG_NOTICE([NOTICE: Mac OS X framework build enabled.]) | 1794 | AC_MSG_NOTICE([NOTICE: Mac OS X framework build enabled.]) |
1791 | fi | 1795 | fi |
1792 | 1796 | ||
1793 | if test "x$SUDO_BINARY" = "x" -a ! -w / | 1797 | if test "x$install_nss" = "x0" |
1794 | then | 1798 | then |
1795 | AC_MSG_NOTICE([NOTICE: --with-sudo not specified and not running as 'root', will not install GNS NSS library]) | 1799 | AC_MSG_NOTICE([NOTICE: --with-sudo not specified and not running as 'root', will not install GNS NSS library]) |
1800 | else | ||
1801 | AC_MSG_NOTICE([NOTICE: Will to install GNS NSS library to $NSS_DIR]) | ||
1796 | fi | 1802 | fi |
1797 | 1803 | ||
1798 | 1804 | ||