[Emacs-diffs] master 44c588a: Port recent autogen.sh changes to Darwin

[Paul Eggert]

branch: master
commit 44c588a25ce231ce05fb535cd6d7162e91214f45
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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.
---
 autogen.sh |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 91e1e2c..f6bfde6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -223,7 +223,10 @@ Please report any problems with this script to 
address@hidden .'
 
   ## 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' ..."