--- rpl/rplcas/Makefile.in	2011/10/10 10:58:11	1.25
+++ rpl/rplcas/Makefile.in	2012/12/13 21:23:25	1.35
@@ -17,6 +17,7 @@ lib/@LIB_PREFIX@gmp.a:
 		(cd @GMP@ && \
 				CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 				../$(srcdir)/@GMP@/configure --with-readline=no \
+				--host=@HOST@ \
 				--disable-shared --enable-static \
 				--prefix=$(top_builddir)/rplcas); \
 	fi
@@ -28,43 +29,93 @@ lib/@LIB_PREFIX@mpfr.a: lib/@LIB_PREFIX@
 		mkdir @MPFR@ ; \
 	fi
 	if [ ! -f @MPFR@/config.log ]; then \
-		(cd @MPFR@ && \
-				CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-				../$(srcdir)/@MPFR@/configure \
-				--with-gmp=$(top_builddir)/rplcas \
-				--disable-shared --enable-static \
-				--prefix=$(top_builddir)/rplcas); \
+		if [ @BUILD@ = @HOST@ ]; then \
+			(cd @MPFR@ && \
+					CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+					../$(srcdir)/@MPFR@/configure \
+					--with-gmp=$(top_builddir)/rplcas \
+					--disable-shared --enable-static \
+					--prefix=$(top_builddir)/rplcas); \
+		else \
+			(cd @MPFR@ && \
+					CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+					../$(srcdir)/@MPFR@/configure \
+					--host=@HOST@ \
+					--with-gmp=$(top_builddir)/rplcas \
+					--disable-shared --enable-static \
+					--prefix=$(top_builddir)/rplcas); \
+		fi; \
 	fi
 	$(MAKE) -C @MPFR@ $(AM_MAKEFLAGS) all && \
 			$(MAKE) -C @MPFR@ $(AM_MAKEFLAGS) install
 
 lib/ntl.a:
