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>

2 files changed, 32 insertions, 6 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd049da..fc1697c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ include:
 
 stages:
   - prep             # prep work like rebuilding the container images if there is a change
-  - install xorgproto
+  - install macros
   - build            # for actually building and testing things in a container
   - test
   - deploy
@@ -32,7 +32,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:  '2022-07-17.0'
+  FDO_DISTRIBUTION_TAG:  '2023-02-15.0'
   FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake make xutils-dev xmlto w3m xsltproc fop'
 
 
@@ -81,9 +81,32 @@ container-prep:
   variables:
     GIT_STRATEGY: none
 
+# Install latest version of xorg-macros, since debian doesn't package 1.20.0 yet
+install-macros:
+  extends:
+    - .fdo.distribution-image@debian
+  stage: install macros
+  script:
+    - export INSTDIR="$PWD/_inst"
+    - git clone --depth=1 https://gitlab.freedesktop.org/xorg/util/macros
+    - pushd macros > /dev/null
+    - autoreconf -ivf
+    - mkdir _builddir
+    - pushd _builddir > /dev/null
+    - ../configure --disable-silent-rules --prefix="$INSTDIR"
+    - make
+    - make install
+    - popd > /dev/null
+    - popd > /dev/null
+  variables:
+  artifacts:
+    paths:
+      - _inst
+
 
 #
 # The default build, runs on the image built above.
+# Sets ACLOCAL to use macros from "install macros" stage above.
 #
 build:
   stage: build
@@ -91,6 +114,7 @@ build:
     - .fdo.distribution-image@debian
   script:
     - export INSTDIR="$PWD/_inst"
+    - export ACLOCAL="aclocal -I $INSTDIR/share/aclocal"
     - autoreconf -ivf
     - mkdir _builddir
     - pushd _builddir > /dev/null
@@ -107,6 +131,7 @@ build:
 
 #
 # Make sure xorg-docs builds with the xorg-sgml-doctools package built above
+# Sets ACLOCAL to use macros from "install macros" stage above.
 #
 docs-build:
   extends:
@@ -114,6 +139,7 @@ docs-build:
   stage: test
   script:
     - export INSTDIR="$PWD/_inst"
+    - export ACLOCAL="aclocal -I $INSTDIR/share/aclocal"
     - export PKG_CONFIG_PATH=$(find $INSTDIR/ -name '*.pc' -printf "%h:")
     - git clone --depth=1 https://gitlab.freedesktop.org/xorg/doc/xorg-docs
     - pushd xorg-docs > /dev/null
diff --git a/configure.ac b/configure.ac
index cc20e90..410d497 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,11 +27,11 @@ AC_CONFIG_SRCDIR([Makefile.am])
 # Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-xz])
 
-# Require X.Org macros 1.8 or later for AC_PROG_INSTALL
+# Require xorg-macros 1.20 or later: XORG_DEFAULT_NOCODE_OPTIONS
 m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.8)
-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_SUBST([sgmlrootdir],['${datarootdir}/sgml'])
 AC_SUBST([sgmlx11dir],['${sgmlrootdir}/X11'])