cf: Changes to 'master'

[GitLab Mirror]

 .gitlab-ci.yml    |   81 ++++++++++++++++++++-
 Makefile.am       |    3 
 configure.ac      |    3 
 meson.build       |  200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 meson_options.txt |   30 ++++++++
 5 files changed, 312 insertions(+), 5 deletions(-)

New commits:
commit e3d3b1906560db61daacdcfc23908918dfa54f84
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jan 1 15:37:55 2023 -0800

    meson: Add option to build with meson
    
    Also updates the gitlab CI config to test both build type
    and compare the generated output/installed files.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 889f8a9c9ac733c62a86fa2fbc6614554eefd3ba
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jan 1 15:16:24 2023 -0800

    configure.ac: Don't pass through '${FONTROOTDIR}' into site.def
    
    Imake doesn't know how to expand shell variables, so instead we
    rely on the FontDir #define already in the site.def file.
    
    (I don't think this setting is really used in X11R7.0 or later,
     which is why no one has noticed before now, but since we set it,
     might as well set it to something that can be used instead of
     "#define FontEncDir ${FONTROOTDIR}/encodings".)
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>