diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2023-10-17 16:09:24 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2023-10-17 16:17:33 +0000 |
commit | d0594b7d1233a383d69988e4694779401f7af613 (patch) | |
tree | ff6625d53a44007078a2b7d07529543a4aba8d94 | |
parent | 5231f4d0be181e8d24b7752b3f965c2bf69824fc (diff) | |
download | dico-master.tar.gz dico-master.tar.bz2 |
* configure.boot (DEFAULT_PP_SETUP): New variable.
* dicod/Makefile.am (inc_DATA: Use DEFAULT_PP_SETUP.
-rw-r--r-- | configure.boot | 10 | ||||
-rw-r--r-- | dicod/Makefile.am | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/configure.boot b/configure.boot index 558f551..8c67958 100644 --- a/configure.boot +++ b/configure.boot @@ -167,13 +167,23 @@ AC_SUBST([DICO_MODULE_INCLUDES],[dnl $(DICO_LIB_CONFIG)\ -I$(top_srcdir)/include\ -I$(top_builddir)/include\ $(GRECS_INCLUDES)']) # Grecs configuration system +AC_SUBST([DEFAULT_PP_SETUP]) +# Don't install pp-setup if user explicitly requested another preprocessor, +if test -z "$DEFAULT_PREPROCESSOR"; then + DEFAULT_PP_SETUP=pp-setup +fi GRECS_SETUP(grecs, [shared tests getopt git2chg sockaddr-list]) +# Don't install pp-setup if they disabled preprocessor. +# FIXME: use_ext_pp is an internal grecs variable. +if test "$use_ext_pp" == no; then + unset DEFAULT_PP_SETUP +fi GRECS_HOST_PROJECT_INCLUDES='$(DICO_LIB_CONFIG) -I$(top_builddir)/include' # Tcl/tk AC_ARG_WITH([tk], AS_HELP_STRING([--with-tk], [build Tcl/Tk-based applications (GCIDER)]), diff --git a/dicod/Makefile.am b/dicod/Makefile.am index 30e5666..d45862e 100644 --- a/dicod/Makefile.am +++ b/dicod/Makefile.am @@ -79,7 +79,7 @@ SUFFIXES=.opt .c $(AM_V_GEN)m4 -s $(top_srcdir)/@GRECS_SUBDIR@/build-aux/getopt.m4 $< > $@ BUILT_SOURCES=cmdline.c EXTRA_DIST=cmdline.opt pp-setup incdir=$(pkgdatadir)/$(VERSION)/include -inc_DATA = pp-setup +inc_DATA = @DEFAULT_PP_SETUP@ |