--- rpl/Attic/Makefile.in	2010/08/06 15:32:16	1.26
+++ 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@
@@ -179,6 +181,8 @@ 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@
@@ -211,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@
@@ -813,7 +819,7 @@ 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,11 +854,11 @@ $(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;
@@ -866,7 +872,7 @@ $(top_builddir)/tools/@NCURSES@/lib/libn
 #				printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \
 #			! /^TEST_ARGS/ \
 #				{ print; }' tools/@NCURSES@/test/Makefile > $$TMP; \
-#		\mv -f $$TMP $$i; \
+#		mv -f $$TMP $$i; \
 #		echo .; \
 #	done;
 	if [ @OS@ = "OS2" ]; then \
@@ -887,11 +893,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 +906,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 +923,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; \
@@ -958,7 +963,7 @@ $(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)
 
 $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:
@@ -980,21 +985,16 @@ $(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
+	$(MAKE) -C $(top_builddir)/ptmalloc3 $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/rplsums/rplmd5sum \
 		$(top_builddir)/tools/rplsums/rplsha1sum: \
@@ -1039,6 +1039,7 @@ all: $(top_builddir)/tools/@NCURSES@/lib
 	$(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.