--- rpl/src/Makefile.am	2011/06/23 13:03:39	1.51
+++ rpl/src/Makefile.am	2011/07/24 17:11:18	1.56
@@ -20,6 +20,10 @@ include_libcrypto = -I$(top_builddir)/to
 ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a
 include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@
 
+ldadd_librplcas = @LIBRPLCAS@
+include_librplcas = -I$(top_builddir)/rplcas/include/giac \
+		-I$(top_builddir)/rplcas/include
+
 date = -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z' | \
 		$(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
 		printf("%s\n", v);}')\"" \
@@ -371,7 +375,7 @@ generateurs.c: generateurs_aleatoires.aw
 
 rpl.inc:
 	echo BUILDPATH=$(top_builddir)/.. > $@
-	echo COMPILE=$(DEFS) | sed -e '1,$$s/"/\\"/g' | \
+	echo COMPILE="$(DEFS) @ABI@" | 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)) \
@@ -388,6 +392,7 @@ rpl.inc:
 		$(ldadd_libcrypto) \
 		$(ldadd_libssl) \
 		$(ldadd_libsqlite) \
+		$(ldadd_librplcas) \
 		>> $@
 
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
@@ -423,7 +428,8 @@ include_HEADERS = rplexternals.h rpltype
 
 INCLUDES = -I$(srcdir) -I$(top_builddir) \
 		$(include_libreadline) $(include_libncurses) $(include_libgsl) \
-		$(include_libiconv) $(include_libcrypto) $(include_libsqlite)\
+		$(include_libiconv) $(include_libcrypto) $(include_libsqlite) \
+		$(include_librplcas) \
 		@includeX@ @libMySQLinc@ @libPgSQLinc@
 DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" @BROKEN_SIGINFO@ \
 		-Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
@@ -432,14 +438,14 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		@SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
-		-D@OS@ @BSH_PATH@
-rpl_LDADD = \
+		-D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\"
+rpl_LDADD = -lgfortran \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
 		$(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
 		$(ldadd_libsqlite) \
-		$(ldadd_libgsl) @libX@ @libMySQLlib@ @libPgSQLlib@
+		$(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@
 
 always: $(top_builddir)/src/rpl-conv.c
 	touch $<; \
@@ -464,7 +470,8 @@ librpl: install-libLIBRARIES
 			$(top_builddir)/lapack/lapack/liblapack.a \
 			$(top_builddir)/lapack/blas/libblas.a \
 			$(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \
-			$(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite); \
+			$(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \
+			$(ldadd_librplcas); \
 	do \
 		cp -f $$i $(top_builddir)/librpl; \
 	done