diff options
| author | James Peach <jpeach@samba.org> | 2007-04-30 18:59:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:50 -0500 |
| commit | a0f86157fe757598184b9f0c8927fb84c8af0db2 (patch) | |
| tree | 37232593be3420fdb3bbea98e735a2f3e9ca1cdc | |
| parent | d02f4f4db772bc3b4f619991b4e7c707bc890f62 (diff) | |
| download | samba-a0f86157fe757598184b9f0c8927fb84c8af0db2.tar.gz samba-a0f86157fe757598184b9f0c8927fb84c8af0db2.tar.bz2 samba-a0f86157fe757598184b9f0c8927fb84c8af0db2.zip | |
r22614: Only enable GNU-isms in the Makefile if we can be sure that the GNU
make we found is what will be run when the user invokes "make".
(This used to be commit e3802961c1895f260f04a7955a2a182d657248a0)
| -rw-r--r-- | source3/configure.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index 457e3c107c..358b233f00 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -602,10 +602,16 @@ m4_include(m4/check_gnu_make.m4) m4_include(m4/depend.m4) # Using the dependency files requires GNU make until someone adds support -# for Makefile includes for other make implementations. +# for Makefile includes for other make implementations. Note that +# CHECK_GNU_MAKE() can find a non-default make. CHECK_GNU_MAKE() -if test "x$_cv_gnu_make_command" != "x" ; then +if test "x$_cv_gnu_make_command" != "x" -a \ + x`which make` = x`which "$_cv_gnu_make_command"` ; then AC_SUBST(MAKE, $_cv_gnu_make_command) +else + # If GNU make is not the default, don't enable GNU-isms because we can't + # guarantee that GNU make will actually be the make that is invoked. + ifGNUmake='#' fi AM_DEP_TRACK() |