diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-05-13 10:09:26 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-05-13 10:09:26 +0200 |
commit | a07103f6af5eff354b8c1409ad3f1b04a9602e5a (patch) | |
tree | 70744dd903887ace6fe3276d4c58005cf7effa73 /configure.ac | |
parent | 321c6b87981c455809251d567fe23476f0ad7e71 (diff) | |
download | gnunet-a07103f6af5eff354b8c1409ad3f1b04a9602e5a.tar.gz gnunet-a07103f6af5eff354b8c1409ad3f1b04a9602e5a.zip |
use AS_CASE/AS_IF
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 156 |
1 files changed, 70 insertions, 86 deletions
diff --git a/configure.ac b/configure.ac index 815c015f3..7a1e7d137 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -75,8 +75,8 @@ OLD_LDFLAGS="$LDFLAGS" | |||
75 | LDFLAGS="$LDFLAGS -Wl,--unresolved-symbols=report-all" | 75 | LDFLAGS="$LDFLAGS -Wl,--unresolved-symbols=report-all" |
76 | 76 | ||
77 | # Check system type | 77 | # Check system type |
78 | case "$host_os" in | 78 | AS_CASE(["$host_os"], |
79 | *darwin* | *rhapsody* | *macosx*) | 79 | [*darwin* | *rhapsody* | *macosx*],[ |
80 | AC_DEFINE_UNQUOTED(DARWIN,1,[This is an Apple Darwin system]) | 80 | AC_DEFINE_UNQUOTED(DARWIN,1,[This is an Apple Darwin system]) |
81 | CPPFLAGS="-D_APPLE_C_SOURCE $CPPFLAGS" | 81 | CPPFLAGS="-D_APPLE_C_SOURCE $CPPFLAGS" |
82 | CFLAGS="-fno-common $CFLAGS" | 82 | CFLAGS="-fno-common $CFLAGS" |
@@ -88,16 +88,16 @@ case "$host_os" in | |||
88 | LIBPREFIX= | 88 | LIBPREFIX= |
89 | DLLDIR=lib | 89 | DLLDIR=lib |
90 | UNIXONLY="#" | 90 | UNIXONLY="#" |
91 | ;; | 91 | ], |
92 | linux*) | 92 | [linux*],[ |
93 | AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux kernel]) | 93 | AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux kernel]) |
94 | build_target="linux" | 94 | build_target="linux" |
95 | LIBPREFIX= | 95 | LIBPREFIX= |
96 | DLLDIR=lib | 96 | DLLDIR=lib |
97 | UNIXONLY="#" | 97 | UNIXONLY="#" |
98 | AC_PATH_XTRA | 98 | AC_PATH_XTRA |
99 | ;; | 99 | ], |
100 | *freebsd*) | 100 | [*freebsd*],[ |
101 | AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) | 101 | AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) |
102 | AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system]) | 102 | AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system]) |
103 | CFLAGS="-D_THREAD_SAFE $CFLAGS" | 103 | CFLAGS="-D_THREAD_SAFE $CFLAGS" |
@@ -105,8 +105,8 @@ linux*) | |||
105 | LIBPREFIX= | 105 | LIBPREFIX= |
106 | DLLDIR=lib | 106 | DLLDIR=lib |
107 | UNIXONLY="#" | 107 | UNIXONLY="#" |
108 | ;; | 108 | ], |
109 | *openbsd*) | 109 | [*openbsd*],[ |
110 | AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) | 110 | AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) |
111 | AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system]) | 111 | AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system]) |
112 | LIBS=`echo $LIBS | sed -e "s/-ldl//"` | 112 | LIBS=`echo $LIBS | sed -e "s/-ldl//"` |
@@ -114,15 +114,15 @@ linux*) | |||
114 | LIBPREFIX= | 114 | LIBPREFIX= |
115 | DLLDIR=lib | 115 | DLLDIR=lib |
116 | UNIXONLY="#" | 116 | UNIXONLY="#" |
117 | ;; | 117 | ], |
118 | *netbsd*) | 118 | [*netbsd*],[ |
119 | AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) | 119 | AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) |
120 | AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system]) | 120 | AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system]) |
121 | LIBPREFIX= | 121 | LIBPREFIX= |
122 | DLLDIR=lib | 122 | DLLDIR=lib |
123 | UNIXONLY="#" | 123 | UNIXONLY="#" |
124 | ;; | 124 | ], |
125 | *solaris*) | 125 | [*solaris*],[ |
126 | AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system]) | 126 | AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system]) |
127 | AC_DEFINE_UNQUOTED(_REENTRANT,1,[Need with solaris or errno doesnt work]) | 127 | AC_DEFINE_UNQUOTED(_REENTRANT,1,[Need with solaris or errno doesnt work]) |
128 | AC_CHECK_LIB(resolv, res_init) | 128 | AC_CHECK_LIB(resolv, res_init) |
@@ -131,16 +131,16 @@ linux*) | |||
131 | LIBPREFIX= | 131 | LIBPREFIX= |
132 | DLLDIR=lib | 132 | DLLDIR=lib |
133 | UNIXONLY="#" | 133 | UNIXONLY="#" |
134 | ;; | 134 | ], |
135 | *arm-linux*) | 135 | [*arm-linux*],[ |
136 | AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux kernel]) | 136 | AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux kernel]) |
137 | CFLAGS="-D_REENTRANT -fPIC -pipe $CFLAGS" | 137 | CFLAGS="-D_REENTRANT -fPIC -pipe $CFLAGS" |
138 | build_target="linux" | 138 | build_target="linux" |
139 | LIBPREFIX= | 139 | LIBPREFIX= |
140 | DLLDIR=lib | 140 | DLLDIR=lib |
141 | UNIXONLY="#" | 141 | UNIXONLY="#" |
142 | ;; | 142 | ], |
143 | *cygwin*) | 143 | [*cygwin*],[ |
144 | AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) | 144 | AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) |
145 | AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) | 145 | AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) |
146 | AC_CHECK_LIB(intl, gettext) | 146 | AC_CHECK_LIB(intl, gettext) |
@@ -150,8 +150,8 @@ linux*) | |||
150 | DLLDIR=bin | 150 | DLLDIR=bin |
151 | AC_PROG_CXX | 151 | AC_PROG_CXX |
152 | UNIXONLY="" | 152 | UNIXONLY="" |
153 | ;; | 153 | ], |
154 | *mingw*) | 154 | [*mingw*],[ |
155 | AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) | 155 | AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) |
156 | AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) | 156 | AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) |
157 | AC_DEFINE_UNQUOTED(_WIN32,1,[This is a Windows system]) | 157 | AC_DEFINE_UNQUOTED(_WIN32,1,[This is a Windows system]) |
@@ -167,18 +167,17 @@ linux*) | |||
167 | UNIXONLY="" | 167 | UNIXONLY="" |
168 | funcstocheck="" | 168 | funcstocheck="" |
169 | native_srcdir=$(cd $srcdir; pwd -W) | 169 | native_srcdir=$(cd $srcdir; pwd -W) |
170 | ;; | 170 | ], |
171 | gnu*) | 171 | [gnu*],[ |
172 | AC_DEFINE_UNQUOTED(GNU,1,[This is a GNU system]) | 172 | AC_DEFINE_UNQUOTED(GNU,1,[This is a GNU system]) |
173 | build_target="gnu" | 173 | build_target="gnu" |
174 | UNIXONLY="#" | 174 | UNIXONLY="#" |
175 | ;; | 175 | ], |
176 | *) | 176 | [ |
177 | AC_MSG_RESULT(Unrecognised OS $host_os) | 177 | AC_MSG_RESULT(Unrecognised OS $host_os) |
178 | AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS]) | 178 | AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS]) |
179 | UNIXONLY="" | 179 | UNIXONLY="" |
180 | ;; | 180 | ]) |
181 | esac | ||
182 | AC_DEFINE_UNQUOTED([GNUNET_DEFAULT_INTERFACE], $DEFAULT_INTERFACE, [This should be the default choice for the name of the first network interface]) | 181 | AC_DEFINE_UNQUOTED([GNUNET_DEFAULT_INTERFACE], $DEFAULT_INTERFACE, [This should be the default choice for the name of the first network interface]) |
183 | AC_SUBST(DEFAULT_INTERFACE) | 182 | AC_SUBST(DEFAULT_INTERFACE) |
184 | 183 | ||
@@ -380,21 +379,21 @@ AC_ARG_ENABLE([texi2mdoc-generation], | |||
380 | [texi2mdoc_generation=${enableval}], | 379 | [texi2mdoc_generation=${enableval}], |
381 | [texi2mdoc_generation=no]) | 380 | [texi2mdoc_generation=no]) |
382 | AC_MSG_RESULT($texi2mdoc_generation) | 381 | AC_MSG_RESULT($texi2mdoc_generation) |
383 | if test "x$texi2mdoc_generation" = "xyes" | 382 | AS_IF([test "x$texi2mdoc_generation" = "xyes"], |
384 | then | 383 | [ |
385 | if test "$texi2mdoc" = 0 | 384 | AS_IF([test "$texi2mdoc" = 0], |
386 | then | 385 | [ |
387 | AC_MSG_WARN([ERROR: mdoc output currently requires texi2mdoc.]) | 386 | AC_MSG_WARN([ERROR: mdoc output currently requires texi2mdoc.]) |
388 | AC_MSG_WARN([ERROR: texi2mdoc can be obtained via your Operating System]) | 387 | AC_MSG_WARN([ERROR: texi2mdoc can be obtained via your Operating System]) |
389 | AC_MSG_WARN([ERROR: package manager or from https://mandoc.bsd.lv/texi2mdoc/]) | 388 | AC_MSG_WARN([ERROR: package manager or from https://mandoc.bsd.lv/texi2mdoc/]) |
390 | else | 389 | ],[ |
391 | AM_CONDITIONAL([TEXI2MDOC_GENERATION],true) | 390 | AM_CONDITIONAL([TEXI2MDOC_GENERATION],true) |
392 | AC_DEFINE([TEXI2MDOC_GENERATION],[1],[Building section 7 mdoc output]) | 391 | AC_DEFINE([TEXI2MDOC_GENERATION],[1],[Building section 7 mdoc output]) |
393 | fi | 392 | ]) |
394 | else | 393 | ],[ |
395 | AM_CONDITIONAL([TEXI2MDOC_GENERATION],false) | 394 | AM_CONDITIONAL([TEXI2MDOC_GENERATION],false) |
396 | AC_DEFINE([TEXI2MDOC_GENERATION],[0],[Not building section 7 mdoc output]) | 395 | AC_DEFINE([TEXI2MDOC_GENERATION],[0],[Not building section 7 mdoc output]) |
397 | fi | 396 | ]) |
398 | 397 | ||
399 | # should the build process be building only the documentation? | 398 | # should the build process be building only the documentation? |
400 | AC_MSG_CHECKING(whether to build only documentation) | 399 | AC_MSG_CHECKING(whether to build only documentation) |
@@ -480,8 +479,8 @@ AS_IF([test ! "x$enable_poisoning" = "xno"], | |||
480 | [enable_poisoning=0]) | 479 | [enable_poisoning=0]) |
481 | AC_DEFINE_UNQUOTED([ENABLE_POISONING],[$enable_poisoning],[1 if freed memory should be poisoned, 0 otherwise]) | 480 | AC_DEFINE_UNQUOTED([ENABLE_POISONING],[$enable_poisoning],[1 if freed memory should be poisoned, 0 otherwise]) |
482 | 481 | ||
483 | if test $build = $target | 482 | AS_IF([test $build = $target], |
484 | then | 483 | [ |
485 | AC_MSG_CHECKING([for working HMAC]) | 484 | AC_MSG_CHECKING([for working HMAC]) |
486 | AC_LANG_PUSH(C) | 485 | AC_LANG_PUSH(C) |
487 | LIBS="$LIBS $LIBGCRYPT_LIBS" | 486 | LIBS="$LIBS $LIBGCRYPT_LIBS" |
@@ -548,22 +547,17 @@ AC_RUN_IFELSE( | |||
548 | ], | 547 | ], |
549 | [AC_MSG_RESULT([cross compiling, test skipped])]) | 548 | [AC_MSG_RESULT([cross compiling, test skipped])]) |
550 | AC_LANG_POP(C) | 549 | AC_LANG_POP(C) |
551 | fi # $build = $target | 550 | ]) # $build = $target |
552 | 551 | ||
553 | # check for bluetooth library | 552 | # check for bluetooth library |
554 | bluetooth=0 | 553 | bluetooth=0 |
555 | AC_CHECK_LIB(bluetooth, ba2str,[AC_CHECK_HEADER([bluetooth/bluetooth.h],bluetooth=1)]) | 554 | AC_CHECK_LIB(bluetooth, ba2str,[AC_CHECK_HEADER([bluetooth/bluetooth.h],bluetooth=1)]) |
556 | if test "$build_target" = "mingw" | 555 | AS_IF([test "$build_target" = "mingw"], |
557 | then | 556 | [bluetooth=1]) |
558 | bluetooth=1 | ||
559 | fi | ||
560 | AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1]) | 557 | AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1]) |
561 | if test "$bluetooth" = 1 | 558 | AS_IF([test "$bluetooth" = 1], |
562 | then | 559 | [AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])], |
563 | AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library]) | 560 | [AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library])]) |
564 | else | ||
565 | AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library]) | ||
566 | fi | ||
567 | 561 | ||
568 | # check for zbar library | 562 | # check for zbar library |
569 | zbar=0 | 563 | zbar=0 |
@@ -571,23 +565,20 @@ AC_MSG_CHECKING(for libzbar) | |||
571 | AC_ARG_WITH(zbar, | 565 | AC_ARG_WITH(zbar, |
572 | [ --with-zbar=PFX base of libzbar installation], | 566 | [ --with-zbar=PFX base of libzbar installation], |
573 | [AC_MSG_RESULT([$with_zbar]) | 567 | [AC_MSG_RESULT([$with_zbar]) |
574 | case $with_zbar in | 568 | AS_CASE([$with_zbar], |
575 | no) | 569 | [no],[], |
576 | ;; | 570 | [yes],[ |
577 | yes) | ||
578 | AC_CHECK_HEADERS(zbar.h, | 571 | AC_CHECK_HEADERS(zbar.h, |
579 | AC_CHECK_LIB([zbar], [zbar_processor_create], | 572 | AC_CHECK_LIB([zbar], [zbar_processor_create], |
580 | zbar=1)) | 573 | zbar=1)) |
581 | ;; | 574 | ],[ |
582 | *) | ||
583 | LDFLAGS="-L$with_zbar/lib $LDFLAGS" | 575 | LDFLAGS="-L$with_zbar/lib $LDFLAGS" |
584 | CPPFLAGS="-I$with_zbar/include $CPPFLAGS" | 576 | CPPFLAGS="-I$with_zbar/include $CPPFLAGS" |
585 | AC_CHECK_HEADERS(zbar.h, | 577 | AC_CHECK_HEADERS(zbar.h, |
586 | AC_CHECK_LIB([zbar], [zbar_processor_create], | 578 | AC_CHECK_LIB([zbar], [zbar_processor_create], |
587 | EXT_LIB_PATH="-L$with_zbar/lib $EXT_LIB_PATH" | 579 | EXT_LIB_PATH="-L$with_zbar/lib $EXT_LIB_PATH" |
588 | zbar=1)) | 580 | zbar=1)) |
589 | ;; | 581 | ]) |
590 | esac | ||
591 | ], | 582 | ], |
592 | [AC_MSG_RESULT([--with-zbar not specified]) | 583 | [AC_MSG_RESULT([--with-zbar not specified]) |
593 | AC_CHECK_HEADERS(zbar.h, | 584 | AC_CHECK_HEADERS(zbar.h, |
@@ -604,23 +595,20 @@ AC_MSG_CHECKING(for libjansson) | |||
604 | AC_ARG_WITH(jansson, | 595 | AC_ARG_WITH(jansson, |
605 | [ --with-jansson=PFX base of libjansson installation], | 596 | [ --with-jansson=PFX base of libjansson installation], |
606 | [AC_MSG_RESULT([$with_jansson]) | 597 | [AC_MSG_RESULT([$with_jansson]) |
607 | case $with_jansson in | 598 | AS_CASE([$with_jansson], |
608 | no) | 599 | [no],[], |
609 | ;; | 600 | [yes],[ |
610 | yes) | ||
611 | AC_CHECK_HEADERS(jansson.h, | 601 | AC_CHECK_HEADERS(jansson.h, |
612 | AC_CHECK_LIB([jansson], [json_loads], | 602 | AC_CHECK_LIB([jansson], [json_loads], |
613 | jansson=1)) | 603 | jansson=1)) |
614 | ;; | 604 | ],[ |
615 | *) | ||
616 | LDFLAGS="-L$with_jansson/lib $LDFLAGS" | 605 | LDFLAGS="-L$with_jansson/lib $LDFLAGS" |
617 | CPPFLAGS="-I$with_jansson/include $CPPFLAGS" | 606 | CPPFLAGS="-I$with_jansson/include $CPPFLAGS" |
618 | AC_CHECK_HEADERS(jansson.h, | 607 | AC_CHECK_HEADERS(jansson.h, |
619 | AC_CHECK_LIB([jansson], [json_loads], | 608 | AC_CHECK_LIB([jansson], [json_loads], |
620 | EXT_LIB_PATH="-L$with_jansson/lib $EXT_LIB_PATH" | 609 | EXT_LIB_PATH="-L$with_jansson/lib $EXT_LIB_PATH" |
621 | jansson=1)) | 610 | jansson=1)) |
622 | ;; | 611 | ]) |
623 | esac | ||
624 | ], | 612 | ], |
625 | [AC_MSG_RESULT([--with-jansson not specified]) | 613 | [AC_MSG_RESULT([--with-jansson not specified]) |
626 | AC_CHECK_HEADERS(jansson.h, | 614 | AC_CHECK_HEADERS(jansson.h, |
@@ -693,27 +681,24 @@ PKG_CHECK_MODULES( | |||
693 | [gst=0]) | 681 | [gst=0]) |
694 | 682 | ||
695 | # Pulse Audio | 683 | # Pulse Audio |
696 | if test "x$pulse" != "x1" -o "x$opus" != "x1" -o "x$ogg" != "x1" | 684 | AS_IF([test "x$pulse" != "x1" -o "x$opus" != "x1" -o "x$ogg" != "x1"],[ |
697 | then | 685 | AS_IF([test "x$gst" != "x1"],[ |
698 | if test "x$gst" != "x1" | ||
699 | then | ||
700 | conversation_backend=none | 686 | conversation_backend=none |
701 | AM_CONDITIONAL(BUILD_PULSE_HELPERS, false) | 687 | AM_CONDITIONAL(BUILD_PULSE_HELPERS, false) |
702 | AM_CONDITIONAL(BUILD_GST_HELPERS, false) | 688 | AM_CONDITIONAL(BUILD_GST_HELPERS, false) |
703 | AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false) | 689 | AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false) |
704 | else | 690 | ],[ |
705 | conversation_backend=gst | 691 | conversation_backend=gst |
706 | AM_CONDITIONAL(BUILD_PULSE_HELPERS, false) | 692 | AM_CONDITIONAL(BUILD_PULSE_HELPERS, false) |
707 | AM_CONDITIONAL(BUILD_GST_HELPERS, true) | 693 | AM_CONDITIONAL(BUILD_GST_HELPERS, true) |
708 | AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false) | 694 | AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false) |
709 | fi | 695 | ]) |
710 | else | 696 | ],[ |
711 | |||
712 | conversation_backend=pulse | 697 | conversation_backend=pulse |
713 | AM_CONDITIONAL(BUILD_PULSE_HELPERS, true) | 698 | AM_CONDITIONAL(BUILD_PULSE_HELPERS, true) |
714 | AM_CONDITIONAL(BUILD_GST_HELPERS, false) | 699 | AM_CONDITIONAL(BUILD_GST_HELPERS, false) |
715 | AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false) | 700 | AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false) |
716 | fi | 701 | ]) |
717 | 702 | ||
718 | # libgnurl | 703 | # libgnurl |
719 | LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0) | 704 | LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0) |
@@ -724,15 +709,14 @@ LIBS="$LIBGNURL $LIBCURL $LIBS" | |||
724 | 709 | ||
725 | # libcurl-gnutls | 710 | # libcurl-gnutls |
726 | LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false]) | 711 | LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false]) |
727 | if test "x$curl" = xtrue | 712 | AS_IF([test "x$curl" = xtrue],[ |
728 | then | ||
729 | AC_CHECK_HEADER([curl/curl.h], | 713 | AC_CHECK_HEADER([curl/curl.h], |
730 | AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include <curl/curl.h>]]), | 714 | AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include <curl/curl.h>]]), |
731 | [curl=false]) | 715 | [curl=false]) |
732 | # need libcurl-gnutls.so, everything else is not acceptable | 716 | # need libcurl-gnutls.so, everything else is not acceptable |
733 | AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],,[curl=false]) | 717 | AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],,[curl=false]) |
734 | # cURL must support CURLINFO_TLS_SESSION, version >= 7.34 | 718 | # cURL must support CURLINFO_TLS_SESSION, version >= 7.34 |
735 | fi | 719 | ]) |
736 | 720 | ||
737 | # libcurl and libgnurl should be mutually exclusive | 721 | # libcurl and libgnurl should be mutually exclusive |
738 | AS_IF([test "$gnurl" = 1], | 722 | AS_IF([test "$gnurl" = 1], |
@@ -763,22 +747,22 @@ AC_CHECK_HEADERS([glpk.h],[glpk=true],[glpk=false]) | |||
763 | AC_CHECK_LIB([glpk],[glp_init_env],,[glpk=false]) | 747 | AC_CHECK_LIB([glpk],[glp_init_env],,[glpk=false]) |
764 | # GLPK must support atm MLP presolving, version >= 4.32 | 748 | # GLPK must support atm MLP presolving, version >= 4.32 |
765 | AC_CHECK_MEMBERS(glp_iocp.presolve,,[glpk=false],[[#include <glpk.h>]]) | 749 | AC_CHECK_MEMBERS(glp_iocp.presolve,,[glpk=false],[[#include <glpk.h>]]) |
766 | if test "x$glpk" = xfalse | 750 | AS_IF([test "x$glpk" = xfalse], |
767 | then | 751 | [ |
768 | AM_CONDITIONAL(HAVE_LIBGLPK, false) | 752 | AM_CONDITIONAL(HAVE_LIBGLPK, false) |
769 | AC_MSG_WARN([ERROR: GNUnet requires GLPK >= 4.32]) | 753 | AC_MSG_WARN([ERROR: GNUnet requires GLPK >= 4.32]) |
770 | else | 754 | ],[ |
771 | AM_CONDITIONAL(HAVE_LIBGLPK, true) | 755 | AM_CONDITIONAL(HAVE_LIBGLPK, true) |
772 | AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK]) | 756 | AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK]) |
773 | fi | 757 | ]) |
774 | 758 | ||
775 | 759 | ||
776 | AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false]) | 760 | AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false]) |
777 | if test x$nss = xfalse | 761 | AS_IF([test x$nss = xfalse], |
778 | then | 762 | [ |
779 | AM_CONDITIONAL(HAVE_GLIBCNSS, false) | 763 | AM_CONDITIONAL(HAVE_GLIBCNSS, false) |
780 | AC_MSG_WARN([No GNU libc nss header, will not build NSS plugin]) | 764 | AC_MSG_WARN([No GNU libc nss header, will not build NSS plugin]) |
781 | else | 765 | ],[ |
782 | NSS_INCLUDES=" | 766 | NSS_INCLUDES=" |
783 | #include <nss.h> | 767 | #include <nss.h> |
784 | " | 768 | " |
@@ -787,7 +771,7 @@ else | |||
787 | [AM_CONDITIONAL(HAVE_GLIBCNSS, false) | 771 | [AM_CONDITIONAL(HAVE_GLIBCNSS, false) |
788 | AC_MSG_WARN([No nss header fails to define NSS_STATUS_UNAVAIl, will not build NSS plugin])], | 772 | AC_MSG_WARN([No nss header fails to define NSS_STATUS_UNAVAIl, will not build NSS plugin])], |
789 | [$NSS_INCLUDES]) | 773 | [$NSS_INCLUDES]) |
790 | fi | 774 | ]) |
791 | 775 | ||
792 | 776 | ||
793 | 777 | ||