from Olivier Gournet <gourne_o@lrde.epita.fr>

	* configure.ac,
	* src/pp/Makefile.am,
	* src/parser/Makefile.am: 
	Set help2man optional, distribute generated man-pages.

cxx-grammar/ChangeLog

+2004-05-12  Olivier Gournet  <gourne_o@lrde.epita.fr>
+
+	* configure.ac,
+	* src/pp/Makefile.am,
+	* src/parser/Makefile.am: 
+	Set help2man optional, distribute generated man-pages.
+
 2004-05-11  Olivier Gournet  <gourne_o@lrde.epita.fr>
 
 	* src/parser/ParsePPDirective.str: Fix bug.

cxx-grammar/configure.ac

@@ -19,7 +19,7 @@
 
 AC_PREREQ(2.57)
 
-AC_INIT([cxx-grammar], 0.1, [transformers@lrde.epita.fr])
+AC_INIT([cxx-grammar], 0.2a, [transformers@lrde.epita.fr])
 
 # Auxiliary files
 AC_CONFIG_AUX_DIR([config])
@@ -116,8 +116,9 @@ AC_SUBST([STLPORTDIR])
 
 AC_CHECK_PROGS([HELP2MAN], [help2man], [NONE])
 if test x"$HELP2MAN" = xNONE; then
-  AC_MSG_ERROR([cannot find help2man. Check your path.])
+  AC_MSG_WARN([cannot find help2man. Check your path.])
 fi
+AM_CONDITIONAL([HAVE_HELP2MAN], [test x"$HELP2MAN" != xNONE])
 AC_SUBST([HELP2MAN])
 
 # Look for common programs

cxx-grammar/src/parser/Makefile.am

@@ -9,7 +9,6 @@ STRINCLUDES     = -I $(top_builddir)/src/sig \
 		  -I $(top_builddir)/src/strategocxx \
 		  -I $(top_builddir)/config \
 		  -I $(srcdir)
-man_MANS        = parse-cxx.1
 bin_PROGRAMS    = parse-cxx
 libexec_SCRIPTS = parse-header.pl
 SRCS		= parse-cxx.str ambtrack.str ParsePPDirective.str
@@ -17,6 +16,11 @@ EXTRA_DIST	= $(SRCS) parse-header.pl ParsePPDirective.meta
 nodist_parse_cxx_SOURCES = parse-cxx.c
 CLEANFILES      = parse-cxx.{c.dep,c} $(man_MANS) parse-cxx.inc
 
+if HAVE_HELP2MAN
+man_MANS        = parse-cxx.1
+EXTRA_DIST	+= parse-cxx.1
+endif
+
 parse-cxx.1: parse-cxx parse-cxx.inc
 	$(HELP2MAN) -S LRDE -i parse-cxx.inc --no-info ./parse-cxx -o $@
 

cxx-grammar/src/pp/Makefile.am

@@ -4,7 +4,6 @@ include $(top_srcdir)/config/Makefile.xt
 -include pp-cxx.c.dep
 -include pp-dxx.c.dep
 
-man_MANS	= pp-cxx.1 pp-dxx.1
 bin_PROGRAMS	= pp-cxx pp-dxx
 pkgdata_DATA	= Options.pp.af
 SCFLAGS		= --main $* --verbose 0 $(XTCFLAGS)
@@ -17,6 +16,11 @@ nodist_pp_dxx_SOURCES = pp-dxx.c
 CLEANFILES	= pp-cxx.{c.dep,c} pp-dxx.{c.dep,c} Options.pp.af \
 		  $(man_MANS) pp-cxx.inc pp-dxx.inc
 
+if HAVE_HELP2MAN
+man_MANS	= pp-cxx.1 pp-dxx.1
+EXTRA_DIST	+= pp-cxx.1 pp-dxx.1
+endif
+
 pp-cxx.1: pp-cxx pp-cxx.inc
 	$(HELP2MAN) -S LRDE -i pp-cxx.inc --no-info ./pp-cxx -o $@