--- rpl/Attic/configure	2010/03/01 14:48:13	1.7
+++ rpl/Attic/configure	2010/03/04 10:09:30	1.8
@@ -607,6 +607,8 @@ UNITS
 READLINE
 NCURSES
 LIBMTMALLOC
+OS
+LIBICONV
 GNUPLOT_COMPILATION
 subdirs
 EGREP
@@ -6034,18 +6036,14 @@ fi
 if test ! -d "$srcdir"/tools/$FILE; then
 	gunzip -c "$srcdir"/tools/$FILE.tar.gz | \
 			(cd "$srcdir/tools" && tar -xf - )
+	TMP=$(mktemp)
 	(cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1)
-	sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > \
-		"$srcdir"/tools/$FILE/src/Makefile.am2
-	sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' \
-		"$srcdir"/tools/$FILE/src/Makefile.am2 | \
+	sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > $TMP
+	sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' $TMP | \
 		sed 's/^file_/rplfile_/g' > \
 		"$srcdir"/tools/$FILE/src/Makefile.am
-	\rm -f "$srcdir"/tools/$FILE/src/Makefile.am2
-	sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > \
-		"$srcdir"/tools/$FILE/magic/Makefile.am2
-	\mv -f "$srcdir"/tools/$FILE/magic/Makefile.am2 \
-		"$srcdir"/tools/$FILE/magic/Makefile.am
+	sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > $TMP
+	\mv -f $TMP "$srcdir"/tools/$FILE/magic/Makefile.am
 	(cd "$srcdir"/tools/$FILE && libtoolize --copy --force \
 		&& aclocal && automake -af && autoconf);
 fi
@@ -9063,6 +9061,28 @@ case $host_cpu in
 
 esac
 
+case $host_os in
+
+	cygwin*)
+		LIBICONV=libiconv.dll.a
+		OS=Cygwin
+	break ;;
+
+	interix*)
+		LIBICONV=libiconv.dll.a
+		OS=Interix
+	break ;;
+
+	*)
+		LIBICONV=libiconv.a
+		OS=$(uname)
+	break ;;
+
+esac
+
+
+
+
 DATE_FR=$(env LC_ALL=fr_FR date +'%A %x, %X %Z')
 DATE=$(env LC_ALL=C date +'%A %x, %X %Z')