--- rpl/rplcas/Makefile.in	2012/07/04 13:44:33	1.31
+++ rpl/rplcas/Makefile.in	2019/11/01 13:03:02	1.62
@@ -5,7 +5,7 @@ CXXFLAGS=@CXXFLAGS@
 LDFLAGS=@LDFLAGS@
 OBJEXT=@OBJEXT@
 
-.PHONY: configure clean
+.PHONY: configure clean distclean
 
 all: lib/librplcas.a
 
@@ -17,7 +17,7 @@ lib/@LIB_PREFIX@gmp.a:
 		(cd @GMP@ && \
 				CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 				../$(srcdir)/@GMP@/configure --with-readline=no \
-				--host=@HOST@ \
+				--host=@HOST@ --enable-cxx \
 				--disable-shared --enable-static \
 				--prefix=$(top_builddir)/rplcas); \
 	fi
@@ -49,52 +49,61 @@ 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 \
-				SHARED=off CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"); \
+				SHARED=off 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)" \
+				CXXFLAGS="@SYSROOT@ $(CXXFLAGS)" \
 				LDFLAGS="-L@SYSROOT2@/usr/lib"); \
 	fi
 	(cd @NTL@/src && \
-		if [ -z $(make -v | grep "^GNU Make") ]; then \
+		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;
+				\mv -f WizardAux2 WizardAux; \
 		fi && \
 		$(MAKE) $(AM_MAKEFLAGS) -f makefile)
-	cp @NTL@/src/ntl.a lib/ntl.a
+	if [ ! -d lib ]; then \
+		mkdir lib; \
+	fi; \
+	if [ ! -d include ]; then \
+		mkdir include; \
+	fi; \
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp -R @NTL@/include/NTL include
 
-lib/libcocoa.a: lib/@LIB_PREFIX@gmp.a
-	sed '1,1/^#!\/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 \
-		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 \
 		if [ @BUILD@ = @HOST@ ]; then \
@@ -112,69 +121,84 @@ lib/libpari.a: lib/@LIB_PREFIX@gmp.a
 					--with-gmp=../lib/libgmp.a \
 					--without-readline --graphic=none -s); \
 		fi; \
+		(cd @PARI@ && \
+				sed -i -e 's/perl/perl -I./g' \
+						$$(find . -maxdepth 1 -name "O*")/Makefile); \
 		touch @PARI@/configured; \
 	fi
 	$(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 \
-		lib/libcocoa.a lib/libpari.a
+		lib/libpari.a lib/@LIB_PREFIX@mpfi.a
 	if [ ! -d @GIAC@ ]; then \
 		mkdir @GIAC@ ; \
 	fi
-	if [ ! -f @GIAC@/Makefile2 ]; then \
-		if [ @BUILD@ = @HOST@ ]; then \
-			(cd @GIAC@ && \
-					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 check intl po debianold debian/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); \
-	fi
-	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS) -f 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="$(top_builddir)/rplcas/lib/libpari.a $(top_builddir)/rplcas/lib/ntl.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfi.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfr.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmp.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmpxx.a" \
+				../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
+				--enable-pari \
+				--enable-ntl \
+				--enable-gsl \
+				--disable-shared --enable-static \
+				--disable-gui --without-x); \
+	else \
+		(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)/tools/@GSL@/.libs/libgsl.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfi.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfr.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmp.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmpxx.a $(LDFLAGS) $(LIBGIAC)" \
+				../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
+				--host=@HOST@ \
+				--enable-pari \
+				--enable-ntl \
+				--enable-gsl \
+				--disable-shared --enable-static \
+				--disable-gui --without-x); \
+	fi; \
+	(cd @GIAC@/src && \
+			mv -f config.h config.h.orig && \
+			sed -e 's/#define HAVE_LIBPNG 1//' config.h.orig | \
+			sed -e 's/\/\* #undef HAVE_LIBGMP \*\//#define HAVE_LIBMP/' | \
+			sed -e 's/\/\* #undef HAVE_LIBGMPXX \*\//#define HAVE_LIBMPXX/' | \
+			sed -e 's/\/\* #undef HAVE_LIBMPFR \*\//#define HAVE_LIBPFR/' | \
+			sed -e 's/\/\* #undef HAVE_LIBMPFI \*\//#define HAVE_LIBPFI/' | \
+			sed -e 's/\/\* #undef HAVE_LIBNTL \*\//#define HAVE_LIBNTL/' | \
+			sed -e 's/\/\* #undef HAVE_LIBPARI \*\//#define HAVE_LIBPARI/' | \
+			sed -e 's/\/\* #undef HAVE_LIBGSL \*\//#define HAVE_LIBGSL/' | \
+			sed -e 's/\/#define HAVE_LIBCOCOA 1//' | \
+			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; \
 				do cp $(srcdir)/@GIAC@/$$i @GIAC@/$$i; done; \
+		cp -R $(srcdir)/@GIAC@/icons @GIAC@; \
 	fi
-	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS) install -f Makefile2
+	$(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/libpari.a \
+		lib/@LIB_PREFIX@mpfi.a
 	if [ ! -d tmp ]; then mkdir tmp; fi
+	for i in `ar t lib/@LIB_PREFIX@giac.a | grep a$$`; \
+	do ar d lib/@LIB_PREFIX@giac.a $$i; \
+	done
 	@(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/libcocoa.a \
+					../lib/@LIB_PREFIX@mpfi.a \
 					../lib/libpari.a \
 					../lib/ntl.a \
 					../lib/@LIB_PREFIX@giac.a; \
@@ -203,7 +227,7 @@ lib/librplcas.a: lib/@LIB_PREFIX@giac.a
 				done; \
 				if test -n "$$L"; then \
 					echo -n "Adding files to librplcas.a archive... "; \
-					ar cru ../lib/librplcas.a $$L; \
+					ar cr ../lib/librplcas.a $$L; \
 					rm -f $$L; \
 					echo "done"; \
 				fi; \