aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-05-13 10:32:09 +0200
committerChristian Grothoff <christian@grothoff.org>2019-05-13 10:32:09 +0200
commit311cada8c06acd023199ffafaeb2d3151aeb4af3 (patch)
treefb7f9c291eca41dcb086542101cef60f56bbc676
parenta07103f6af5eff354b8c1409ad3f1b04a9602e5a (diff)
downloadgnunet-311cada8c06acd023199ffafaeb2d3151aeb4af3.tar.gz
gnunet-311cada8c06acd023199ffafaeb2d3151aeb4af3.zip
use AS_CASE/AS_IF
-rw-r--r--configure.ac230
1 files changed, 90 insertions, 140 deletions
diff --git a/configure.ac b/configure.ac
index 7a1e7d137..cc558b8e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -788,14 +788,14 @@ AC_ARG_ENABLE([taler-wallet],
788 [taler_only=${enableval}], 788 [taler_only=${enableval}],
789 [taler_only=no]) 789 [taler_only=no])
790AC_MSG_RESULT($taler_only) 790AC_MSG_RESULT($taler_only)
791if test "x$taler_only" = "xyes" 791AS_IF([test "x$taler_only" = "xyes"],
792then 792[
793 AM_CONDITIONAL([TALER_ONLY],true) 793 AM_CONDITIONAL([TALER_ONLY],true)
794 AC_DEFINE([TALER_WALLET_ONLY],[1],[Compiling for Taler wallet]) 794 AC_DEFINE([TALER_WALLET_ONLY],[1],[Compiling for Taler wallet])
795else 795],[
796 AM_CONDITIONAL([TALER_ONLY],false) 796 AM_CONDITIONAL([TALER_ONLY],false)
797 AC_DEFINE([TALER_WALLET_ONLY],[0],[Canonical compilation]) 797 AC_DEFINE([TALER_WALLET_ONLY],[0],[Canonical compilation])
798fi 798])
799 799
800# test for libextractor 800# test for libextractor
801extractor=0 801extractor=0
@@ -803,23 +803,20 @@ AC_MSG_CHECKING(for libextractor)
803AC_ARG_WITH(extractor, 803AC_ARG_WITH(extractor,
804 [ --with-extractor=PFX base of libextractor installation], 804 [ --with-extractor=PFX base of libextractor installation],
805 [AC_MSG_RESULT([$with_extractor]) 805 [AC_MSG_RESULT([$with_extractor])
806 case $with_extractor in 806 AS_CASE([$with_extractor],
807 no) 807 [no],[],
808 ;; 808 [yes],[
809 yes)
810 AC_CHECK_HEADERS([extractor.h], 809 AC_CHECK_HEADERS([extractor.h],
811 AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults], 810 AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults],
812 extractor=1)) 811 extractor=1))
813 ;; 812 ],[
814 *)
815 LDFLAGS="-L$with_extractor/lib $LDFLAGS" 813 LDFLAGS="-L$with_extractor/lib $LDFLAGS"
816 CPPFLAGS="-I$with_extractor/include $CPPFLAGS" 814 CPPFLAGS="-I$with_extractor/include $CPPFLAGS"
817 AC_CHECK_HEADERS([extractor.h], 815 AC_CHECK_HEADERS([extractor.h],
818 AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults], 816 AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults],
819 EXT_LIB_PATH="-L$with_extractor/lib $EXT_LIB_PATH" 817 EXT_LIB_PATH="-L$with_extractor/lib $EXT_LIB_PATH"
820 extractor=1)) 818 extractor=1))
821 ;; 819 ])
822 esac
823 ], 820 ],
824 [AC_MSG_RESULT([--with-extractor not specified]) 821 [AC_MSG_RESULT([--with-extractor not specified])
825 AC_CHECK_HEADERS([extractor.h], 822 AC_CHECK_HEADERS([extractor.h],
@@ -828,14 +825,14 @@ AC_ARG_WITH(extractor,
828# restore LIBS 825# restore LIBS
829LIBS=$SAVE_LIBS 826LIBS=$SAVE_LIBS
830 827
831if test "$extractor" != 1 828AS_IF([test "$extractor" != 1],
832then 829 [
833 AM_CONDITIONAL(HAVE_LIBEXTRACTOR, false) 830 AM_CONDITIONAL(HAVE_LIBEXTRACTOR, false)
834 AC_DEFINE([HAVE_LIBEXTRACTOR],[0],[Lacking libextractor]) 831 AC_DEFINE([HAVE_LIBEXTRACTOR],[0],[Lacking libextractor])
835else 832 ],[
836 AM_CONDITIONAL(HAVE_LIBEXTRACTOR, true) 833 AM_CONDITIONAL(HAVE_LIBEXTRACTOR, true)
837 AC_DEFINE([HAVE_LIBEXTRACTOR],[1],[Have libextractor]) 834 AC_DEFINE([HAVE_LIBEXTRACTOR],[1],[Have libextractor])
838fi 835 ])
839 836
840 837
841if test "$taler_only" != yes 838if test "$taler_only" != yes
@@ -847,34 +844,31 @@ AC_MSG_CHECKING(for libltdl)
847AC_ARG_WITH(ltdl, 844AC_ARG_WITH(ltdl,
848 [ --with-ltdl=PFX base of libltdl installation], 845 [ --with-ltdl=PFX base of libltdl installation],
849 [AC_MSG_RESULT([$with_ltdl]) 846 [AC_MSG_RESULT([$with_ltdl])
850 case $with_ltdl in 847 AS_CASE([$with_ltdl],
851 no) 848 [no],[],
852 ;; 849 [yes],[
853 yes)
854 AC_CHECK_HEADERS(ltdl.h, 850 AC_CHECK_HEADERS(ltdl.h,
855 AC_CHECK_LIB([ltdl], [lt_dlopenext], 851 AC_CHECK_LIB([ltdl], [lt_dlopenext],
856 ltdl=1)) 852 ltdl=1))
857 ;; 853 ],[
858 *)
859 LDFLAGS="-L$with_ltdl/lib $LDFLAGS" 854 LDFLAGS="-L$with_ltdl/lib $LDFLAGS"
860 CPPFLAGS="-I$with_ltdl/include $CPPFLAGS" 855 CPPFLAGS="-I$with_ltdl/include $CPPFLAGS"
861 AC_CHECK_HEADERS(ltdl.h, 856 AC_CHECK_HEADERS(ltdl.h,
862 AC_CHECK_LIB([ltdl], [lt_dlopenext], 857 AC_CHECK_LIB([ltdl], [lt_dlopenext],
863 EXT_LIB_PATH="-L$with_ltdl/lib $EXT_LIB_PATH" 858 EXT_LIB_PATH="-L$with_ltdl/lib $EXT_LIB_PATH"
864 ltdl=1)) 859 ltdl=1))
865 ;; 860 ])
866 esac
867 ], 861 ],
868 [AC_MSG_RESULT([--with-ltdl not specified]) 862 [AC_MSG_RESULT([--with-ltdl not specified])
869 AC_CHECK_HEADERS(ltdl.h, 863 AC_CHECK_HEADERS(ltdl.h,
870 AC_CHECK_LIB([ltdl], [lt_dlopenext], 864 AC_CHECK_LIB([ltdl], [lt_dlopenext],
871 ltdl=1))]) 865 ltdl=1))])
872if test x$ltdl = x1 866AS_IF([test x$ltdl = x1],
873then 867[
874 AC_MSG_RESULT([libltdl found]) 868 AC_MSG_RESULT([libltdl found])
875else 869],[
876 AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool), try installing libltdl-dev]) 870 AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool), try installing libltdl-dev])
877fi 871])
878# restore LIBS 872# restore LIBS
879LIBS=$SAVE_LIBS 873LIBS=$SAVE_LIBS
880 874
@@ -999,11 +993,10 @@ AC_CHECK_LIB(z, compress2,
999AC_SUBST(Z_CFLAGS) 993AC_SUBST(Z_CFLAGS)
1000AC_SUBST(Z_LIBS) 994AC_SUBST(Z_LIBS)
1001 995
1002if test "$enable_shared" = "no" 996AS_IF([test "$enable_shared" = "no"],
1003then 997[
1004 AC_MSG_ERROR([GNUnet only works with shared libraries. Sorry.]) 998 AC_MSG_ERROR([GNUnet only works with shared libraries. Sorry.])
1005fi 999])
1006
1007 1000
1008 1001
1009# restore LIBS 1002# restore LIBS
@@ -1017,14 +1010,14 @@ AM_ICONV
1017 1010
1018# test for libunistring 1011# test for libunistring
1019gl_LIBUNISTRING 1012gl_LIBUNISTRING
1020if test $HAVE_LIBUNISTRING != yes; then 1013AS_IF([test $HAVE_LIBUNISTRING != yes],
1021 AC_MSG_ERROR([GNUnet requires libunistring]) 1014 [AC_MSG_ERROR([GNUnet requires libunistring])])
1022fi 1015
1023# under emscripten, $gl_libunistring_hexversion is undefined 1016# under emscripten, $gl_libunistring_hexversion is undefined
1024if test "$taler_only" != yes; then 1017if test "$taler_only" != yes; then
1025if test "x$gl_libunistring_hexversion" = "x" || test "$gl_libunistring_hexversion" -le 2305; then 1018
1026 AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1]) 1019AS_IF([test "x$gl_libunistring_hexversion" = "x" || test "$gl_libunistring_hexversion" -le 2305],
1027fi 1020 [AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])])
1028fi 1021fi
1029AC_CHECK_HEADERS([unistr.h],,AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed])) 1022AC_CHECK_HEADERS([unistr.h],,AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed]))
1030 1023
@@ -1067,14 +1060,12 @@ AC_MSG_CHECKING(for SQLite)
1067AC_ARG_WITH(sqlite, 1060AC_ARG_WITH(sqlite,
1068 [ --with-sqlite=PFX base of SQLite installation], 1061 [ --with-sqlite=PFX base of SQLite installation],
1069 [AC_MSG_RESULT("$with_sqlite") 1062 [AC_MSG_RESULT("$with_sqlite")
1070 case $with_sqlite in 1063 AS_CASE([$with_sqlite],
1071 no) 1064 [no],[],
1072 ;; 1065 [yes],[
1073 yes) 1066 AC_CHECK_HEADERS(sqlite3.h,
1074 AC_CHECK_HEADERS(sqlite3.h, 1067 sqlite=true)],
1075 sqlite=true) 1068 [
1076 ;;
1077 *)
1078 LDFLAGS="-L$with_sqlite/lib $LDFLAGS" 1069 LDFLAGS="-L$with_sqlite/lib $LDFLAGS"
1079 CPPFLAGS="-I$with_sqlite/include $CPPFLAGS" 1070 CPPFLAGS="-I$with_sqlite/include $CPPFLAGS"
1080 AC_CHECK_HEADERS(sqlite3.h, 1071 AC_CHECK_HEADERS(sqlite3.h,
@@ -1084,8 +1075,7 @@ AC_ARG_WITH(sqlite,
1084 sqlite=true) 1075 sqlite=true)
1085 LDFLAGS=$SAVE_LDFLAGS 1076 LDFLAGS=$SAVE_LDFLAGS
1086 CPPFLAGS=$SAVE_CPPFLAGS 1077 CPPFLAGS=$SAVE_CPPFLAGS
1087 ;; 1078 ])
1088 esac
1089 ], 1079 ],
1090 [AC_MSG_RESULT([--with-sqlite not specified]) 1080 [AC_MSG_RESULT([--with-sqlite not specified])
1091 AC_CHECK_HEADERS(sqlite3.h, sqlite=true)]) 1081 AC_CHECK_HEADERS(sqlite3.h, sqlite=true)])
@@ -1116,10 +1106,8 @@ CPPFLAGS=$SAVE_CPPFLAGS
1116AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>]) 1106AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
1117AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>]) 1107AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])
1118 1108
1119if test "$build_target" = "mingw" 1109AS_IF([test "$build_target" = "mingw"]
1120then 1110 [CYGWIN_MYSQL_MAGIC="#include <mysql/my_global.h>"])
1121 CYGWIN_MYSQL_MAGIC="#include <mysql/my_global.h>"
1122fi
1123 1111
1124# test for mysql 1112# test for mysql
1125mysql=false 1113mysql=false
@@ -1130,16 +1118,13 @@ AC_MSG_CHECKING(for mysql)
1130AC_ARG_WITH(mysql, 1118AC_ARG_WITH(mysql,
1131 [ --with-mysql=PFX base of MySQL installation], 1119 [ --with-mysql=PFX base of MySQL installation],
1132 [AC_MSG_RESULT([$with_mysql]) 1120 [AC_MSG_RESULT([$with_mysql])
1133 case $with_mysql in 1121 AS_CASE([$with_mysql],
1134 no) 1122 [no],[],
1135 ;; 1123 [yes|""],[
1136 yes|"")
1137 AC_CHECK_HEADERS(mysql/mysql.h, 1124 AC_CHECK_HEADERS(mysql/mysql.h,
1138 AC_CHECK_LIB(mysqlclient, mysql_init, 1125 AC_CHECK_LIB(mysqlclient, mysql_init,
1139
1140 mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) 1126 mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
1141 ;; 1127 ],[
1142 *)
1143 LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS" 1128 LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
1144 CPPFLAGS="-I$with_mysql/include $CPPFLAGS" 1129 CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
1145 AC_CHECK_HEADERS(mysql/mysql.h, 1130 AC_CHECK_HEADERS(mysql/mysql.h,
@@ -1148,8 +1133,7 @@ AC_ARG_WITH(mysql,
1148 MYSQL_CPPFLAGS="-I$with_mysql/include" 1133 MYSQL_CPPFLAGS="-I$with_mysql/include"
1149 1134
1150 mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) 1135 mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
1151 ;; 1136 ])
1152 esac
1153 ], 1137 ],
1154 [AC_MSG_RESULT([--with-mysql not specified]) 1138 [AC_MSG_RESULT([--with-mysql not specified])
1155 if test -d "/usr/lib64/mysql"; then 1139 if test -d "/usr/lib64/mysql"; then
@@ -1173,8 +1157,8 @@ AC_SUBST(MYSQL_CPPFLAGS)
1173 1157
1174# additional version check for mysql 1158# additional version check for mysql
1175AC_ARG_ENABLE(mysql-version-check, [ --disable-mysql-version-check do not check MySQL version],, enable_mysql_version_check=yes) 1159AC_ARG_ENABLE(mysql-version-check, [ --disable-mysql-version-check do not check MySQL version],, enable_mysql_version_check=yes)
1176if test "$mysql" = "true" -a "x$enable_mysql_version_check" = "xyes" 1160AS_IF([test "$mysql" = "true" -a "x$enable_mysql_version_check" = "xyes"],
1177then 1161 [
1178 AC_MSG_CHECKING(mysql version) 1162 AC_MSG_CHECKING(mysql version)
1179 AC_COMPILE_IFELSE([AC_LANG_PROGRAM( 1163 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
1180 [[$CYGWIN_MYSQL_MAGIC 1164 [[$CYGWIN_MYSQL_MAGIC
@@ -1186,14 +1170,14 @@ then
1186 int main () { return 0; } 1170 int main () { return 0; }
1187 ]]) 1171 ]])
1188 ],mysql=true,mysql=false) 1172 ],mysql=true,mysql=false)
1189 if test "$mysql" = "false" 1173 AS_IF([test "$mysql" = "false"],
1190 then 1174 [
1191 mysqlfail=true 1175 mysqlfail=true
1192 AC_MSG_RESULT([fail, >= 4.1 required]) 1176 AC_MSG_RESULT([fail, >= 4.1 required])
1193 else 1177 ],[
1194 AC_MSG_RESULT(ok) 1178 AC_MSG_RESULT(ok)
1195 fi 1179 ])
1196fi 1180])
1197AM_CONDITIONAL(HAVE_MYSQL, test x$mysql = xtrue) 1181AM_CONDITIONAL(HAVE_MYSQL, test x$mysql = xtrue)
1198AM_CONDITIONAL(HAVE_MYSQLE, false) 1182AM_CONDITIONAL(HAVE_MYSQLE, false)
1199# restore LIBS 1183# restore LIBS
@@ -1201,10 +1185,10 @@ LIBS=$SAVE_LIBS
1201LDFLAGS=$SAVE_LDFLAGS 1185LDFLAGS=$SAVE_LDFLAGS
1202CPPFLAGS=$SAVE_CPPFLAGS 1186CPPFLAGS=$SAVE_CPPFLAGS
1203 1187
1204if test "$sqlite" = 0 -a "$mysql" = 0 1188AS_IF([test "$sqlite" = 0 -a "$mysql" = 0],
1205then 1189[
1206 AC_MSG_ERROR([GNUnet requires SQLite or MySQL]) 1190 AC_MSG_ERROR([GNUnet requires SQLite or MySQL])
1207fi 1191])
1208 1192
1209# libmicrohttpd 1193# libmicrohttpd
1210lmhd=0 1194lmhd=0
@@ -1212,10 +1196,9 @@ AC_MSG_CHECKING([for libmicrohttpd])
1212AC_ARG_WITH(microhttpd, 1196AC_ARG_WITH(microhttpd,
1213 [ --with-microhttpd=PFX base of libmicrohttpd installation], 1197 [ --with-microhttpd=PFX base of libmicrohttpd installation],
1214 [AC_MSG_RESULT([$with_microhttpd]) 1198 [AC_MSG_RESULT([$with_microhttpd])
1215 case $with_microhttpd in 1199 AS_CASE([$with_microhttpd],
1216 no) 1200 [no],[],
1217 ;; 1201 [yes|""],[
1218 yes|"")
1219 AC_CHECK_HEADERS([microhttpd.h], 1202 AC_CHECK_HEADERS([microhttpd.h],
1220 AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, 1203 AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
1221 AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], 1204 AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
@@ -1234,8 +1217,7 @@ AC_ARG_WITH(microhttpd,
1234 [],[#include "$native_srcdir/src/include/platform.h" 1217 [],[#include "$native_srcdir/src/include/platform.h"
1235 #include <microhttpd.h>]),, 1218 #include <microhttpd.h>]),,
1236 [#include "$native_srcdir/src/include/platform.h"]) 1219 [#include "$native_srcdir/src/include/platform.h"])
1237 ;; 1220 ],[
1238 *)
1239 LDFLAGS="-L$with_microhttpd/lib $LDFLAGS" 1221 LDFLAGS="-L$with_microhttpd/lib $LDFLAGS"
1240 CPPFLAGS="-I$with_microhttpd/include $CPPFLAGS" 1222 CPPFLAGS="-I$with_microhttpd/include $CPPFLAGS"
1241 AC_CHECK_HEADERS(microhttpd.h, 1223 AC_CHECK_HEADERS(microhttpd.h,
@@ -1257,8 +1239,7 @@ AC_ARG_WITH(microhttpd,
1257 [],[#include "$native_srcdir/src/include/platform.h" 1239 [],[#include "$native_srcdir/src/include/platform.h"
1258 #include <microhttpd.h>]),, 1240 #include <microhttpd.h>]),,
1259 [#include "$native_srcdir/src/include/platform.h"]) 1241 [#include "$native_srcdir/src/include/platform.h"])
1260 ;; 1242 ])
1261 esac
1262 ], 1243 ],
1263 [AC_MSG_RESULT([--with-microhttpd not specified]) 1244 [AC_MSG_RESULT([--with-microhttpd not specified])
1264 AC_CHECK_HEADERS([microhttpd.h], 1245 AC_CHECK_HEADERS([microhttpd.h],
@@ -1345,13 +1326,13 @@ GN_INTLINCL=""
1345GN_LIBINTL="$LTLIBINTL" 1326GN_LIBINTL="$LTLIBINTL"
1346AC_ARG_ENABLE(framework, [ --enable-framework enable Mac OS X framework build helpers],enable_framework_build=$enableval) 1327AC_ARG_ENABLE(framework, [ --enable-framework enable Mac OS X framework build helpers],enable_framework_build=$enableval)
1347AM_CONDITIONAL(WANT_FRAMEWORK, test x$enable_framework_build = xyes) 1328AM_CONDITIONAL(WANT_FRAMEWORK, test x$enable_framework_build = xyes)
1348if test x$enable_framework_build = xyes 1329AS_IF([test x$enable_framework_build = xyes],
1349then 1330[
1350 AC_DEFINE([FRAMEWORK_BUILD], 1, [Build a Mac OS X Framework]) 1331 AC_DEFINE([FRAMEWORK_BUILD], 1, [Build a Mac OS X Framework])
1351 GN_INTLINCL='-I$(top_srcdir)/src/intlemu' 1332 GN_INTLINCL='-I$(top_srcdir)/src/intlemu'
1352 GN_LIBINTL='$(top_builddir)/src/intlemu/libintlemu.la -framework CoreFoundation' 1333 GN_LIBINTL='$(top_builddir)/src/intlemu/libintlemu.la -framework CoreFoundation'
1353 AC_LIB_APPENDTOVAR([CPPFLAGS], [$GN_INTLINCL]) 1334 AC_LIB_APPENDTOVAR([CPPFLAGS], [$GN_INTLINCL])
1354fi 1335])
1355 1336
1356GN_LIB_LDFLAGS="-export-dynamic -no-undefined" 1337GN_LIB_LDFLAGS="-export-dynamic -no-undefined"
1357GN_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined" 1338GN_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined"
@@ -1380,17 +1361,10 @@ AC_MSG_CHECKING(for sudo)
1380AC_ARG_WITH(sudo, 1361AC_ARG_WITH(sudo,
1381 [ --with-sudo=PATH path to sudo binary (or just yes)], 1362 [ --with-sudo=PATH path to sudo binary (or just yes)],
1382 [AC_MSG_RESULT("$with_sudo") 1363 [AC_MSG_RESULT("$with_sudo")
1383 case $with_sudo in 1364 AS_CASE([$with_sudo],
1384 no) 1365 [no],[SUDO_BINARY=],
1385 SUDO_BINARY= 1366 [yes],[SUDO_BINARY=sudo],
1386 ;; 1367 [SUDO_BINARY=$with_sudo])
1387 yes)
1388 SUDO_BINARY=sudo
1389 ;;
1390 *)
1391 SUDO_BINARY=$with_sudo
1392 ;;
1393 esac
1394 ], 1368 ],
1395 [AC_MSG_RESULT([no])]) 1369 [AC_MSG_RESULT([no])])
1396AC_SUBST(SUDO_BINARY) 1370AC_SUBST(SUDO_BINARY)
@@ -1403,17 +1377,10 @@ AC_MSG_CHECKING(for gnunetdns group name)
1403AC_ARG_WITH(gnunetdns, 1377AC_ARG_WITH(gnunetdns,
1404 [ --with-gnunetdns=GRPNAME name for gnunetdns group], 1378 [ --with-gnunetdns=GRPNAME name for gnunetdns group],
1405 [AC_MSG_RESULT("$with_gnunetdns") 1379 [AC_MSG_RESULT("$with_gnunetdns")
1406 case $with_gnunetdns in 1380 AS_CASE([$with_gnunetdns],
1407 no) 1381 [no],[GNUNETDNS_GROUP=gnunet],
1408 GNUNETDNS_GROUP=gnunet 1382 [yes],[GNUNETDNS_GROUP=gnunetdns],
1409 ;; 1383 [GNUNETDNS_GROUP=$with_gnunetdns])
1410 yes)
1411 GNUNETDNS_GROUP=gnunetdns
1412 ;;
1413 *)
1414 GNUNETDNS_GROUP=$with_gnunetdns
1415 ;;
1416 esac
1417 ], 1384 ],
1418 [AC_MSG_RESULT([gnunetdns])]) 1385 [AC_MSG_RESULT([gnunetdns])])
1419AC_SUBST(GNUNETDNS_GROUP) 1386AC_SUBST(GNUNETDNS_GROUP)
@@ -1427,18 +1394,16 @@ AC_MSG_CHECKING(for gnutls)
1427AC_ARG_WITH(gnutls, 1394AC_ARG_WITH(gnutls,
1428 [ --with-gnutls=PFX base of gnutls installation], 1395 [ --with-gnutls=PFX base of gnutls installation],
1429 [AC_MSG_RESULT([$with_gnutls]) 1396 [AC_MSG_RESULT([$with_gnutls])
1430 case $with_gnutls in 1397 AS_CASE([$with_gnutls],
1431 no) 1398 [no],[],
1432 ;; 1399 [yes],[
1433 yes)
1434 AC_CHECK_HEADERS([gnutls/abstract.h], 1400 AC_CHECK_HEADERS([gnutls/abstract.h],
1435 AC_CHECK_LIB([gnutls], [gnutls_priority_set], 1401 AC_CHECK_LIB([gnutls], [gnutls_priority_set],
1436 gnutls=true)) 1402 gnutls=true))
1437 AC_CHECK_HEADERS([gnutls/dane.h], 1403 AC_CHECK_HEADERS([gnutls/dane.h],
1438 AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw], 1404 AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
1439 gnutls_dane=1)) 1405 gnutls_dane=1))
1440 ;; 1406 ],[
1441 *)
1442 LDFLAGS="-L$with_gnutls/lib $LDFLAGS" 1407 LDFLAGS="-L$with_gnutls/lib $LDFLAGS"
1443 CPPFLAGS="-I$with_gnutls/include $CPPFLAGS" 1408 CPPFLAGS="-I$with_gnutls/include $CPPFLAGS"
1444 AC_CHECK_HEADERS([gnutls/abstract.h], 1409 AC_CHECK_HEADERS([gnutls/abstract.h],
@@ -1448,8 +1413,7 @@ AC_ARG_WITH(gnutls,
1448 AC_CHECK_HEADERS([gnutls/dane.h], 1413 AC_CHECK_HEADERS([gnutls/dane.h],
1449 AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw], 1414 AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
1450 gnutls_dane=1)) 1415 gnutls_dane=1))
1451 ;; 1416 ])
1452 esac
1453 ], 1417 ],
1454 [AC_MSG_RESULT([--with-gnutls not specified]) 1418 [AC_MSG_RESULT([--with-gnutls not specified])
1455 AC_CHECK_HEADERS([gnutls/abstract.h], 1419 AC_CHECK_HEADERS([gnutls/abstract.h],
@@ -1471,12 +1435,9 @@ AC_MSG_CHECKING(if GNUnet is being configured to run on the SuperMUC)
1471AC_ARG_ENABLE([supermuc], 1435AC_ARG_ENABLE([supermuc],
1472 [AS_HELP_STRING([--enable-supermuc], 1436 [AS_HELP_STRING([--enable-supermuc],
1473 [build GNUnet with support to run on the SuperMUC (default is NO)])], 1437 [build GNUnet with support to run on the SuperMUC (default is NO)])],
1474 [if test "x$enable_supermuc" = "xno" 1438 [AS_IF([test "x$enable_supermuc" = "xno"],
1475 then 1439 [supermuc=0],
1476 supermuc=0 1440 [supermuc=1])],
1477 else
1478 supermuc=1
1479 fi],
1480 [supermuc=0 1441 [supermuc=0
1481 enable_supermuc=no]) 1442 enable_supermuc=no])
1482AC_MSG_RESULT($enable_SUPERMUC) 1443AC_MSG_RESULT($enable_SUPERMUC)
@@ -1491,12 +1452,9 @@ AC_ARG_ENABLE([nse-histogram],
1491 [have NSE send timestamp information to testbed logger for generating 1452 [have NSE send timestamp information to testbed logger for generating
1492 histogram of received messages. NOT useful for production (default is 1453 histogram of received messages. NOT useful for production (default is
1493 NO)])], 1454 NO)])],
1494 [if test "x$enableval" = "xno" 1455 [AS_IF([test "x$enableval" = "xno"],
1495 then 1456 [nse_histogram=0],
1496 nse_histogram=0 1457 [nse_histogram=1])],
1497 else
1498 nse_histogram=1
1499 fi],
1500 [nse_histogram=0 1458 [nse_histogram=0
1501 enable_nse_histogram=no]) 1459 enable_nse_histogram=no])
1502AC_MSG_RESULT($enable_nse_histogram) 1460AC_MSG_RESULT($enable_nse_histogram)
@@ -1541,12 +1499,9 @@ AC_ARG_ENABLE([javaports],
1541 [enable_java_ports=${enableval}], 1499 [enable_java_ports=${enableval}],
1542 [enable_java_ports=no]) 1500 [enable_java_ports=no])
1543AC_MSG_RESULT($enable_java_ports) 1501AC_MSG_RESULT($enable_java_ports)
1544if test "x$enable_java_ports" = "xyes" 1502AS_IF([test "x$enable_java_ports" = "xyes"],
1545then 1503 [JAVAPORT=""],
1546 JAVAPORT="" 1504 [JAVAPORT="$UNIXONLY"])
1547else
1548 JAVAPORT="$UNIXONLY"
1549fi
1550AC_SUBST(JAVAPORT) 1505AC_SUBST(JAVAPORT)
1551 1506
1552# should benchmarks be run? 1507# should benchmarks be run?
@@ -1580,12 +1535,9 @@ AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
1580AC_MSG_CHECKING(whether to compile malicious code) 1535AC_MSG_CHECKING(whether to compile malicious code)
1581AC_ARG_ENABLE([malicious], 1536AC_ARG_ENABLE([malicious],
1582 [AS_HELP_STRING([--enable-malicious], [enable compiling malicious code])], 1537 [AS_HELP_STRING([--enable-malicious], [enable compiling malicious code])],
1583 [if test "x$enableval" = "xno" 1538 [AS_IF([test "x$enableval" = "xno"],
1584 then 1539 [malicious=0],
1585 malicious=0 1540 [malicious=1])],
1586 else
1587 malicious=1
1588 fi],
1589 [malicious=0 1541 [malicious=0
1590 enable_malicious=no]) 1542 enable_malicious=no])
1591AC_MSG_RESULT($enable_malicious) 1543AC_MSG_RESULT($enable_malicious)
@@ -1603,10 +1555,8 @@ AC_MSG_CHECKING(whether to start peer's services on demand by default)
1603AC_ARG_ENABLE([autostart], 1555AC_ARG_ENABLE([autostart],
1604 [AS_HELP_STRING([--disable-autostart], [do not start peer's services by default])], 1556 [AS_HELP_STRING([--disable-autostart], [do not start peer's services by default])],
1605 [enable_autostart=${enableval} 1557 [enable_autostart=${enableval}
1606 if test "x$enable_autostart" = "xno" 1558 AS_IF([test "x$enable_autostart" = "xno"],
1607 then 1559 [START_ON_DEMAND="NO"])
1608 START_ON_DEMAND="NO"
1609 fi
1610 ], 1560 ],
1611 [enable_autostart=yes]) 1561 [enable_autostart=yes])
1612AC_MSG_RESULT($enable_autostart) 1562AC_MSG_RESULT($enable_autostart)