aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.boot10
-rw-r--r--dicod/Makefile.am2
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
@@ -170,7 +170,17 @@ AC_SUBST([DICO_MODULE_INCLUDES],[dnl
$(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
diff --git a/dicod/Makefile.am b/dicod/Makefile.am
index 30e5666..d45862e 100644
--- a/dicod/Makefile.am
+++ b/dicod/Makefile.am
@@ -82,4 +82,4 @@ BUILT_SOURCES=cmdline.c
EXTRA_DIST=cmdline.opt pp-setup
incdir=$(pkgdatadir)/$(VERSION)/include
-inc_DATA = pp-setup
+inc_DATA = @DEFAULT_PP_SETUP@

Return to:

Send suggestions and report system problems to the System administrator.