diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 18:44:52 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-29 14:07:15 +0100 |
| commit | 27a0b3210f4262ddaf43ec1627c81a475121cade (patch) | |
| tree | 3c7896fb14a4ab8074f94c7070f2186b695b615a /source4/build | |
| parent | 4e95a259c0faf678a979ca54676c56a747df9e9c (diff) | |
| download | samba-27a0b3210f4262ddaf43ec1627c81a475121cade.tar.gz samba-27a0b3210f4262ddaf43ec1627c81a475121cade.tar.bz2 samba-27a0b3210f4262ddaf43ec1627c81a475121cade.zip | |
Remove workaround for some non-GNU makes.
(This used to be commit 0580357fb4b10e4a751d281e209f6a87e1c88143)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/m4/check_make.m4 | 29 | ||||
| -rw-r--r-- | source4/build/smb_build/main.pl | 2 |
2 files changed, 8 insertions, 23 deletions
diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4 index d7799649a7..f497684453 100644 --- a/source4/build/m4/check_make.m4 +++ b/source4/build/m4/check_make.m4 @@ -6,35 +6,26 @@ dnl Released under the GNU GPL dnl ------------------------------------------------------- dnl -AC_PATH_PROG(MAKE,make) +AC_PATH_PROGS(MAKE,gmake make) AC_CACHE_CHECK([whether we have GNU make], samba_cv_gnu_make, [ -if $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null +if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null then - samba_cv_gnu_make=yes -else - samba_cv_gnu_make=no + AC_MSG_ERROR([Unable to find GNU make]) fi ]) -GNU_MAKE=$samba_cv_gnu_make -AC_SUBST(GNU_MAKE) - -if test "x$GNU_MAKE" = x"yes"; then - AC_CACHE_CHECK([GNU make version], samba_cv_gnu_make_version,[ +AC_CACHE_CHECK([GNU make version], samba_cv_gnu_make_version,[ samba_cv_gnu_make_version=`$ac_cv_path_MAKE --version | head -1 | cut -d " " -f 3 2>/dev/null` ]) GNU_MAKE_VERSION=$samba_cv_gnu_make_version AC_SUBST(GNU_MAKE_VERSION) -fi new_make=no AC_MSG_CHECKING([for GNU make >= 3.81]) -if test x$GNU_MAKE = x"yes"; then - if $PERL -e " \$_ = '$GNU_MAKE_VERSION'; s/@<:@^\d\.@:>@.*//g; exit (\$_ < 3.81);"; then - new_make=yes - fi +if $PERL -e " \$_ = '$GNU_MAKE_VERSION'; s/@<:@^\d\.@:>@.*//g; exit (\$_ < 3.81);"; then + new_make=yes fi AC_MSG_RESULT($new_make) automatic_dependencies=no @@ -46,11 +37,3 @@ AC_ARG_ENABLE(automatic-dependencies, [ automatic_dependencies=no ]) AC_MSG_RESULT($automatic_dependencies) AC_SUBST(automatic_dependencies) - -FIRST_PREREQ="\$*.c" -AC_SUBST(FIRST_PREREQ) - -if test x$GNU_MAKE = xyes; then - FIRST_PREREQ="\$<" -fi - diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 6d4a7321a4..d2d3dc9c5c 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -92,4 +92,6 @@ cflags::create_cflags($OUTPUT, $config::config{srcdir}, summary::show($OUTPUT, \%config::config); +print "To build Samba, run $config::config{MAKE}\n"; + 1; |