Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
(#23448) fix configure when run with dash
Browse files Browse the repository at this point in the history
  • Loading branch information
tornaria committed Jul 18, 2017
1 parent b63a0d2 commit 60ac900
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions configure.ac
Expand Up @@ -37,17 +37,7 @@ dnl By default, it is the subdirectory local, but the user
dnl can override it by supplying --prefix=....
AC_PREFIX_DEFAULT(`pwd -P`/local)

dnl We don't really use automake, but configure needs aclocal and the
dnl automake library files (like config.guess).
AM_INIT_AUTOMAKE([1.9.6 foreign])

# Allow "configure --disable-maintainer-mode" to disable timestamp checking
AM_MAINTAINER_MODE([enable])

dnl Make sure the path to our own m4 macros is always properly set
dnl and doesn't depend on how autoconf is called.
AC_CONFIG_MACRO_DIR([m4])

# The following needs to be run before AM_INIT_AUTOMAKE()
#---------------------------------------------------------
# We need to run this configure script with bash
if test -z "$BASH_VERSION$CONFIG_SHELL"
Expand All @@ -72,6 +62,17 @@ then
fi
fi

dnl We don't really use automake, but configure needs aclocal and the
dnl automake library files (like config.guess).
AM_INIT_AUTOMAKE([1.9.6 foreign])

# Allow "configure --disable-maintainer-mode" to disable timestamp checking
AM_MAINTAINER_MODE([enable])

dnl Make sure the path to our own m4 macros is always properly set
dnl and doesn't depend on how autoconf is called.
AC_CONFIG_MACRO_DIR([m4])

#---------------------------------------------------------
#
# This is essentially the configure part of the old "install" file.
Expand Down

0 comments on commit 60ac900

Please sign in to comment.