From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 13 May 2014 23:15:01 +0000 (-0700)
Subject: * merge-gnulib: Defer to autogen.sh for ACLOCAL_PATH computation.
X-Git-Tag: emacs-25.0.90~2640^2~109
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ec9847809a57b34d44791b4665df7969071bac4;p=emacs.git

* merge-gnulib: Defer to autogen.sh for ACLOCAL_PATH computation.
---

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 87da4f7e26b..5eeec00cbdb 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* merge-gnulib: Defer to autogen.sh for ACLOCAL_PATH computation.
+
 2014-05-12  Glenn Morris  <rgm@gnu.org>
 
 	* find-gc.el: Move here from ../lisp/emacs-lisp.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 6c0dffb6dce..b93d12fbd20 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -96,4 +96,5 @@ rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/gl-openssl.m4 \
       "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 &&
 cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
 cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux &&
-autoreconf -i -I m4 -- ${src:+"$src"}
+{ test -z "$src" || cd "$src"; } &&
+./autogen.sh