diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-15 16:33:56 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-15 16:33:56 -0800 |
| commit | 0e8f7de51fcd93542c833a78a587cfdcabc83932 (patch) | |
| tree | d72baf57e96f2f325b4b8d06b63763c0694c3028 | |
| parent | 2d2ac9db1d94fe04752fce4a95db9585989ff84c (diff) | |
Switch to XORG_DEFAULT_NOCODE_OPTIONS
Stop running all sorts of compiler tests we don't need since there
is no code in this module to compile. Requires xorg-macros 1.20.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b14f24..8f94f2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ variables: # The tag should be updated each time the list of packages is updated. # Changing a tag forces the associated image to be rebuilt. # Note: the tag has no meaning, we use a date format purely for readability - FDO_DISTRIBUTION_TAG: '2021-12-08.1' + FDO_DISTRIBUTION_TAG: '2023-02-15.0' FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorg-font-util xorg-fonts-encodings xorg-bdftopcf xorg-mkfontscale fontconfig' diff --git a/configure.ac b/configure.ac index f02a603..9ea4fbe 100644 --- a/configure.ac +++ b/configure.ac @@ -27,13 +27,11 @@ AC_INIT([font-screen-cyrillic], [1.0.4], [font-screen-cyrillic]) AM_INIT_AUTOMAKE([foreign dist-xz]) -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require xorg-macros 1.20 or later: XORG_DEFAULT_NOCODE_OPTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) -XORG_DEFAULT_OPTIONS - -AC_PROG_INSTALL + [m4_fatal([must install xorg-macros 1.20 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.20) +XORG_DEFAULT_NOCODE_OPTIONS # Require X.Org's font util macros 1.2 or later m4_ifndef([XORG_FONT_MACROS_VERSION], |