Compare commits

...

3 Commits

Author SHA1 Message Date
Ting-Wei Lan
0b42b6bd90 Check for kinfo_getfile on FreeBSD
Code in sysdeps/freebsd contains a lot of HAVE_KINFO_GETFILE checks, but
the macro is always undefined because the configure script doesn't check
for it. To fix it, add required checks for kinfo_getfile function.
2019-08-29 15:13:18 +08:00
Ting-Wei Lan
31db82efce Mark glibtop_init_s as non-introspectable
This function isn't exported so it should be skipped.

https://gitlab.gnome.org/GNOME/gjs/issues/259
2019-07-24 09:21:32 +00:00
Ting-Wei Lan
0fd23dd185 Allow building with gettext ≥ 0.20
The use of AM_GNU_GETTEXT_VERSION in configure.ac instructs autopoint to
copy po/Makefile.in.in from the exact gettext version. It is fine if the
version of gettext installed on the system has the same minor version
number with the requested version, but it fails if you have a newer
version of gettext because of the mismatch between autoconf macros and
Makefile.in.in.

  *** error: gettext infrastructure mismatch: using a Makefile.in.in
  from gettext version 0.19 but the autoconf macros are from gettext
  version 0.20

Instead of specifying the exact version with AM_GNU_GETTEXT_VERSION, we
can use AM_GNU_GETTEXT_REQUIRE_VERSION to ask autopoint to simply use
the gettext version installed on the system to prevent the mismatch.

This also bumps the version requirement on gettext to 0.19.6 because
AM_GNU_GETTEXT_REQUIRE_VERSION was added in this version.
2019-07-24 17:04:00 +08:00
3 changed files with 7 additions and 2 deletions

View File

@@ -215,7 +215,9 @@ AC_TYPE_SIGNAL
AC_FUNC_STRFTIME AC_FUNC_STRFTIME
AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname) AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
AM_GNU_GETTEXT_VERSION([0.19.4]) # FIXME: Remove AM_GNU_GETTEXT_VERSION once autoreconf supports REQUIRE_VERSION
AM_GNU_GETTEXT_VERSION([0.19.6])
AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
GETTEXT_PACKAGE=libgtop-2.0 GETTEXT_PACKAGE=libgtop-2.0

View File

@@ -128,7 +128,7 @@ glibtop_init_r (glibtop **server_ptr,
/** /**
* glibtop_init_s: * glibtop_init_s: (skip)
* @server_ptr: (out): * @server_ptr: (out):
* @features: * @features:
* @flags: * @flags:

View File

@@ -118,6 +118,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=) AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=)
AC_SUBST(KVM_LIBS) AC_SUBST(KVM_LIBS)
AC_CHECK_LIB(util, kinfo_getfile)
AC_CHECK_FUNCS(kinfo_getfile)
AC_CHECK_HEADERS(net/if_var.h,,, [ AC_CHECK_HEADERS(net/if_var.h,,, [
#include <net/if.h> #include <net/if.h>
#include <sys/types.h> #include <sys/types.h>