diff mbox

Fix building with autoconf version older than 2.60.

Message ID 1341854687-17786-1-git-send-email-asn@samba.org (mailing list archive)
State New, archived
Headers show

Commit Message

Andreas Schneider July 9, 2012, 5:24 p.m. UTC
From: Andreas Schneider <asn@cryptomilk.org>

AC_PROG_SED is only avaliable in recent autoconf versions.
Use AC_CHECK_PROG instead if AC_PROG_SED is not present.

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
---
 configure.ac |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Jeff Layton July 10, 2012, 5:17 p.m. UTC | #1
On Mon,  9 Jul 2012 19:24:47 +0200
Andreas Schneider <asn@samba.org> wrote:

> From: Andreas Schneider <asn@cryptomilk.org>
> 
> AC_PROG_SED is only avaliable in recent autoconf versions.
> Use AC_CHECK_PROG instead if AC_PROG_SED is not present.
> 
> Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
> ---
>  configure.ac |    7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 0dd1155..f95a2de 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -44,10 +44,15 @@ AC_ARG_VAR(ROOTSBINDIR, [Location where files ordinarily under /sbin should be i
>  
>  # Checks for programs.
>  AC_PROG_CC
> -AC_PROG_SED
>  AC_GNU_SOURCE
>  AM_PROG_CC_C_O
>  
> +# AC_PROG_SED is only avaliable in recent autoconf versions.
> +# Use AC_CHECK_PROG instead if AC_PROG_SED is not present.
> +ifdef([AC_PROG_SED],
> +      [AC_PROG_SED],
> +      [AC_CHECK_PROG(SED, sed, sed)])
> +
>  # Checks for typedefs, structures, and compiler characteristics.
>  AC_HEADER_STDBOOL
>  AC_TYPE_UID_T

Merged...
diff mbox

Patch

diff --git a/configure.ac b/configure.ac
index 0dd1155..f95a2de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,10 +44,15 @@  AC_ARG_VAR(ROOTSBINDIR, [Location where files ordinarily under /sbin should be i
 
 # Checks for programs.
 AC_PROG_CC
-AC_PROG_SED
 AC_GNU_SOURCE
 AM_PROG_CC_C_O
 
+# AC_PROG_SED is only avaliable in recent autoconf versions.
+# Use AC_CHECK_PROG instead if AC_PROG_SED is not present.
+ifdef([AC_PROG_SED],
+      [AC_PROG_SED],
+      [AC_CHECK_PROG(SED, sed, sed)])
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
 AC_TYPE_UID_T