diff options
author | Theodore Ts'o <tytso@mit.edu> | 2016-09-04 00:16:35 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2016-09-04 00:16:35 -0400 |
commit | f3bc1561c84525e8cb20dd11dd698495b62e6b3c (patch) | |
tree | 905c473e8db1ef21a6429829d5d5ad5ddadd30ef | |
parent | 254195627f052f09282f2cba37222b371ab47d60 (diff) | |
download | android_external_e2fsprogs-f3bc1561c84525e8cb20dd11dd698495b62e6b3c.tar.gz android_external_e2fsprogs-f3bc1561c84525e8cb20dd11dd698495b62e6b3c.tar.bz2 android_external_e2fsprogs-f3bc1561c84525e8cb20dd11dd698495b62e6b3c.zip |
Fix FreeBSD pmake support
Fix a typo in the @ifNotGNUmake@ case of MCONFIG.in.
Also allow the FORCE_NATIVE_MAKE to force the use of the non-GNU make
optimized Makefile. The resulting makefile will work with GNU Make
4.2.1, although "make V=1" won't be honored.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r-- | MCONFIG.in | 4 | ||||
-rw-r--r-- | acinclude.m4 | 7 | ||||
-rwxr-xr-x | configure | 7 |
3 files changed, 14 insertions, 4 deletions
@@ -68,8 +68,8 @@ pkgconfigdir = $(libdir)/pkgconfig @ifGNUmake@ endif @ifGNUmake@ endif -@ifNotGNUmake@ CHECK_CMD=@true -@ifNotGNUmake@ CPPHECK_CMD=@true +@ifNotGNUmake@ CHECK_CMD=true +@ifNotGNUmake@ CPPCHECK_CMD=true CC = @CC@ BUILD_CC = @BUILD_CC@ diff --git a/acinclude.m4 b/acinclude.m4 index 4c8a77cb..b4bdc5d9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -108,7 +108,12 @@ AC_DEFUN( [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command, _cv_gnu_make_command='' ; dnl Search all the common names for GNU make - for a in "$MAKE" make gmake gnumake ; do + if test -z "$FORCE_NATIVE_MAKE" ; then + MAKES="make" + else + MAKES="make gmake gnumake" + fi + for a in "$MAKE" $MAKES ; do if test -z "$a" ; then continue ; fi ; if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then _cv_gnu_make_command=$a ; @@ -11515,7 +11515,12 @@ if ${_cv_gnu_make_command+:} false; then : $as_echo_n "(cached) " >&6 else _cv_gnu_make_command='' ; - for a in "$MAKE" make gmake gnumake ; do + if test -z "$FORCE_NATIVE_MAKE" ; then + MAKES="make" + else + MAKES="make gmake gnumake" + fi + for a in "$MAKE" $MAKES ; do if test -z "$a" ; then continue ; fi ; if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then _cv_gnu_make_command=$a ; |