diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-15 12:53:09 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-15 12:53:09 -0800 |
| commit | efc5c3b049d636e4ec9fd5a3f644320d31319777 (patch) | |
| tree | a7c3114da5d3223eab6b3517eee0b54568f4eba5 | |
| parent | 5c238ec0bcbfc1f7aa44d9e0ae9500311bfc3d63 (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 | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e846870..d87498a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,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-02.1' + FDO_DISTRIBUTION_TAG: '2023-02-15.0' FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorg-xcursorgen' diff --git a/configure.ac b/configure.ac index e7ebfa7..50db08a 100644 --- a/configure.ac +++ b/configure.ac @@ -11,13 +11,12 @@ AC_CONFIG_SRCDIR([Makefile.am]) # Initialize Automake 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 + [m4_fatal([must install xorg-macros 1.20 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.20) +XORG_DEFAULT_NOCODE_OPTIONS -AC_PROG_INSTALL AC_PROG_LN_S AC_PATH_PROG(XCURSORGEN, xcursorgen, no) |