--- rpl/Attic/Makefile.in	2010/08/06 15:27:40	1.25
+++ rpl/Attic/Makefile.in	2011/09/15 19:46:41	1.48
@@ -39,9 +39,9 @@ subdir = .
 DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
 	$(srcdir)/COPYING.in $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/rplconfig.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh ltmain.sh \
-	missing mkinstalldirs
+	$(top_srcdir)/configure $(top_srcdir)/rplcas/Makefile.in \
+	AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \
+	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -50,7 +50,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = rplconfig.h
-CONFIG_CLEAN_FILES = COPYING
+CONFIG_CLEAN_FILES = COPYING rplcas/Makefile
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -128,21 +128,25 @@ DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
+ABI = @ABI@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BSH_PATH = @BSH_PATH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COCOA = @COCOA@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+C_STANDARD = @C_STANDARD@
 DATE = @DATE@
 DATE_FR = @DATE_FR@
 DEBUG = @DEBUG@
@@ -153,6 +157,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ELF = @ELF@
 EXEEXT = @EXEEXT@
 EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@
 EXPORT_DYNAMIC = @EXPORT_DYNAMIC@
@@ -164,6 +169,8 @@ FFLAGS = @FFLAGS@
 FILE = @FILE@
 FINAL_ENCODING = @FINAL_ENCODING@
 FORCE_GNUPLOT_PATH = @FORCE_GNUPLOT_PATH@
+GIAC = @GIAC@
+GMP = @GMP@
 GNUPLOT = @GNUPLOT@
 GNUPLOT_COMPILATION = @GNUPLOT_COMPILATION@
 GNUPLOT_P = @GNUPLOT_P@
@@ -173,15 +180,19 @@ GREP = @GREP@
 GS = @GS@
 GSL = @GSL@
 GV = @GV@
+HOST = @HOST@
 ICONV = @ICONV@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPCS_SYSV = @IPCS_SYSV@
+IPV6 = @IPV6@
 LATEX = @LATEX@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
+LIBRPLCAS = @LIBRPLCAS@
 LIBS = @LIBS@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -189,10 +200,13 @@ MAKEINFO = @MAKEINFO@
 MALLOC = @MALLOC@
 MKDIR_P = @MKDIR_P@
 MOTIF_SUPPORT = @MOTIF_SUPPORT@
+MPFR = @MPFR@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@
 NCURSES = @NCURSES@
 NESTED_FUNCTIONS = @NESTED_FUNCTIONS@
+NTL = @NTL@
 OBJEXT = @OBJEXT@
+OPENMOTIF = @OPENMOTIF@
 OPENSSL = @OPENSSL@
 OS = @OS@
 PACKAGE = @PACKAGE@
@@ -202,17 +216,21 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARI = @PARI@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSTGRESQL_SUPPORT = @POSTGRESQL_SUPPORT@
 POSTSCRIPT_SUPPORT = @POSTSCRIPT_SUPPORT@
 PROFILAGE = @PROFILAGE@
 RANLIB = @RANLIB@
 READLINE = @READLINE@
+RPLCAS = @RPLCAS@
 RUNPATH = @RUNPATH@
 SED = @SED@
 SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
+SEMUN = @SEMUN@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SIGSEGV = @SIGSEGV@
 SQLITE = @SQLITE@
 STRIP = @STRIP@
 TEX = @TEX@
@@ -289,16 +307,18 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = tools rplsums rpliconv lapack/blas lapack/lapack ptmalloc3 src \
+SUBDIRS = tools rplsums rpliconv rplawk lapack/blas lapack/lapack rplcas src \
 		rpltags scripts man doc
 
+include_HEADERS = rplconfig.h
 EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \
 		COPYING.in lapack/COPYING lapack/RELEASE \
 		tests/tests.tar.gz vim/indent/rpl.vim vim/ftplugin/rpl.vim \
 		vim/syntax/rpl.vim examples/obele.rpl examples/appel.tar.gz \
-		examples/external.tar.gz
+		examples/external.tar.gz \
+		rplcas/@GMP@.tar.gz rplcas/@MPFR@.tar.gz rplcas/@NTL@.tar.gz \
+		rplcas/@COCOA@.tar.gz rplcas/@PARI@.tar.gz rplcas/@GIAC@.tar.gz
 
-include_HEADERS = rplconfig.h
 all: rplconfig.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -356,6 +376,8 @@ distclean-hdr:
 	-rm -f rplconfig.h stamp-h1
 COPYING: $(top_builddir)/config.status $(srcdir)/COPYING.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+rplcas/Makefile: $(top_builddir)/config.status $(top_srcdir)/rplcas/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
@@ -807,13 +829,13 @@ uninstall-am: uninstall-includeHEADERS
 
 licences:
 	cp -f $(top_builddir)/COPYING $(srcdir)
