mirror of https://github.com/vitalif/e2fsprogs
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>next
parent
254195627f
commit
f3bc1561c8
|
@ -68,8 +68,8 @@ pkgconfigdir = $(libdir)/pkgconfig
|
||||||
@ifGNUmake@ endif
|
@ifGNUmake@ endif
|
||||||
@ifGNUmake@ endif
|
@ifGNUmake@ endif
|
||||||
|
|
||||||
@ifNotGNUmake@ CHECK_CMD=@true
|
@ifNotGNUmake@ CHECK_CMD=true
|
||||||
@ifNotGNUmake@ CPPHECK_CMD=@true
|
@ifNotGNUmake@ CPPCHECK_CMD=true
|
||||||
|
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
BUILD_CC = @BUILD_CC@
|
BUILD_CC = @BUILD_CC@
|
||||||
|
|
|
@ -108,7 +108,12 @@ AC_DEFUN(
|
||||||
[CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
|
[CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
|
||||||
_cv_gnu_make_command='' ;
|
_cv_gnu_make_command='' ;
|
||||||
dnl Search all the common names for GNU make
|
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 test -z "$a" ; then continue ; fi ;
|
||||||
if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
|
if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
|
||||||
_cv_gnu_make_command=$a ;
|
_cv_gnu_make_command=$a ;
|
||||||
|
|
|
@ -11515,7 +11515,12 @@ if ${_cv_gnu_make_command+:} false; then :
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
else
|
else
|
||||||
_cv_gnu_make_command='' ;
|
_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 test -z "$a" ; then continue ; fi ;
|
||||||
if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
|
if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
|
||||||
_cv_gnu_make_command=$a ;
|
_cv_gnu_make_command=$a ;
|
||||||
|
|
Loading…
Reference in New Issue