diff -ruN autogen-5.18.16-orig/agen5/test/expr.test autogen-5.18.16/agen5/test/expr.test
--- autogen-5.18.16-orig/agen5/test/expr.test	2018-08-16 15:35:02.000000000 -0500
+++ autogen-5.18.16/agen5/test/expr.test	2024-11-09 05:40:46.000000000 -0600
@@ -78,6 +78,8 @@
   ${SED} 's/rm -f /echo rm -f/' >&3
 cat >&3 <<- _EOF_
 	make_exprini
+	# fix generated expr.ini to match our fix to the one in the tarball
+	perl -pi -e 's|_Ax, \(scm_callback_t|_Ax, (void *)(scm_callback_t|g' expr.ini
 	${SED} "${sed_omit_license}" expr.ini > \${srcdir}/expr.res
 	${SED} "${sed_omit_license}" ${top_srcdir}/agen5/expr.ini \
 	    > \${srcdir}/expr.base