aboutsummaryrefslogtreecommitdiff
path: root/am
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2011-05-26 22:42:49 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2011-05-26 22:42:49 +0300
commit8893389e6bbd27b03d77b7ffa63061e543e8df09 (patch)
treeda189f8739d4712be73600a261210df4cc681316 /am
parenta98d3bcc6bcd42b4a2bc405183c531f4dcccd067 (diff)
downloadgrecs-8893389e6bbd27b03d77b7ffa63061e543e8df09.tar.gz
grecs-8893389e6bbd27b03d77b7ffa63061e543e8df09.tar.bz2
Fix output formatting.
* Makefile.am (EXTRA_DIST): Add @GRECS_DISTDOC@. * am/grecs.m4 (GRECS_SETUP): New flag syntax-doc sets GRECS_DISTDOC. * doc/GRECS_SETUP.3: Update. * src/format.c (grecs_format_node): Print value if GRECS_NODE_FLAG_VALUE is set. * tests/glob01.at: Update.
Diffstat (limited to 'am')
-rw-r--r--am/grecs.m44
1 files changed, 4 insertions, 0 deletions
diff --git a/am/grecs.m4 b/am/grecs.m4
index 5611e04..28a69e0 100644
--- a/am/grecs.m4
+++ b/am/grecs.m4
@@ -57,12 +57,13 @@ AC_DEFUN([_GRECS_SET_OPTIONS],
# pp-setup-option Add the --with-pp-setup-file option to the
# configuration file. The option allows user to
# control whether the pp-setup file is installed.
# tests Build tests.
# getopt Add getopt.m4 to the distribution
# git2chg Add git2chg.awk to the distribution
+# syntax-doc Add doc/grecs-syntax.texi to the distribution
#
# The pp-setup-file argument supplies the pathname of the preprocessor
# setup file in the source tree. It is ignored if std-pp-setup option is
# given.
#
# If neither std-pp-setup option, nor pp-setup-file argument are supplied,
@@ -168,12 +169,13 @@ AC_DEFUN([GRECS_SETUP],[
AC_SUBST([GRECS_DOCDIR])
AC_SUBST([GRECS_CHANGELOG])
AC_SUBST([GRECS_DISTCK_AT])
AC_SUBST([GRECS_README])
AC_SUBST([GRECS_INCLUDES],['-I$(top_srcdir)/]grecsdir[src]')
AC_SUBST([GRECS_HOST_PROJECT_INCLUDES])
+ AC_SUBST([GRECS_DISTDOC])
_GRECS_OPTION_SWITCH([install],[
LT_INIT
GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.la']
GRECS_DOCDIR='doc'
GRECS_CHANGELOG=
@@ -183,16 +185,18 @@ AC_DEFUN([GRECS_SETUP],[
grecsdir[doc/Makefile])
],[shared],[
LT_INIT
GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.la']
GRECS_CHANGELOG='#'
GRECS_README=README.submodule
+ _GRECS_IF_OPTION_SET([syntax-doc],[GRECS_DISTDOC=doc/grecs-syntax.texi])
AC_CONFIG_FILES(grecsdir[src/Makefile]:grecsdir[src/Make-shared.in])
],[
GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.a']
GRECS_CHANGELOG='#'
GRECS_README=README.submodule
+ _GRECS_IF_OPTION_SET([syntax-doc],[GRECS_DISTDOC=doc/grecs-syntax.texi])
AC_CONFIG_FILES(grecsdir[src/Makefile]:grecsdir[src/Make-static.in])
])
AC_CONFIG_FILES(grecsdir[Makefile])
m4_popdef([grecsdir])
])

Return to:

Send suggestions and report system problems to the System administrator.