--- rpl/Attic/Makefile.in	2010/04/20 12:56:21	1.13
+++ rpl/Attic/Makefile.in	2010/08/26 17:56:18	1.31
@@ -134,6 +134,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BROKEN_SIGINFO = @BROKEN_SIGINFO@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -143,6 +144,7 @@ CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+C_STANDARD = @C_STANDARD@
 DATE = @DATE@
 DATE_FR = @DATE_FR@
 DEBUG = @DEBUG@
@@ -156,6 +158,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@
 EXPORT_DYNAMIC = @EXPORT_DYNAMIC@
+EXT_SQL = @EXT_SQL@
 F77 = @F77@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
@@ -178,14 +181,16 @@ 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@
-LIBMTMALLOC = @LIBMTMALLOC@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MALLOC = @MALLOC@
 MKDIR_P = @MKDIR_P@
 MOTIF_SUPPORT = @MOTIF_SUPPORT@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@
@@ -210,6 +215,8 @@ READLINE = @READLINE@
 RUNPATH = @RUNPATH@
 SED = @SED@
 SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
+SEMAPHORES_SYSV = @SEMAPHORES_SYSV@
+SEMUN = @SEMUN@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQLITE = @SQLITE@
@@ -288,7 +295,7 @@ 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 src \
+SUBDIRS = tools rplsums rpliconv lapack/blas lapack/lapack ptmalloc3 src \
 		rpltags scripts man doc
 
 EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \
@@ -703,11 +710,6 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -817,14 +819,14 @@ 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:
 	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
 			@FILE@ @ICONV@ @SQLITE@; \
 	do \
-		(cd $(top_builddir)/tools/$$i && $(MAKE) $(AM_MAKEFLAGS) clean); \
+		$(MAKE) -C $(top_builddir)/tools/$$i $(AM_MAKEFLAGS) clean); \
 	done;
 
 $(top_builddir)/tools/@NCURSES@/lib/libncurses.a:
