aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-11-25 23:50:13 +0100
committerChristian Grothoff <christian@grothoff.org>2021-11-25 23:50:13 +0100
commit04166afcb4ed833056355e1fdf793055f3a65d44 (patch)
tree8b548522603071ef4c34e6b679586d72588937a7
parent2a52d39a20ecc7537a8b890ed611f16dbc7dd8eb (diff)
downloadgnunet-04166afcb4ed833056355e1fdf793055f3a65d44.tar.gz
gnunet-04166afcb4ed833056355e1fdf793055f3a65d44.zip
fix configure.ac issues with autoconf 2.69
-rw-r--r--configure.ac16
-rw-r--r--po/POTFILES.in1
2 files changed, 4 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index 840bc48d3..f5feae72c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -994,7 +994,7 @@ AS_IF([test "x$mysql" = "xtrue"],
994 [mysql=false]) 994 [mysql=false])
995 AS_IF([test "x$mysql" = "xfalse"], 995 AS_IF([test "x$mysql" = "xfalse"],
996 [AC_MSG_RESULT([< 4.1]) 996 [AC_MSG_RESULT([< 4.1])
997 AC_MSG_ERROR([mysql version >= 4.1 required])]) 997 AC_MSG_RESULT([mysql version >= 4.1 required. Will not use MySQL])])
998 AC_COMPILE_IFELSE([AC_LANG_PROGRAM( 998 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
999 [[#include <mysql/mysql_version.h>]], 999 [[#include <mysql/mysql_version.h>]],
1000 [[#if (MYSQL_VERSION_ID < 80000) 1000 [[#if (MYSQL_VERSION_ID < 80000)
@@ -1098,13 +1098,7 @@ AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdarg.h signal.h loca
1098 [AC_MSG_ERROR([Compiling GNUnet requires standard UNIX header files])]) 1098 [AC_MSG_ERROR([Compiling GNUnet requires standard UNIX header files])])
1099 1099
1100# Check for headers required only on some systems or which are optional 1100# Check for headers required only on some systems or which are optional
1101AC_CHECK_HEADERS([stdatomic.h malloc.h malloc/malloc.h malloc/malloc_np.h 1101AC_CHECK_HEADERS([stdatomic.h malloc.h malloc/malloc.h malloc/malloc_np.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/time.h sys/sysinfo.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h sys/timeb.h argz.h ucred.h sys/ucred.h endian.h sys/endian.h execinfo.h byteswap.h])
1102 langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h
1103 sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h
1104 libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h
1105 sys/time.h sys/sysinfo.h sys/file.h sys/resource.h
1106 ifaddrs.h mach/mach.h sys/timeb.h argz.h ucred.h
1107 sys/ucred.h endian.h sys/endian.h execinfo.h byteswap.h])
1108 1102
1109# Required for FreeBSD's netinet/in_systm.h and netinet/ip.h 1103# Required for FreeBSD's netinet/in_systm.h and netinet/ip.h
1110AS_IF([test "x$build_target" = "xfreebsd"], 1104AS_IF([test "x$build_target" = "xfreebsd"],
@@ -1156,11 +1150,7 @@ AC_TYPE_UID_T
1156# check for library functions 1150# check for library functions
1157AC_FUNC_FORK 1151AC_FUNC_FORK
1158AC_FUNC_CHOWN 1152AC_FUNC_CHOWN
1159AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf 1153AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid getifaddrs freeifaddrs getresgid mallinfo2 malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs wait4 timegm])
1160 initgroups strndup gethostbyname2 getpeerucred getpeereid
1161 setresuid getifaddrs freeifaddrs getresgid mallinfo2 malloc_size
1162 malloc_usable_size getrusage random srandom stat statfs statvfs
1163 wait4 timegm])
1164 1154
1165GN_INTLINCL="" 1155GN_INTLINCL=""
1166GN_LIBINTL="$LTLIBINTL" 1156GN_LIBINTL="$LTLIBINTL"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ef74c2472..469b19219 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -230,6 +230,7 @@ src/messenger/messenger_api_list_tunnels.c
230src/messenger/messenger_api_message.c 230src/messenger/messenger_api_message.c
231src/messenger/messenger_api_room.c 231src/messenger/messenger_api_room.c
232src/messenger/messenger_api_util.c 232src/messenger/messenger_api_util.c
233src/messenger/plugin_gnsrecord_messenger.c
233src/messenger/testing_messenger_barrier.c 234src/messenger/testing_messenger_barrier.c
234src/messenger/testing_messenger_setup.c 235src/messenger/testing_messenger_setup.c
235src/my/my.c 236src/my/my.c