Remove files distributed via gnulib from version control.

4 files changed, 26 insertions, 40 deletions

diff --git a/.gitignore b/.gitignore
index 49f4065..3d9d191 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@
 .#*
 \#*#
 
+# Files brought in by gnulib-tool:
+mkinstalldirs
+
 # Files generated by the autotools:
 /configure
 
diff --git a/ChangeLog b/ChangeLog
index dd4e121..3585894 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-07-01  Bruno Haible  <bruno@clisp.org>
 
+	Remove files distributed via gnulib from version control.
+	* autogen.sh: Fetch mkinstalldirs from the gnulib repository.
+	* mkinstalldirs: Remove file.
+	* .gitignore: Add mkinstalldirs.
+
+2012-07-01  Bruno Haible  <bruno@clisp.org>
+
 	Remove autotools generated files from version control.
 	* autogen.sh: New file.
 	* configure: Remove file.
diff --git a/autogen.sh b/autogen.sh
index 9182dae..c76f1dd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,10 @@
 # autoconf.
 #
 # This script requires autoconf-2.60..2.69 in the PATH.
+# It also requires either
+#   - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
+#     in a gnulib checkout, or
+#   - an internet connection.
 
 # Copyright (C) 2003-2012 Free Software Foundation, Inc.
 #
@@ -23,6 +27,18 @@
 
 # Usage: ./autogen.sh
 
+GNULIB_REPO_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f="
+
+for file in mkinstalldirs; do
+  if test -n "$GNULIB_TOOL"; then
+    $GNULIB_TOOL--copy-file build-aux/$file $file
+  else
+    wget -q --timeout=5 -O $file.tmp "${GNULIB_REPO_URL}build-aux/$file" \
+      && mv $file.tmp $file
+  fi
+done
+chmod a+x mkinstalldirs
+
 rm -f configure lib/configure src/configure tests/configure doc/configure
 rm -f src/config.h.in src/config.h.msvc src/config.h_vms
 make -f Makefile.devel
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100755
index 6b3b5fc..0000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id$
-
-errstatus=0
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here