--- rpl/rplcas/Makefile.in	2015/11/06 14:59:49	1.43
+++ rpl/rplcas/Makefile.in	2015/11/09 16:48:09	1.44
@@ -49,6 +49,33 @@ lib/@LIB_PREFIX@mpfr.a: lib/@LIB_PREFIX@
 	$(MAKE) -C @MPFR@ $(AM_MAKEFLAGS) all && \
 			$(MAKE) -C @MPFR@ $(AM_MAKEFLAGS) install
 
+lib/@LIB_PREFIX@mpfi.a: lib/@LIB_PREFIX@gmp.a lib/@LIB_PREFIX@mpfr.a
+	if [ ! -d @MPFI@ ]; then \
+		mkdir @MPFI@ ; \
+	fi
+	if [ ! -f @MPFI@/config.log ]; then \
+		if [ @BUILD@ = @HOST@ ]; then \
+			(cd @MPFI@ && \
+					CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+					../$(srcdir)/@MPFI@/configure \
+					--with-gmp=$(top_builddir)/rplcas \
+					--with-mpfr=$(top_builddir)/rplcas \
+					--disable-shared --enable-static \
+					--prefix=$(top_builddir)/rplcas); \
+		else \
+			(cd @MPFI@ && \
+					CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+					../$(srcdir)/@MPFI@/configure \
+					--host=@HOST@ \
+					--with-gmp=$(top_builddir)/rplcas \
+					--with-mpfr=$(top_builddir)/rplcas \
+					--disable-shared --enable-static \
+					--prefix=$(top_builddir)/rplcas); \
+		fi; \
+	fi
+	$(MAKE) -C @MPFI@ $(AM_MAKEFLAGS) all && \
+			$(MAKE) -C @MPFI@ $(AM_MAKEFLAGS) install
+
 lib/ntl.a:
 	if [ @BUILD@ = @HOST@ ]; then \
 		(cd @NTL@/src && ./configure GMP_PREFIX=$(top_builddir)/rplcas \
@@ -119,7 +146,7 @@ lib/libpari.a: lib/@LIB_PREFIX@gmp.a
 			$(MAKE) -C @PARI@ $(AM_MAKEFLAGS) install
 
 lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@gmp.a lib/@LIB_PREFIX@mpfr.a lib/ntl.a \
-		lib/libcocoa.a lib/libpari.a
+		lib/libcocoa.a lib/libpari.a lib/@LIB_PREFIX@mpfi.a
 	if [ ! -d @GIAC@ ]; then \
 		mkdir @GIAC@ ; \
 	fi
@@ -128,7 +155,7 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 				CXX=@CXX@ \
 				CPPFLAGS="-I$(top_builddir)/rplcas/include -I$(top_builddir)/tools/@GSL@ $(CPPFLAGS)" \
 				CXXFLAGS="$(CXXFLAGS) -fpermissive" \
-				LDFLAGS="$(top_builddir)/rplcas/lib/libpari.a $(top_builddir)/rplcas/lib/ntl.a $(top_builddir)/rplcas/lib/libcocoa.a $(top_builddir)/tools/@GSL@/.libs/libgsl.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmp.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfr.a $(LDFLAGS)" \
+				LDFLAGS="$(top_builddir)/rplcas/lib/libpari.a $(top_builddir)/rplcas/lib/ntl.a $(top_builddir)/rplcas/lib/libcocoa.a $(top_builddir)/tools/@GSL@/.libs/libgsl.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmp.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfr.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfi.a $(LDFLAGS)" \
 				../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
 				--enable-pari \
 				--enable-ntl \
@@ -140,7 +167,7 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 		(cd @GIAC@ && \
 				CPPFLAGS="-I$(top_builddir)/rplcas/include -I$(top_builddir)/tools/@GSL@ @SYSROOT@ $(CPPFLAGS)" \
 				CXXFLAGS="$(CXXFLAGS) -fpermissive" \
-				LDFLAGS="$(top_builddir)/rplcas/lib/libpari.a $(top_builddir)/rplcas/lib/ntl.a $(top_builddir)/rplcas/lib/libcocoa.a $(top_builddir)/tools/@GSL@/.libs/libgsl.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmp.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfr.a $(LDFLAGS)" \
+				LDFLAGS="$(top_builddir)/rplcas/lib/libpari.a $(top_builddir)/rplcas/lib/ntl.a $(top_builddir)/rplcas/lib/libcocoa.a $(top_builddir)/tools/@GSL@/.libs/libgsl.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmp.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfr.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfi.a $(LDFLAGS)" \
 				../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
 				--host=@HOST@ \
 				--enable-pari \
@@ -155,6 +182,12 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 			sed -e 's/#define HAVE_LIBPNG 1//' config.h.orig | \
 			sed -e 's/#define HAVE_PNG_H 1//' > config.h && \
 			rm -f config.h.orig); \
+	(cd @GIAC@/src && \
+			mv -f Makefile Makefile.orig && \
+			sed -e 's/-lntl//' Makefile.orig | \
+			sed -e 's/-lgmp//' | \
+			sed -e 's/-lmpfr//' > Makefile && \
+			rm -f Makefile.orig); \
 	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS)
 	if [ x$(srcdir) != x. ]; then \
 		for i in mkinstalldirs xcas.xpm xcas.desktop xcas.applications; \
@@ -164,13 +197,15 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS) install
 
 lib/librplcas.a: lib/@LIB_PREFIX@giac.a lib/@LIB_PREFIX@gmp.a \
-		lib/@LIB_PREFIX@mpfr.a lib/ntl.a lib/libcocoa.a lib/libpari.a
+		lib/@LIB_PREFIX@mpfr.a lib/ntl.a lib/libcocoa.a lib/libpari.a \
+		lib/@LIB_PREFIX@mpfi.a
 	if [ ! -d tmp ]; then mkdir tmp; fi
 	@(cd tmp && n=0 && \
 			rm -f * && \
 			echo Building standalone librplcas.a; \
 			for i in ../lib/@LIB_PREFIX@gmp.a \
 					../lib/@LIB_PREFIX@mpfr.a \
+					../lib/@LIB_PREFIX@mpfi.a \
 					../lib/libcocoa.a \
 					../lib/libpari.a \
 					../lib/ntl.a \
@@ -210,7 +245,7 @@ lib/librplcas.a: lib/@LIB_PREFIX@giac.a
 			if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
 				echo Stripping librplcas.a && strip -d ../lib/librplcas.a; \
 			fi;)
-	rmdir tmp
+	rm -rf tmp
 
 install: