diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2014-07-10 00:17:05 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2014-07-10 00:20:49 -0400 |
| commit | 5b5bd2c251d1f999eddebb4d35fc1fba6004562a (patch) | |
| tree | b75e80ed79c54c44cbffce15732ec00412c5e747 /acinclude.m4 | |
| parent | 9ed8d7829a6605c71d72e98bfd4c6b787dcd1436 (diff) | |
| download | platform_external_e2fsprogs-5b5bd2c251d1f999eddebb4d35fc1fba6004562a.tar.gz platform_external_e2fsprogs-5b5bd2c251d1f999eddebb4d35fc1fba6004562a.tar.bz2 platform_external_e2fsprogs-5b5bd2c251d1f999eddebb4d35fc1fba6004562a.zip | |
Fix up configure so it finds mkinstalldirs
As an object lesson in why autoreconf is fundamentally unsafe, the
newer version of nls.m4 no longer handles @MKINSTALLDIRS@. So add
this back, since our Makefiles depend on it.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index cf84acc4c..4c8a77cbe 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -128,3 +128,21 @@ dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' ot AC_SUBST(ifGNUmake) AC_SUBST(ifNotGNUmake) ] ) +# was originally from nls.m4 serial 1 (gettext-0.12) +AC_DEFUN([AM_MKINSTALLDIRS], +[ + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but $(top_srcdir). + dnl Try to locate it. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) +]) |