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

	* configure.ac: Use sdf-astgen.
	* src/syn/Makefile.am: Update.

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

specs-grammar/ChangeLog

+2004-05-06  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	* configure.ac: Use sdf-astgen.
+	* src/syn/Makefile.am: Update.
+
 2004-05-06  Nicolas Pouillard  <ertai@lrde.epita.fr>
 
 	* src/sig/Makefile.am: Use Stratego Regular.

specs-grammar/configure.ac

@@ -99,6 +99,17 @@ IF_IN_BUNDLE([esdf]) || test -f $ESDF/bin/pack-esdf ||
   AC_MSG_ERROR([cannot find esdf.  Use --with-esdf.])
 
 
+AC_ARG_WITH([sdf-astgen],
+  [  --with-sdf-astgen=DIR    Specify location of ASTGEN, [LRDE_SDF]],
+  [ASTGEN=$withval],
+  [ASTGEN=$LRDE_SDF]
+)
+AC_SUBST([ASTGEN])
+DEF_BUNDLED_PKG([ASTGEN])
+IF_IN_BUNDLE([sdf-astgen]) || test -f $ASTGEN/bin/sdf-astgen ||
+  AC_MSG_ERROR([cannot find sdf-astgen.  Use --with-sdf-astgen.])
+
+
 AC_ARG_WITH(cxx-grammar,
   [  --with-cxx-grammar=DIR              Specify location of the cxx-grammar, [XT_PATH]],
   CXX_GRAMMAR="$withval",

specs-grammar/src/syn/Makefile.am

@@ -46,7 +46,7 @@ $(SPECS).pp: $(SPECS).ppdef.af
 
 $(SPECS).ppdef.af: $(SDFS) $(SPECS).sdf
 	$(ESDF)/bin/pack-esdf -s AstSdf2 -of ast \
-		-I $(top_srcdir)/lib \
+		-I $(BUNDLED_ASTGEN)/share/sdf-astgen \
 		-I $(top_srcdir)/src/syn \
 		-I $(BUNDLED_BOXEDSDF)/share/boxedsdf \
 		-i $(top_srcdir)/src/syn/$(SPECS).sdf \