diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-06-25 10:06:56 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-06-25 10:06:56 +0000 |
commit | 5f7b5fb33b16a170fde12325150233f1bc014893 (patch) | |
tree | 3288b09252cfb8f5efab3554c3195de282ef27e0 | |
parent | 7d6a6d6b4ebfaae41b05a4a948a89520420fcd11 (diff) | |
download | gnunet-5f7b5fb33b16a170fde12325150233f1bc014893.tar.gz gnunet-5f7b5fb33b16a170fde12325150233f1bc014893.zip |
fix #2901: fail hard if libidn or header are not found
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | src/Makefile.am | 14 |
3 files changed, 8 insertions, 17 deletions
@@ -45,6 +45,7 @@ These are the direct dependencies for running GNUnet: | |||
45 | - libcurl >= 7.21.3 | 45 | - libcurl >= 7.21.3 |
46 | - libunistring >= 0.9.2 | 46 | - libunistring >= 0.9.2 |
47 | - gnutls >= 2.12.0 | 47 | - gnutls >= 2.12.0 |
48 | - libidn >= 1.0 | ||
48 | - libltdl >= 2.2 (part of GNU libtool) | 49 | - libltdl >= 2.2 (part of GNU libtool) |
49 | - sqlite >= 3.0 (default database) | 50 | - sqlite >= 3.0 (default database) |
50 | - mysql >= 5.1 (alternative to sqLite) | 51 | - mysql >= 5.1 (alternative to sqLite) |
diff --git a/configure.ac b/configure.ac index 0f6602f21..db01a1460 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -384,15 +384,13 @@ if test "$libidn" != "no"; then | |||
384 | CPPFLAGS="${CPPFLAGS} -I$libidn/include" | 384 | CPPFLAGS="${CPPFLAGS} -I$libidn/include" |
385 | fi | 385 | fi |
386 | AC_CHECK_HEADER(idna.h, | 386 | AC_CHECK_HEADER(idna.h, |
387 | AC_CHECK_LIB(idn, stringprep_check_version, | 387 | AC_CHECK_LIB(idn, stringprep_check_version, |
388 | [libidn=yes LIBS="${LIBS} -lidn"], libidn=no), | 388 | [libidn=yes LIBS="${LIBS} -lidn"], |
389 | libidn=no) | 389 | AC_MSG_FAILURE([GNUnet requires libidn])), |
390 | AC_MSG_FAILURE([GNUnet requires libidn])) | ||
390 | fi | 391 | fi |
391 | AM_CONDITIONAL([HAVE_LIBIDN], [test "$libidn" != "no"]) | ||
392 | AC_MSG_RESULT($libidn) | 392 | AC_MSG_RESULT($libidn) |
393 | 393 | ||
394 | |||
395 | |||
396 | # restore LIBS | 394 | # restore LIBS |
397 | LIBS=$SAVE_LIBS | 395 | LIBS=$SAVE_LIBS |
398 | 396 | ||
diff --git a/src/Makefile.am b/src/Makefile.am index 62a08cb5a..22b24b9bf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -2,24 +2,16 @@ | |||
2 | # INTLEMU_SUBDIRS = intlemu | 2 | # INTLEMU_SUBDIRS = intlemu |
3 | #endif | 3 | #endif |
4 | 4 | ||
5 | if HAVE_LIBIDN | ||
6 | EXIT = exit | ||
7 | PT = pt | ||
8 | else | ||
9 | EXIT = | ||
10 | PT = | ||
11 | endif | ||
12 | |||
13 | if HAVE_EXPERIMENTAL | 5 | if HAVE_EXPERIMENTAL |
14 | EXP_DIR = gns set dv consensus experimentation | 6 | EXP_DIR = gns set dv consensus experimentation |
15 | endif | 7 | endif |
16 | 8 | ||
17 | if LINUX | 9 | if LINUX |
18 | # All of these currently only work on GNU/Linux | 10 | # All of these currently only work on GNU/Linux or W32 |
19 | LINUX_DIR = $(EXIT) vpn $(PT) | 11 | LINUX_DIR = exit vpn pt |
20 | endif | 12 | endif |
21 | if MINGW | 13 | if MINGW |
22 | MINGW_DIR = vpn $(EXIT) | 14 | MINGW_DIR = vpn exit pt |
23 | endif | 15 | endif |
24 | 16 | ||
25 | if HAVE_MYSQL | 17 | if HAVE_MYSQL |