diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-05-21 12:47:05 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-05-21 12:47:05 +0000 |
| commit | 3aebe98ebe4f3d35b226d03813343296b08baee0 (patch) | |
| tree | e0944fb08700ee21ffd1b78900ac181cce7a0e42 | |
| parent | bb6c171137b022a31470471ce7bb95e2818bc5fa (diff) | |
build system: Better detection of GNU make (cope with FreeBSD make)
git-svn-id: svn://tug.org/texlive/trunk@26536 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/ChangeLog | 5 | ||||
| -rwxr-xr-x | Build/source/configure | 5 | ||||
| -rw-r--r-- | Build/source/configure.ac | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 2 |
4 files changed, 15 insertions, 3 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index 7cd0fbffddf..16acec5d489 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,8 @@ +2012-05-21 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Test for GNU make before creating Makefile, + required for FreeBSD make and perhaps others. + 2012-05-04 Peter Breitenlohner <peb@mppmu.mpg.de> * README: Update the list of prerequisites. diff --git a/Build/source/configure b/Build/source/configure index 0dad0bba7a2..8a0aa14839f 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -20656,6 +20656,9 @@ subdirs="$subdirs auxdir/auxsub libs utils texk" ac_config_files="$ac_config_files Makefile" +rm -f Makefile +kpse_GNU_make=`${MAKE-make} -v 2>/dev/null | grep GNU` + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -23306,7 +23309,7 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -if test -z "`${MAKE-make} -v 2>/dev/null | grep GNU`"; then +if test -z "$kpse_GNU_make"; then if test "x$enable_native_texlive_build" = xno; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Building TeX Live may require GNU make" >&5 $as_echo "$as_me: WARNING: Building TeX Live may require GNU make" >&2;} diff --git a/Build/source/configure.ac b/Build/source/configure.ac index e8eebc1a477..df1734efc5b 100644 --- a/Build/source/configure.ac +++ b/Build/source/configure.ac @@ -156,10 +156,14 @@ AC_CONFIG_SUBDIRS([auxdir/auxsub libs utils texk]) AC_CONFIG_FILES([Makefile]) +dnl Try to detect GNU make early, '-v' is verbose for BSD make. +rm -f Makefile +kpse_GNU_make=`${MAKE-make} -v 2>/dev/null | grep GNU` + AC_OUTPUT dnl Most probably we need GNU make. -if test -z "`${MAKE-make} -v 2>/dev/null | grep GNU`"; then +if test -z "$kpse_GNU_make"; then if test "x$enable_native_texlive_build" = xno; then AC_MSG_WARN([Building TeX Live may require GNU make]) else diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index e528c30f958..2ecbc91e195 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,4 +1,4 @@ -2012-05-20 Thanh Han The <thanh@river-valley.org> +2012-05-20 Thanh Han The <thanh@river-valley.org> * pdftex.defines (get/setimagegroupref): these replace imagegroupref. * ptexlib.h: likewise. |