diff options
| -rw-r--r-- | authors.txt | 1 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 | ||||
| -rwxr-xr-x | tools/ac_converter.py | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/authors.txt b/authors.txt index 0e992ac..4244917 100644 --- a/authors.txt +++ b/authors.txt @@ -39,3 +39,4 @@ Sam Thursfield Noam Meltzer Vincent Szolnoky Zhe Wang +Wim Taymans diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index a4663a3..be3c3ac 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -228,9 +228,7 @@ class GnomeModule: kwargs['output'] = typelib_output kwargs['command'] = typelib_cmd - # Note that this can't be libdir, because e.g. on Debian it points to - # lib/x86_64-linux-gnu but the girepo dir is always under lib. - kwargs['install_dir'] = 'lib/girepository-1.0' + kwargs['install_dir'] = os.path.join(state.environment.get_libdir(), 'girepository-1.0') typelib_target = TypelibTarget(typelib_output, state.subdir, kwargs) return [scan_target, typelib_target] diff --git a/tools/ac_converter.py b/tools/ac_converter.py index 2f1b4c3..571481e 100755 --- a/tools/ac_converter.py +++ b/tools/ac_converter.py @@ -162,6 +162,11 @@ function_data = \ 'HAVE_GETPWUID_R': ('getpwuid_r', 'pwd.h'), 'HAVE_GETUID': ('getuid', 'unistd.h'), 'HAVE_LRINTF': ('lrintf', 'math.h'), + 'HAVE_DECL_ISNAN': ('isnan', 'math.h'), + 'HAVE_DECL_ISINF': ('isinf', 'math.h'), + 'HAVE_ROUND': ('round', 'math.h'), + 'HAVE_NEARBYINT': ('nearbyint', 'math.h'), + 'HAVE_RINT': ('rint', 'math.h'), 'HAVE_MKFIFO': ('mkfifo', 'sys/stat.h'), 'HAVE_MLOCK': ('mlock', 'sys/mman.h'), 'HAVE_NANOSLEEP': ('nanosleep', 'time.h'), @@ -270,6 +275,6 @@ for line in open(sys.argv[1]): print("cdata.set('%s', cc.sizeof('%s'))" % (elem, typename)) print(''' -configure_file(input : 'config.h.in', +configure_file(input : 'config.h.meson', output : 'config.h', configuration : cdata)''') |