From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 4 Jan 2017 08:44:45 +0000 (-0800)
Subject: Port recent autogen.sh changes to Darwin
X-Git-Tag: emacs-26.0.90~939
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=44c588a25ce231ce05fb535cd6d7162e91214f45;p=emacs.git

Port recent autogen.sh changes to Darwin

Problem reported by Sam Steingold (Bug#25347).
* autogen.sh: Don't assume 'sed -f-' reads a script from stdin, as
POSIX does not require it and it does not work on Darwin.
---

diff --git a/autogen.sh b/autogen.sh
index 91e1e2cea23..f6bfde6afb2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -223,7 +223,10 @@ Please report any problems with this script to bug-gnu-emacs@gnu.org .'
 
   ## Create nt/gnulib.mk if it doesn't exist, as autoreconf will need it.
   if test ! -f nt/gnulib.mk; then
-      sed '/^[^#]/s|^.*$|/^## begin  *gnulib module &/,/^## end  *gnulib module &/c ## gnulib module & removed|' nt/gnulib-modules-to-delete.cfg | sed -f- lib/gnulib.mk > nt/gnulib.mk
+      echo 'Inferring nt/gnulib.mk from lib/gnulib.mk ...'
+      metascript='/^[^#]/s|^.*$|/^## begin  *gnulib module &/,/^## end  *gnulib module &/c ## gnulib module & removed|'
+      script=`sed "$metascript" nt/gnulib-modules-to-delete.cfg` || exit
+      sed "$script" lib/gnulib.mk > nt/gnulib.mk || exit
   fi
 
   echo "Running 'autoreconf -fi -I m4' ..."