@@ -852,26 +854,82 @@ $(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;
-	(cd $(top_builddir)/tools/@NCURSES@ && $(MAKE) $(AM_MAKEFLAGS))
+#	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 \
+			'/^CXX_AR[ \t]/ \
+				{ printf("CXX_AR = $(AR)\n"); } \
+			! /^CXX_AR[ \t]/ \
+				{ print; }' \
+			$(top_builddir)/tools/@NCURSES@/c++/Makefile | \
+		awk \
+			'/^CXX_ARFLAGS[ \t]/ \
+				{ printf("CXX_ARFLAGS = $(ARFLAGS)\n"); } \
+			! /^CXX_ARFLAGS[ \t]/ \
+				{ print; }' | \
+		awk \
+			'/^CXX[ \t]/ \
+				{ printf("CXX = g++\n"); } \
+			! /^CXX[ \t]/ \
+				{ print; }' > $$TMP; \
+		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 \
+				$(top_builddir)/tools/@NCURSES@/lib/libncurses.a; \
+	fi
 
 $(top_builddir)/tools/@READLINE@/libreadline.a \
 		$(top_builddir)/tools/@READLINE@/libhistory.a:
-	(cd $(top_builddir)/tools/@READLINE@ && $(MAKE) $(AM_MAKEFLAGS))
+	$(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@GSL@/.libs/libgsl.a:
-	(cd $(top_builddir)/tools/@GSL@ && $(MAKE) $(AM_MAKEFLAGS))
+# 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 \
+		(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:
 # La dépendance est faite par rpliconv.
-	(cd $(top_builddir)/tools/@ICONV@ && $(MAKE) $(AM_MAKEFLAGS))
+	if [ @OS@ = "OS2" ]; then \
+		TMP=$$(mktemp tmp.XXXXXXXXXX); \
+		awk '! /^[ \t]cd po/ { print; }' \
+				$(top_builddir)/tools/@ICONV@/Makefile > $$TMP; \
+		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 \
+				$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a; \
+	else \
+		$(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \
+	fi
 
 $(top_builddir)/lapack/lapack/liblapack.a:
 	(cd $(top_builddir)/lapack/lapack && $(MAKE) $(AM_MAKEFLAGS))
@@ -879,11 +937,11 @@ $(top_builddir)/lapack/lapack/liblapack.
 $(top_builddir)/lapack/blas/libblas.a:
 	(cd $(top_builddir)/lapack/blas && $(MAKE) $(AM_MAKEFLAGS))
 
-$(top_builddir)/rpliconv/rpliconv: \
+$(top_builddir)/rpliconv/rpliconv$(EXEEXT): \
 		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
-	(cd $(top_builddir)/rpliconv && $(MAKE) $(AM_MAKEFLAGS))
+	$(MAKE) -C $(top_builddir)/rpliconv $(AM_MAKEFLAGS)
 
-$(top_builddir)/tools/@FILE@/src/rplfile \
+$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc: \
 		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
 	TMP=$$(mktemp tmp.XXXXXXXXXX); \
@@ -905,25 +963,48 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 			print; \
 		} \
 	}' tools/@FILE@/src/Makefile > $$TMP; \
-	\mv -f $$TMP tools/@FILE@/src/Makefile
-	(cd $(top_builddir)/tools/@FILE@ && $(MAKE) $(AM_MAKEFLAGS))
+	mv -f $$TMP tools/@FILE@/src/Makefile
+	$(MAKE) -C $(top_builddir)/tools/@FILE@ $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:
-	(cd $(top_builddir)/tools/@SQLITE@ && $(MAKE) $(AM_MAKEFLAGS))
+	$(MAKE) -C $(top_builddir)/tools/@SQLITE@ $(AM_MAKEFLAGS)
+	if [ @OS@ = "OS2" ]; then \
+		cp $(top_builddir)/tools/@SQLITE@/.libs/sqlite3.a \
+				$(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a; \
+	fi
 
 $(top_builddir)/tools/@OPENSSL@/libcrypto.a \
 		$(top_builddir)/tools/@OPENSSL@/libssl.a:
-	(cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) $(AM_MAKEFLAGS))
+	if [ @OS@ = "OS2" ]; then \
+		(cd $(top_builddir)/tools/@OPENSSL@ && \
+				sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \
+				OS2-EMX.mak | \
+				sed -e '1,$$s/-DBN_ASM/-UBN_ASM/g' | \
+				sed -e '1,$$s/-DMD5_ASM/-UMD5_ASM/g' | \
+				sed -e '1,$$s/-DSHA1_ASM/-USHA1_ASM/g' | \
+				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 \
+						$(top_builddir)/tools/@OPENSSL@/libssl.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 :
+	$(MAKE) -C $(top_builddir)/ptmalloc3 $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/rplsums/rplmd5sum \
 		$(top_builddir)/tools/rplsums/rplsha1sum: \
 		$(top_builddir)/tools/@OPENSSL@/libcrypto.a
-	(cd $(top_builddir)/rplsums && $(MAKE) $(AM_MAKEFLAGS))
+	$(MAKE) -C $(top_builddir)/rplsums $(AM_MAKEFLAGS)
 
-$(top_builddir)/tools/@GPP@/src/gpp:
-	(cd $(top_builddir)/tools/@GPP@ && $(MAKE) $(AM_MAKEFLAGS))
+$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT):
+	$(MAKE) -C $(top_builddir)/tools/@GPP@ $(AM_MAKEFLAGS)
 
-.NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile \
+.NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc
 
 .NOTPARALLEL: $(top_builddir)/tools/@READLINE@/libreadline.a \
@@ -935,6 +1016,9 @@ $(top_builddir)/tools/@GPP@/src/gpp:
 .NOTPARALLEL: $(top_builddir)/tools/rplsums/rplmd5sum \
 		$(top_builddir)/tools/rplsums/rplsha1sum
 
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) install
+
 all: $(top_builddir)/tools/@NCURSES@/lib/libncurses.a \
 		$(top_builddir)/tools/@READLINE@/libreadline.a \
 		$(top_builddir)/tools/@READLINE@/libhistory.a \
@@ -944,16 +1028,18 @@ 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)/rpliconv/rpliconv \
-		$(top_builddir)/tools/@FILE@/src/rplfile \
+		$(top_builddir)/ptmalloc3/libptmalloc3.a \
+		$(top_builddir)/rpliconv/rpliconv$(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
+		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT)
 # Cette règle n'est là que pour forcer la compilation de Gnuplot.
-	(cd $(top_builddir)/tools && $(MAKE) $(AM_MAKEFLAGS))
-	(cd $(top_builddir)/rpltags && $(MAKE) $(AM_MAKEFLAGS))
-	(cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS))
+	$(MAKE) -C $(top_builddir)/tools $(AM_MAKEFLAGS)
+	$(MAKE) -C $(top_builddir)/rpltags $(AM_MAKEFLAGS)
+	$(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS)
+	if [ @OS@ = "OpenBSD" ]; then chmod 755 install-sh; fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.