summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2023-02-15 16:06:56 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2023-02-15 16:06:56 -0800
commitc2d9d2eb55f5b805f8e2df3ab6659499bf1973f0 (patch)
tree51a183a47cb4ae7daf53622d12cf490907b4050b
parentc5f9df46e60fc628bb6946417835658af7b2c7a0 (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.yml2
-rw-r--r--configure.ac10
2 files changed, 5 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c818bc2..326be6d 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 be3f88c..f0bb5b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,13 +27,11 @@ AC_INIT([font-cursor-misc], [1.0.3],
[font-cursor-misc])
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],