-	make -C src $@
+	$(MAKE) -C src $@
 
 toolsdistclean:
 	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
 			@FILE@ @ICONV@ @SQLITE@; \
 	do \
-		\rm -rf $(srcdir)/tools/$$i; \
+		rm -rf $(srcdir)/tools/$$i; \
 	done;
 
 toolsclean:
@@ -848,27 +870,27 @@ $(top_builddir)/tools/@NCURSES@/lib/libn
 					print; \
 				} \
 			}' $$i > $$TMP; \
-			\mv -f $$TMP $$i; \
+			mv -f $$TMP $$i; \
 			echo -n " (fixed)"; \
 		else \
 			echo -n " (nothing to do)"; \
-			\rm -f $$TMP; \
+			rm -f $$TMP; \
 		fi; \
 		echo .; \
 	done;
-#	for i in tools/@NCURSES@/test/Makefile; \
-#	do \
-#		echo -n Checking $$i; \
-#		TMP=$$(mktemp tmp.XXXXXXXXXX); \
-#		awk \
-#			'/^TEST_ARGS/ \
-#				{ printf("TEST_ARGS = ../lib/libform.a ../lib/libmenu.a "); \
-#				printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \
-#			! /^TEST_ARGS/ \
-#				{ print; }' tools/@NCURSES@/test/Makefile > $$TMP; \
-#		\mv -f $$TMP $$i; \
-#		echo .; \
-#	done;
+	for i in tools/@NCURSES@/test/Makefile; \
+	do \
+		echo -n Checking $$i; \
+		TMP=$$(mktemp tmp.XXXXXXXXXX); \
+		awk \
+			'/^TEST_ARGS/ \
+				{ printf("TEST_ARGS = ../lib/libform.a ../lib/libmenu.a "); \
+				printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \
+			! /^TEST_ARGS/ \
+				{ print; }' tools/@NCURSES@/test/Makefile > $$TMP; \
+		mv -f $$TMP $$i; \
+		echo .; \
+	done;
 	if [ @OS@ = "OS2" ]; then \
 		TMP=$$(mktemp tmp.XXXXXXXXXX); \
 		awk \
@@ -887,11 +909,11 @@ $(top_builddir)/tools/@NCURSES@/lib/libn
 				{ printf("CXX = g++\n"); } \
 			! /^CXX[ \t]/ \
 				{ print; }' > $$TMP; \
-		\mv -f $$TMP $(top_builddir)/tools/@NCURSES@/c++/Makefile; \
+		mv -f $$TMP $(top_builddir)/tools/@NCURSES@/c++/Makefile; \
 	fi;
 	$(MAKE) -C $(top_builddir)/tools/@NCURSES@ $(AM_MAKEFLAGS)
 	if [ @OS@ = "OS2" ]; then \
-		\cp -f $(top_builddir)/tools/@NCURSES@/lib/ncurses.a \
+		cp -f $(top_builddir)/tools/@NCURSES@/lib/ncurses.a \
 				$(top_builddir)/tools/@NCURSES@/lib/libncurses.a; \
 	fi
 
