mirror of https://github.com/vitalif/e2fsprogs
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>test-maint
parent
9ed8d7829a
commit
5b5bd2c251
18
acinclude.m4
18
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)
|
||||
])
|
||||
|
|
|
@ -627,6 +627,7 @@ ac_subst_vars='LTLIBOBJS
|
|||
LIBOBJS
|
||||
BUILD_LDFLAGS
|
||||
BUILD_CFLAGS
|
||||
MKINSTALLDIRS
|
||||
INCLUDES
|
||||
DO_TEST_SUITE
|
||||
ET_DIR
|
||||
|
@ -13386,6 +13387,19 @@ if test -n "$WITH_DIET_LIBC" ; then
|
|||
INCLUDES="$INCLUDES -D_REENTRANT"
|
||||
fi
|
||||
|
||||
|
||||
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
|
||||
|
||||
|
||||
if test $cross_compiling = no; then
|
||||
BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
|
||||
BUILD_LDFLAGS="$LDFLAGS"
|
||||
|
|
|
@ -1295,6 +1295,7 @@ if test -n "$WITH_DIET_LIBC" ; then
|
|||
INCLUDES="$INCLUDES -D_REENTRANT"
|
||||
fi
|
||||
AC_SUBST(INCLUDES)
|
||||
AM_MKINSTALLDIRS
|
||||
dnl
|
||||
dnl Build CFLAGS
|
||||
dnl
|
||||
|
|
Loading…
Reference in New Issue