Commit 9792ac69 authored by Vincent Untz's avatar Vincent Untz

build: Add ${ACLOCAL_FLAGS} to ACLOCAL_AMFLAGS

This is used by gnome-autogen.sh, and we need it when aclocal.m4 is
to be rebuilt by make, to avoid losing some aclocal paths.

Also, don't set ACLOCAL_AMFLAGS in configure.
parent 6223b261
......@@ -4,7 +4,7 @@ if HAVE_PYTHON
SUBDIRS += python simple-editor
endif
ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-python
......
......@@ -38,9 +38,6 @@ AC_ARG_PROGRAM
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment