--- rpl/rplcas/Makefile.in	2016/09/26 14:47:19	1.47
+++ rpl/rplcas/Makefile.in	2019/11/01 13:03:02	1.62
@@ -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
@@ -95,34 +95,15 @@ lib/ntl.a:
 				\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,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 \
-		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 \
@@ -149,7 +130,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/@LIB_PREFIX@mpfi.a
+		lib/libpari.a lib/@LIB_PREFIX@mpfi.a
 	if [ ! -d @GIAC@ ]; then \
 		mkdir @GIAC@ ; \
 	fi
@@ -158,11 +139,10 @@ 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 $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfi.a $(LDFLAGS)" \
+				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-cocoa \
 				--enable-gsl \
 				--disable-shared --enable-static \
 				--disable-gui --without-x); \
@@ -170,12 +150,11 @@ 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 $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfi.a $(LDFLAGS)" \
+				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-cocoa \
 				--enable-gsl \
 				--disable-shared --enable-static \
 				--disable-gui --without-x); \
@@ -183,6 +162,14 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 	(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 && \
@@ -200,7 +187,7 @@ 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/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$$`; \
@@ -212,7 +199,6 @@ lib/librplcas.a: lib/@LIB_PREFIX@giac.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 \
 					../lib/@LIB_PREFIX@giac.a; \