@@ -900,16 +922,15 @@ $(top_builddir)/tools/@READLINE@/libread
 	$(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@GSL@/.libs/libgsl.a:
+# Quick and dirty hack pour avaliser le remplacement de ${1 + "$@"}
+# dans ltmain.sh et propager les modifications dans le script libtool.
 	if [ @OS@ = "OS2" ]; then \
-		mkdir $(top_builddir)/tools/@GSL@/.libs; \
-		for i in `grep ^SUBDIRS $(top_builddir)/tools/@GSL@/Makefile`; \
-		do \
-			(cd $(top_builddir)/tools/@GSL@/$$i && $(MAKE) $(AM_MAKEFLAGS) \
-					&& if [ -d .libs ]; then cd .libs && \
-					ar -cru ../../.libs/libgsl.a *.o; fi;); \
-		done; \
-	else \
-		(cd $(top_builddir)/tools/@GSL@ && $(MAKE) $(AM_MAKEFLAGS)); \
+		(cd $(top_builddir)/tools/@GSL@ && configure --disable-shared;); \
+	fi
+	$(MAKE) -C $(top_builddir)/tools/@GSL@ $(AM_MAKEFLAGS)
+	if [ @OS@ = "OS2" ]; then \
+		cp $(top_builddir)/tools/@GSL@/.libs/gsl.a \
+				$(top_builddir)/tools/@GSL@/.libs/libgsl.a; \
 	fi
 
 $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a:
@@ -918,9 +939,9 @@ $(top_builddir)/tools/@ICONV@/lib/.libs/
 		TMP=$$(mktemp tmp.XXXXXXXXXX); \
 		awk '! /^[ \t]cd po/ { print; }' \
 				$(top_builddir)/tools/@ICONV@/Makefile > $$TMP; \
-		\mv -f $$TMP $(top_builddir)/tools/@ICONV@/Makefile; \
+		mv -f $$TMP $(top_builddir)/tools/@ICONV@/Makefile; \
 		$(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \
-		\cp -f $(top_builddir)/tools/@ICONV@/lib/.libs/iconv.a \
+		cp -f $(top_builddir)/tools/@ICONV@/lib/.libs/iconv.a \
 				$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a; \
 	else \
 		$(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \
@@ -936,6 +957,9 @@ $(top_builddir)/rpliconv/rpliconv$(EXEEX
 		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
 	$(MAKE) -C $(top_builddir)/rpliconv $(AM_MAKEFLAGS)
 
+$(top_builddir)/rplawk/rplawk$(EXEEXT):
+	$(MAKE) -C $(top_builddir)/rplawk $(AM_MAKEFLAGS)
+
 $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc: \
 		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
@@ -958,8 +982,12 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 			print; \
 		} \
 	}' tools/@FILE@/src/Makefile > $$TMP; \
-	\mv -f $$TMP tools/@FILE@/src/Makefile
+	mv -f $$TMP tools/@FILE@/src/Makefile
 	$(MAKE) -C $(top_builddir)/tools/@FILE@ $(AM_MAKEFLAGS)
+	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
+			$(top_builddir)/tools/@FILE@/src/*.o \
+			$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
+			cut -d= -f2) $(LDFLAGS)
 
 $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:
 	$(MAKE) -C $(top_builddir)/tools/@SQLITE@ $(AM_MAKEFLAGS)
@@ -980,22 +1008,14 @@ $(top_builddir)/tools/@OPENSSL@/libcrypt
 				sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \
 				> OS2-EMX.mak2; \
 				$(MAKE) -j1 -f OS2-EMX.mak2 $(AM_MAKEFLAGS)); \
-				\cp $(top_builddir)/tools/@OPENSSL@/out/ssl.a \
+				cp $(top_builddir)/tools/@OPENSSL@/out/ssl.a \
 						$(top_builddir)/tools/@OPENSSL@/libssl.a; \
-				\cp $(top_builddir)/tools/@OPENSSL@/out/crypto.a \
+				cp $(top_builddir)/tools/@OPENSSL@/out/crypto.a \
 						$(top_builddir)/tools/@OPENSSL@/libcrypto.a; \
 	else \
 		(cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) -j1 $(AM_MAKEFLAGS)); \
 	fi
 
-$(top_builddir)/ptmalloc3/libptmalloc3.a :
-	if [ @OS@ = "OS2" ]; then \
-		echo "unavailable for OS2" \
-				> $(top_builddir)/ptmalloc3/libptmalloc3.a; \
-	else \
-		$(MAKE) -C $(top_builddir)/ptmalloc3 $(AM_MAKEFLAGS); \
-	fi
-
 $(top_builddir)/tools/rplsums/rplmd5sum \
 		$(top_builddir)/tools/rplsums/rplsha1sum: \
 		$(top_builddir)/tools/@OPENSSL@/libcrypto.a
@@ -1019,6 +1039,10 @@ $(top_builddir)/tools/@GPP@/src/gpp$(EXE
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) install
 
+$(top_builddir)/rplcas/lib/librplcas.a: \
+		$(top_builddir)/tools/@GSL@/.libs/libgsl.a
+	$(MAKE) -C $(top_builddir)/rplcas $(AM_MAKEFLAGS)
+
 all: $(top_builddir)/tools/@NCURSES@/lib/libncurses.a \
 		$(top_builddir)/tools/@READLINE@/libreadline.a \
 		$(top_builddir)/tools/@READLINE@/libhistory.a \
@@ -1028,13 +1052,14 @@ all: $(top_builddir)/tools/@NCURSES@/lib
 		$(top_builddir)/tools/@OPENSSL@/libssl.a \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
-		$(top_builddir)/ptmalloc3/libptmalloc3.a \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
+		$(top_builddir)/rplawk/rplawk$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc \
-		$(top_builddir)/tools/rplsums/rplmd5sum \
-		$(top_builddir)/tools/rplsums/rplsha1sum \
-		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT)
+		$(top_builddir)/tools/rplsums/rplmd5sum$(EXEEXT) \
+		$(top_builddir)/tools/rplsums/rplsha1sum$(EXEEXT) \
+		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
+		@LIBRPLCAS@
 # Cette règle n'est là que pour forcer la compilation de Gnuplot.
 	$(MAKE) -C $(top_builddir)/tools $(AM_MAKEFLAGS)
 	$(MAKE) -C $(top_builddir)/rpltags $(AM_MAKEFLAGS)