-	(cd @NTL@/src && ./configure)
-	(cd @NTL@/src && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-		   	$(MAKE) $(AM_MAKEFLAGS) -f makefile)
+	if [ @BUILD@ = @HOST@ ]; then \
+		(cd @NTL@/src && ./configure GMP_PREFIX=$(top_builddir)/rplcas \
+				SHARED=off CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"); \
+	else \
+		(cd @NTL@/src && ./configure GMP_PREFIX=$(top_builddir)/rplcas \
+				SHARED=off CC=@HOST@-gcc CXX=@HOST@-g++ \
+				CFLAGS="$(CFLAGS)" CXXFLAGS="@SYSROOT@ $(CXXFLAGS)" \
+				LDFLAGS="-L@SYSROOT2@/usr/lib"); \
+	fi
+	(cd @NTL@/src && \
+		if [ -z '$(make -v | grep "^GNU Make")' -a $(shell uname) != Linux ]; \
+					then \
+				sed 's/make /gmake /g' makefile > makefile2 && \
+				\mv -f makefile2 makefile && \
+				sed 's/make /gmake /g' WizardAux > WizardAux2 && \
+				\mv -f WizardAux2 WizardAux; \
+		fi && \
+		$(MAKE) $(AM_MAKEFLAGS) -f makefile)
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp -R @NTL@/include/NTL include
 
 lib/libcocoa.a: lib/@LIB_PREFIX@gmp.a
+	sed '1,1s/^#!\/bin\/bash/#!@BASH@/g' @COCOA@/configure > @COCOA@/configure2
+	mv -f @COCOA@/configure2 @COCOA@/configure
+	chmod 755 @COCOA@/configure
 	if [ ! -f @COCOA@/configuration/autoconf.mk ]; then \
-		(cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-				./configure --with-libgmp=../lib/libgmp.a \
-				--with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \
-	fi
+		if [ @BUILD@ = @HOST@ ]; then \
+			(cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+					./configure --with-libgmp=../lib/libgmp.a \
+					--with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \
+		else \
+			(cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+					./configure --with-libgmp=../lib/libgmp.a \
+					--with-cxx=@HOST@-g++ \
+					--with-cxxflags="@SYSROOT@ $(CXXFLAGS)" \
+					--with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \
+		fi; \
+	fi
+	sed 's/^SHELL=\/bin\/bash/SHELL=@BASH@/g' @COCOA@/configuration/autoconf.mk \
+			> @COCOA@/configuration/autoconf.mk2
+	mv -f @COCOA@/configuration/autoconf.mk2 @COCOA@/configuration/autoconf.mk
 	$(MAKE) -C @COCOA@ $(AM_MAKEFLAGS) library
 	cp @COCOA@/lib/libcocoa.a lib/libcocoa.a
 	cp -R @COCOA@/include/CoCoA include
 
 lib/libpari.a: lib/@LIB_PREFIX@gmp.a
 	if [ ! -f @PARI@/configured ]; then \
-		(cd @PARI@ && ./Configure --prefix=$(top_builddir)/rplcas \
-				--with-gmp=../lib/libgmp.a \
-				--without-readline --graphic=none -s); \
+		if [ @BUILD@ = @HOST@ ]; then \
+			(cd @PARI@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+					LDFLAGS="$(LDFLAGS)" \
+					./Configure --prefix=$(top_builddir)/rplcas \
+					--with-gmp=../lib/libgmp.a \
+					--without-readline --graphic=none -s); \
+		else \
+			(cd @PARI@ && CC=@HOST@-gcc LD=@HOST@-ld \
+					CFLAGS="@SYSROOT@ $(CFLAGS)" \
+					CXXFLAGS="$(CXXFLAGS)" \
+					LDFLAGS="-L@SYSROOT2@/usr/lib $(LDFLAGS)" \
+					./Configure --prefix=$(top_builddir)/rplcas \
+					--with-gmp=../lib/libgmp.a \
+					--without-readline --graphic=none -s); \
+		fi; \
 		touch @PARI@/configured; \
 	fi
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-			$(MAKE) -C @PARI@ $(AM_MAKEFLAGS) gp && \
+	$(MAKE) -C @PARI@ $(AM_MAKEFLAGS) gp && \
 			$(MAKE) -C @PARI@ $(AM_MAKEFLAGS) install
 
 lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@gmp.a lib/@LIB_PREFIX@mpfr.a lib/ntl.a \
@@ -73,23 +124,42 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 		mkdir @GIAC@ ; \
 	fi
 	if [ ! -f @GIAC@/Makefile2 ]; then \
-		(cd @GIAC@ && \
-				CPPFLAGS="-I$(top_builddir)/rplcas/include $(CPPFLAGS)" \
-				LDFLAGS="-L$(top_builddir)/rplcas/lib $(LDFLAGS)" \
-				../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
-				--enable-pari=$(top_builddir)/rplcas \
-				--enable-ntl=$(top_builddir)/rplcas \
-				--enable-cocoa=$(top_builddir)/rplcas \
-				--enable-gsl=../../tools/@GSL@/.libs/libgsl.a \
-				--disable-shared --enable-static \
-				--disable-gui --without-x && \
-				sed 's/SUBDIRS = src check intl po debianold debian doc examples/SUBDIRS = src check intl po debianold debian/g' Makefile \
-				> Makefile2); \
+		if [ @BUILD@ = @HOST@ ]; then \
+			(cd @GIAC@ && \
+					CXX=@CXX@ \
+					CPPFLAGS="-I$(top_builddir)/rplcas/include -I$(top_builddir)/tools/@GSL@ $(CPPFLAGS)" \
+					CXXFLAGS="$(CXXFLAGS) -fpermissive" \
+					LDFLAGS="-L$(top_builddir)/rplcas/lib $(LDFLAGS)" \
+					../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
+					--enable-pari=$(top_builddir)/rplcas \
+					--enable-ntl=$(top_builddir)/rplcas \
+					--enable-cocoa=$(top_builddir)/rplcas \
+					--enable-gsl=$(top_builddir)/tools/@GSL@/.libs/libgsl.a \
+					--disable-shared --enable-static \
+					--disable-gui --without-x && \
+					sed 's/SUBDIRS = src check intl po debianold debian doc examples/SUBDIRS = src check intl po debianold debian/g' Makefile \
+					> Makefile2); \
+		else \
+			(cd @GIAC@ && \
+					CPPFLAGS="-I$(top_builddir)/rplcas/include -I$(top_builddir)/tools/@GSL@ @SYSROOT@ $(CPPFLAGS)" \
+					CXXFLAGS="$(CXXFLAGS) -fpermissive" \
+					LDFLAGS="-L$(top_builddir)/rplcas/lib -L@SYSROOT2@/usr/lib $(LDFLAGS)" \
+					../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
+					--host=@HOST@ \
+					--enable-pari=$(top_builddir)/rplcas \
+					--enable-ntl=$(top_builddir)/rplcas \
+					--enable-cocoa=$(top_builddir)/rplcas \
+					--enable-gsl=$(top_builddir)/tools/@GSL@/.libs/libgsl.a \
+					--disable-shared --enable-static \
+					--disable-gui --without-x && \
+					sed 's/SUBDIRS = src check intl po debianold debian doc examples/SUBDIRS = src/g' Makefile \
+					> Makefile2); \
+		fi; \
 		(cd @GIAC@/src && \
 				mv -f config.h config.h.orig && \
 				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); \
+				rm -f config.h.orig); \
 	fi
 	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS) -f Makefile2
 	if [ x$(srcdir) != x. ]; then \
@@ -101,7 +171,7 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 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
 	if [ ! -d tmp ]; then mkdir tmp; fi
-	(cd tmp && n=0 && \
+	@(cd tmp && n=0 && \
 			rm -f * && \
 			echo Building standalone librplcas.a; \
 			for i in ../lib/@LIB_PREFIX@gmp.a \