merge branches/sylvain-2011_05 from r311 to r319 into trunk

config/configure.ac

@@ -116,15 +116,22 @@ else
 	fi
 	if test "$DYPGEN_FINDLIB" = no ; then
 	   DYPGEN_PLACE=`$OCAMLC -where`
-	   DYPGEN_INCLUDE="-I +dypgen"
 	else
 	   DYPGEN_PLACE=$DYPGEN_INCLUDE_DIR
 	   DYPGEN_INCLUDE="-I $DYPGEN_INCLUDE_DIR"
 	fi
+	# Old versions of dypgen where put in a dypgen directory
 	if test -f $DYPGEN_PLACE/dypgen/dyp.cma ; then
-	      AC_MSG_RESULT(dypgen library is $DYPGEN_PLACE/dypgen/dypgen.cma)
+	   DYPGEN_INCLUDE="-I +dypgen"
+	   AC_MSG_RESULT(dypgen library is $DYPGEN_PLACE/dypgen/dypgen.cma)
 	else
-	      AC_MSG_ERROR(Could not find dypgen library in $DYPGEN_PLACE)
+	# New versions of dypgen where put in a dyp directory
+		if test -f $DYPGEN_PLACE/dyp/dyp.cma ; then
+		   DYPGEN_INCLUDE="-I +dyp"
+		   AC_MSG_RESULT(dypgen library is $DYPGEN_PLACE/dyp/dypgen.cma)
+		else
+		   AC_MSG_ERROR(Could not find dypgen library in $DYPGEN_PLACE)
+		fi
 	fi
 fi
 
@@ -197,7 +204,7 @@ AC_SUBST(OCAMLP4_LOC)
 
 AC_SUBST(SET_MAKE)
 
-AC_CONFIG_FILES([./Makefile config/Makefile src/Makefile.master src/Makefile.common src/Makefile src/utils/Makefile src/logic/Makefile src/grammars/Makefile src/lambda/Makefile src/acg-data/Makefile src/scripting/Makefile src/datalog/Makefile])
+AC_CONFIG_FILES([./Makefile config/Makefile src/Makefile.master src/Makefile.common src/Makefile src/utils/Makefile src/logic/Makefile src/grammars/Makefile src/acg-data/Makefile src/scripting/Makefile src/datalog/Makefile])
 
 AC_PROG_MAKE_SET