From f3bc1561c84525e8cb20dd11dd698495b62e6b3c Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 4 Sep 2016 00:16:35 -0400 Subject: [PATCH] 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 --- MCONFIG.in | 4 ++-- acinclude.m4 | 7 ++++++- configure | 7 ++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/MCONFIG.in b/MCONFIG.in index 9fa9f880..e82963d2 100644 --- a/MCONFIG.in +++ b/MCONFIG.in @@ -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 ; diff --git a/configure b/configure index 0ac5dcbc..6825bd27 100755 --- a/configure +++ b/configure @@ -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 ;