--- rpl/src/Makefile.am	2010/09/07 20:59:06	1.42
+++ rpl/src/Makefile.am	2010/09/23 15:17:28	1.44
@@ -235,9 +235,7 @@ INIT_EXE=init.c
 
 INIT_LIB=librpl.c
 
-# @MALLOC@ doit être la première bibliothèque pour éviter que la libgfortran
-# utilise un allocateur différent.
-LIB=-lz @MALLOC@
+LIB=-lz
 
 bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a
@@ -361,12 +359,13 @@ generateurs.c: generateurs_aleatoires.aw
 
 rpl.inc:
 	echo BUILDPATH=$(top_builddir)/.. > $@
-	echo COMPILE=$(DEFS) >> $@
+	echo COMPILE=$(DEFS) | sed -e '1,$$s/"/\\"/g' | \
+		sed -e '1,$$s/=\\"/="\\"/g' | sed -e '1,$$s/\\" /\\"" /g' >> $@
 	echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ -lz >> $@
 	echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
 			$(SRCF90c:.F90=.$(OBJEXT)) \
 			librpl-conv.$(OBJEXT) >> $@
-	echo EXTOBJECTS= @MALLOC@ @EXT_SQL@ \
+	echo EXTOBJECTS= @EXT_SQL@ \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) \
@@ -449,7 +448,6 @@ librpl: install-libLIBRARIES
 	fi
 	mkdir -p $(top_builddir)/librpl; \
 	for i in $(top_builddir)/src/librpl.a \
-			@MALLOC@ \
 			$(ldadd_libhistory) $(ldadd_libreadline) \
 			$(top_builddir)/lapack/lapack/liblapack.a \
 			$(top_builddir)/lapack/blas/libblas.a \