--- rpl/rplcas/Makefile.in	2011/06/27 14:30:20	1.10
+++ rpl/rplcas/Makefile.in	2011/07/24 20:39:45	1.13
@@ -1,5 +1,9 @@
 srcdir=@srcdir@
 top_builddir=@abs_top_builddir@
+CFLAGS=@CFLAGS@
+CXXFLAGS=@CXXFLAGS@
+LDFLAGS=@LDFLAGS@
+
 .PHONY: configure clean
 
 all: lib/librplcas.a
@@ -9,7 +13,8 @@ lib/libgmp.a:
 		mkdir @GMP@; \
 	fi
 	if [ ! -f @GMP@/config.log ]; then \
-		(cd @GMP@ && CFLAGS=@ABI@ $(CFLAGS) \
+		(cd @GMP@ && \
+				CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 				../$(srcdir)/@GMP@/configure --with-readline=no \
 				--disable-shared --enable-static \
 				--prefix=$(top_builddir)/rplcas); \
@@ -21,7 +26,9 @@ lib/libmpfr.a: lib/libgmp.a
 		mkdir @MPFR@ ; \
 	fi
 	if [ ! -f @MPFR@/config.log ]; then \
-		(cd @MPFR@ && CFLAGS=@ABI@ $(CFLAGS) ../$(srcdir)/@MPFR@/configure \
+		(cd @MPFR@ &&
+				CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+				../$(srcdir)/@MPFR@/configure \
 				--with-gmp=$(top_builddir)/rplcas \
 				--disable-shared --enable-static \
 				--prefix=$(top_builddir)/rplcas); \