from Nicolas Pouillard <ertai@lrde.epita.fr>

	* configure.ac: Add bundle system.
	* src/syn/Makefile.am: Update a flag.

2004-05-05  Nicolas Pouillard  <ertai@lrde.epita.fr>

specs-grammar/ChangeLog

+2004-05-05  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	* configure.ac: Add bundle system.
+	* src/syn/Makefile.am: Update a flag.
+
 2004-05-05  Nicolas Pouillard  <ertai@lrde.epita.fr>
 
 	* src/syn/Expressions/OperatorsExpressions.sdf: Add an ast tag.

specs-grammar/configure.ac

@@ -20,13 +20,11 @@
 
 AC_PREREQ(2.57)
 
-AC_INIT([specs-grammar], 0.1, [transformers-bugs@lrde.epita.fr])
+AC_INIT([specs-grammar], 0.1, [transformers@lrde.epita.fr])
 
 # Auxiliary files
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_FILES(config/Makefile)
-dnl AC_CONFIG_FILES([config/defs],
-dnl                 [chmod +x config/defs])
 
 AM_INIT_AUTOMAKE([1.8.3 dist-bzip2])
 
@@ -35,18 +33,27 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 
 USE_XT_PACKAGES
 
+test -f $STRC/bin/strc ||
+  AC_MSG_ERROR([cannot find strc.  Use --with-strategoxt.])
+
 test -f $SDF_TOOLS/bin/sdf-cons ||
   AC_MSG_ERROR([cannot find sdf-cons.  Use --with-strategoxt.])
 
 test -f $PGEN/bin/sdf2table ||
   AC_MSG_ERROR([cannot find sdf2table.  Use --with-sdf.])
 
+
+BUNDLE_INIT
+
+
 AC_ARG_WITH([lrde-sdftools],
   [  --with-lrde-sdftools=DIR Specify location of LRDE_SDF, [PREFIX]],
   [LRDE_SDF=$withval],
   [LRDE_SDF=$prefix]
 )
 AC_SUBST([LRDE_SDF])
+DEF_BUNDLED_PKG([LRDE_SDF])
+
 
 AC_ARG_WITH([sdf-option],
   [  --with-sdf-option=DIR    Specify location of SDF_OPTION, [LRDE_SDF]],
@@ -54,7 +61,8 @@ AC_ARG_WITH([sdf-option],
   [SDF_OPTION=$LRDE_SDF]
 )
 AC_SUBST([SDF_OPTION])
-test -f $SDF_OPTION/bin/sdf-option ||
+DEF_BUNDLED_PKG([SDF_OPTION])
+IF_IN_BUNDLE([sdf-option]) || test -f $SDF_OPTION/bin/sdf-option ||
   AC_MSG_ERROR([cannot find sdf-option.  Use --with-sdf-option.])
 
 
@@ -64,8 +72,9 @@ AC_ARG_WITH([boxedsdf],
   [BOXEDSDF=$LRDE_SDF]
 )
 AC_SUBST([BOXEDSDF])
-test -f $BOXEDSDF/bin/boxed2pp-table ||
-  AC_MSG_ERROR([cannot find boxed2pp-table.  Use --with-boxedsdf.])
+DEF_BUNDLED_PKG([BOXEDSDF])
+IF_IN_BUNDLE([boxedsdf]) || test -f $BOXEDSDF/bin/boxed2pp-table ||
+  AC_MSG_ERROR([cannot find boxed2sdf.  Use --with-boxedsdf.])
 
 
 AC_ARG_WITH([sdf-detgen],
@@ -74,8 +83,10 @@ AC_ARG_WITH([sdf-detgen],
   [DETGEN=$LRDE_SDF]
 )
 AC_SUBST([DETGEN])
-test -f $DETGEN/bin/det-gen ||
-  AC_MSG_ERROR([cannot find det-gen.  Use --with-sdf-detgen.])
+DEF_BUNDLED_PKG([DETGEN])
+IF_IN_BUNDLE([sdf-detgen]) || test -f $DETGEN/bin/det-gen ||
+  AC_MSG_ERROR([cannot find detgen.  Use --with-sdf-detgen.])
+
 
 AC_ARG_WITH([esdf],
   [  --with-esdf=DIR    Specify location of ESDF, [LRDE_SDF]],
@@ -83,7 +94,8 @@ AC_ARG_WITH([esdf],
   [ESDF=$LRDE_SDF]
 )
 AC_SUBST([ESDF])
-test -f $ESDF/bin/pack-esdf ||
+DEF_BUNDLED_PKG([ESDF])
+IF_IN_BUNDLE([esdf]) || test -f $ESDF/bin/pack-esdf ||
   AC_MSG_ERROR([cannot find esdf.  Use --with-esdf.])
 
 
@@ -96,6 +108,14 @@ AC_SUBST(CXX_GRAMMAR)
 test -f $CXX_GRAMMAR/share/cxx-grammar/StrategoCxx.def ||
   AC_MSG_ERROR([cannot find StrategoCxx grammar.  Use --with-cxx-grammar.])
 
+
+AC_CHECK_PROGS([HELP2MAN], [help2man], [NONE])
+if test x"$HELP2MAN" = xNONE; then
+  AC_MSG_ERROR([cannot find help2man. Check your path.])
+fi
+AC_SUBST([HELP2MAN])
+
+
 # Loook for common programs
 AC_LANG_C
 AC_PROG_CC

specs-grammar/src/syn/Makefile.am

@@ -48,6 +48,7 @@ $(SPECS).ppdef.af: $(SDFS) $(SPECS).sdf
 	$(ESDF)/bin/pack-esdf -s BoxedSdf2 -of ast \
 		-I $(top_srcdir)/lib \
 		-I $(top_srcdir)/src/syn \
+		-I $(BUNDELED_BOXEDSDF)/share/boxedsdf \
 		-i $(top_srcdir)/src/syn/$(SPECS).sdf \
 	| $(SDF_OPTION)/bin/sdf-option \
 	| $(SDF_TOOLS)/bin/sdf-cons -o $@