1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
|
Description: Fix build with new gettext
Since 0.20 version of gettext usage of AM_GNU_GETTEXT([external]) is only
recommended form.
This patch should be added into next upstream version.
Author: Andriy Grytsenko <andrej@rep.kiev.ua>
Bug-Debian: https://bugs.debian.org/978347
Forwarded: not-needed
Last-Update: 2020-12-30
--- a/configure.ac
+++ b/configure.ac
@@ -332,6 +332,8 @@
AM_CONDITIONAL([STATICBUILD], [test x$fe_cv_static = xyes])
dnl Checks for library functions.
+AC_FUNC_ALLOCA
+
AC_CHECK_FUNCS(rename sigaction strncasecmp towlower)
AC_CACHE_CHECK([whether you need libcrypt], ac_cv_need_libcrypt,
@@ -376,8 +378,8 @@
AC_SUBST(MODLIBS)
AC_SUBST(STATICLIBS)
-AM_GNU_GETTEXT
-AC_MSG_CACHE_ADD([Use included libintl], [$USE_INCLUDED_LIBINTL])
+AM_GNU_GETTEXT([external])
+# AC_MSG_CACHE_ADD([Use included libintl], [$USE_INCLUDED_LIBINTL])
AC_SYS_LONG_FILE_NAMES
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign 1.5 no-dist-gzip dist-xz
-SUBDIRS = doc intl help po scripts tree modules core ui
+SUBDIRS = doc help po scripts tree modules core ui
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = foxeye.pc
--- a/core/socket.c
+++ b/core/socket.c
@@ -952,7 +952,7 @@
#ifdef HAVE_ALLOCA
d.pollfd = alloca(_pfdnum * sizeof(struct pollfd));
#else
- d.pollfd = safe_alloc(_pfdnum * sizeof(struct pollfd));
+ d.pollfd = safe_malloc(_pfdnum * sizeof(struct pollfd));
pthread_cleanup_push((void(*)(void *))&safe_free, (void *)&d.pollfd);
#endif
memset(d.pollfd, 0, _pfdnum * sizeof(struct pollfd));
|