[PATCH] Use aclocal option --system-acdir rather than --acdir

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] Use aclocal option --system-acdir rather than --acdir

Jon TURNEY
In autogen.sh, use 'aclocal --system-acdir' rather than 'aclocal --acdir'.

'--acdir' was deprecated in automake 1.11 and removed in automake 1.13.
---
 winsup/cygserver/autogen.sh | 2 +-
 winsup/cygwin/autogen.sh    | 2 +-
 winsup/utils/autogen.sh     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/winsup/cygserver/autogen.sh b/winsup/cygserver/autogen.sh
index 87a0d9c06..dc2c8b70a 100755
--- a/winsup/cygserver/autogen.sh
+++ b/winsup/cygserver/autogen.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
-/usr/bin/aclocal --acdir=..
+/usr/bin/aclocal --system-acdir=..
 /usr/bin/autoconf -f
 exec /bin/rm -rf autom4te.cache
diff --git a/winsup/cygwin/autogen.sh b/winsup/cygwin/autogen.sh
index 87a0d9c06..dc2c8b70a 100755
--- a/winsup/cygwin/autogen.sh
+++ b/winsup/cygwin/autogen.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
-/usr/bin/aclocal --acdir=..
+/usr/bin/aclocal --system-acdir=..
 /usr/bin/autoconf -f
 exec /bin/rm -rf autom4te.cache
diff --git a/winsup/utils/autogen.sh b/winsup/utils/autogen.sh
index 87a0d9c06..dc2c8b70a 100755
--- a/winsup/utils/autogen.sh
+++ b/winsup/utils/autogen.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
-/usr/bin/aclocal --acdir=..
+/usr/bin/aclocal --system-acdir=..
 /usr/bin/autoconf -f
 exec /bin/rm -rf autom4te.cache
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Use aclocal option --system-acdir rather than --acdir

Corinna Vinschen-2
On Oct 16 14:46, Jon Turney wrote:

> In autogen.sh, use 'aclocal --system-acdir' rather than 'aclocal --acdir'.
>
> '--acdir' was deprecated in automake 1.11 and removed in automake 1.13.
> ---
>  winsup/cygserver/autogen.sh | 2 +-
>  winsup/cygwin/autogen.sh    | 2 +-
>  winsup/utils/autogen.sh     | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/winsup/cygserver/autogen.sh b/winsup/cygserver/autogen.sh
> index 87a0d9c06..dc2c8b70a 100755
> --- a/winsup/cygserver/autogen.sh
> +++ b/winsup/cygserver/autogen.sh
> @@ -1,4 +1,4 @@
>  #!/bin/sh -e
> -/usr/bin/aclocal --acdir=..
> +/usr/bin/aclocal --system-acdir=..
>  /usr/bin/autoconf -f
>  exec /bin/rm -rf autom4te.cache
> diff --git a/winsup/cygwin/autogen.sh b/winsup/cygwin/autogen.sh
> index 87a0d9c06..dc2c8b70a 100755
> --- a/winsup/cygwin/autogen.sh
> +++ b/winsup/cygwin/autogen.sh
> @@ -1,4 +1,4 @@
>  #!/bin/sh -e
> -/usr/bin/aclocal --acdir=..
> +/usr/bin/aclocal --system-acdir=..
>  /usr/bin/autoconf -f
>  exec /bin/rm -rf autom4te.cache
> diff --git a/winsup/utils/autogen.sh b/winsup/utils/autogen.sh
> index 87a0d9c06..dc2c8b70a 100755
> --- a/winsup/utils/autogen.sh
> +++ b/winsup/utils/autogen.sh
> @@ -1,4 +1,4 @@
>  #!/bin/sh -e
> -/usr/bin/aclocal --acdir=..
> +/usr/bin/aclocal --system-acdir=..
>  /usr/bin/autoconf -f
>  exec /bin/rm -rf autom4te.cache
> --
> 2.28.0

+1


Corinna