diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 46 |
1 files changed, 8 insertions, 38 deletions
diff --git a/configure.ac b/configure.ac index 3f1450ba2..23ca78dbb 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -21,7 +21,7 @@ | |||
21 | # | 21 | # |
22 | AC_PREREQ(2.61) | 22 | AC_PREREQ(2.61) |
23 | # Checks for programs. | 23 | # Checks for programs. |
24 | AC_INIT([gnunet], [0.12.1], [bug-gnunet@gnu.org]) | 24 | AC_INIT([gnunet], [0.12.2], [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 |
@@ -212,7 +212,7 @@ AC_SEARCH_LIBS([memrchr], [], | |||
212 | AC_DEFINE(HAVE_MEMRCHR,1,[memrchr supported]), []) | 212 | AC_DEFINE(HAVE_MEMRCHR,1,[memrchr supported]), []) |
213 | AC_SEARCH_LIBS([memset_s], [], | 213 | AC_SEARCH_LIBS([memset_s], [], |
214 | AC_DEFINE(HAVE_MEMSET_S,1,[memset_s supported]), []) | 214 | AC_DEFINE(HAVE_MEMSET_S,1,[memset_s supported]), []) |
215 | AC_SEARCH_LIBS([memset_s], [], | 215 | AC_SEARCH_LIBS([explicit_bzero], [], |
216 | AC_DEFINE(HAVE_EXPLICIT_BZERO,1,[explicit_bzero supported]), []) | 216 | AC_DEFINE(HAVE_EXPLICIT_BZERO,1,[explicit_bzero supported]), []) |
217 | AC_CHECK_LIB(socket, socket) | 217 | AC_CHECK_LIB(socket, socket) |
218 | AC_CHECK_LIB(m, log) | 218 | AC_CHECK_LIB(m, log) |
@@ -1026,23 +1026,6 @@ AC_CHECK_LIB([kvm],[kvm_open]) | |||
1026 | AC_CHECK_LIB([kstat],[kstat_open]) | 1026 | AC_CHECK_LIB([kstat],[kstat_open]) |
1027 | 1027 | ||
1028 | 1028 | ||
1029 | # should the build process be restricted to the code required | ||
1030 | # for GNU Taler wallets? | ||
1031 | AC_MSG_CHECKING(whether to compile GNU Taler Wallet library ONLY) | ||
1032 | AC_ARG_ENABLE([taler-wallet], | ||
1033 | [AS_HELP_STRING([--enable-taler-wallet], [only compile for Taler wallet])], | ||
1034 | [taler_only=${enableval}], | ||
1035 | [taler_only=no]) | ||
1036 | AC_MSG_RESULT($taler_only) | ||
1037 | AS_IF([test "x$taler_only" = "xyes"], | ||
1038 | [ | ||
1039 | AM_CONDITIONAL([TALER_ONLY],true) | ||
1040 | AC_DEFINE([TALER_WALLET_ONLY],[1],[Compiling for Taler wallet]) | ||
1041 | ],[ | ||
1042 | AM_CONDITIONAL([TALER_ONLY],false) | ||
1043 | AC_DEFINE([TALER_WALLET_ONLY],[0],[Canonical compilation]) | ||
1044 | ]) | ||
1045 | |||
1046 | # test for libextractor | 1029 | # test for libextractor |
1047 | extractor=0 | 1030 | extractor=0 |
1048 | AC_MSG_CHECKING(for libextractor) | 1031 | AC_MSG_CHECKING(for libextractor) |
@@ -1081,9 +1064,6 @@ AS_IF([test "$extractor" != 1], | |||
1081 | ]) | 1064 | ]) |
1082 | 1065 | ||
1083 | 1066 | ||
1084 | AS_IF([test "$taler_only" != yes],[ | ||
1085 | |||
1086 | |||
1087 | # Check for libltdl header (#2999) | 1067 | # Check for libltdl header (#2999) |
1088 | ltdl=0 | 1068 | ltdl=0 |
1089 | AC_MSG_CHECKING(for libltdl) | 1069 | AC_MSG_CHECKING(for libltdl) |
@@ -1250,10 +1230,6 @@ AS_IF([test "$enable_shared" = "no"], | |||
1250 | LIBS=$SAVE_LIBS | 1230 | LIBS=$SAVE_LIBS |
1251 | 1231 | ||
1252 | 1232 | ||
1253 | # end of taler-only being false | ||
1254 | ]) | ||
1255 | |||
1256 | |||
1257 | # check for iconv | 1233 | # check for iconv |
1258 | AM_ICONV | 1234 | AM_ICONV |
1259 | 1235 | ||
@@ -1262,12 +1238,8 @@ gl_LIBUNISTRING | |||
1262 | AS_IF([test $HAVE_LIBUNISTRING != yes], | 1238 | AS_IF([test $HAVE_LIBUNISTRING != yes], |
1263 | [AC_MSG_ERROR([GNUnet requires libunistring])]) | 1239 | [AC_MSG_ERROR([GNUnet requires libunistring])]) |
1264 | 1240 | ||
1265 | # under emscripten, $gl_libunistring_hexversion is undefined | ||
1266 | if test "$taler_only" != yes; then | ||
1267 | |||
1268 | AS_IF([test "x$gl_libunistring_hexversion" = "x" || test "$gl_libunistring_hexversion" -le 2305], | 1241 | AS_IF([test "x$gl_libunistring_hexversion" = "x" || test "$gl_libunistring_hexversion" -le 2305], |
1269 | [AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])]) | 1242 | [AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])]) |
1270 | fi | ||
1271 | AC_CHECK_HEADERS([unistr.h], | 1243 | AC_CHECK_HEADERS([unistr.h], |
1272 | , | 1244 | , |
1273 | AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed])) | 1245 | AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed])) |
@@ -1340,14 +1312,12 @@ CPPFLAGS=$SAVE_CPPFLAGS | |||
1340 | 1312 | ||
1341 | # test for postgres: | 1313 | # test for postgres: |
1342 | postgres=false | 1314 | postgres=false |
1343 | # even running the check for postgres breaks emscripten | 1315 | AX_LIB_POSTGRESQL([9.5], |
1344 | AS_IF([test "$taler_only" != yes], | 1316 | [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" |
1345 | [AX_LIB_POSTGRESQL([9.5], | 1317 | AC_CHECK_HEADERS([libpq-fe.h], |
1346 | [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" | 1318 | postgres=true) |
1347 | AC_CHECK_HEADERS([libpq-fe.h], | 1319 | ], |
1348 | postgres=true) | 1320 | [AC_MSG_RESULT([no postgres])]) |
1349 | ], | ||
1350 | [AC_MSG_RESULT([no postgres])])]) | ||
1351 | 1321 | ||
1352 | AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) | 1322 | AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) |
1353 | AS_IF([test "x$postgres" = xtrue], | 1323 | AS_IF([test "x$postgres" = xtrue], |