diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-15 11:15:32 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-15 11:15:32 -0800 |
| commit | ebb320bf2aa8de75270eb580705deb2b1d144a54 (patch) | |
| tree | 5fc8c9c8f82068c0e822c670290441215262354d | |
| parent | b6ece89e454a94c96e6f4592fe58ac6d534f16f3 (diff) | |
configure: 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 | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9d9bde..b998c64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,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: '2023-01-01.0' + FDO_DISTRIBUTION_TAG: '2023-02-15.0' # minimal set of packages required to build and install either way BASE_PACKAGES: 'git gcc pkgconf xorg-font-util' # packages needed to build and install with each set of tools diff --git a/configure.ac b/configure.ac index 1ac0c5d..69f64fa 100644 --- a/configure.ac +++ b/configure.ac @@ -11,11 +11,11 @@ AC_CONFIG_SRCDIR([Makefile.am]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-xz]) -# Require xorg-macros 1.4 or later: XORG_DEFAULT_OPTIONS, XORG_INSTALL +# Require xorg-macros 1.20 or later: XORG_DEFAULT_NOCODE_OPTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.4) -XORG_DEFAULT_OPTIONS + [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.1 or later for XORG_FONTROOTDIR m4_ifndef([XORG_FONT_MACROS_VERSION], |