From 57d278be729cd4f17a7e2118714a9ffa6b3842f9 Mon Sep 17 00:00:00 2001 From: Michael Sokolov Date: Fri, 26 Jan 2001 06:19:52 +0000 Subject: [PATCH] acinclude.m4 (GLIBCPP_CHECK_GNU_MAKE): Bourne shell portability bug (use ${MAKE-make}, not ${MAKE:-make}). * acinclude.m4 (GLIBCPP_CHECK_GNU_MAKE): Bourne shell portability bug (use ${MAKE-make}, not ${MAKE:-make}). * aclocal.m4, configure: Regenerate. From-SVN: r39277 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/acinclude.m4 | 5 ++++- libstdc++-v3/aclocal.m4 | 5 ++++- libstdc++-v3/configure | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4b847fc..34a4cfe 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2001-01-25 Michael Sokolov + + * acinclude.m4 (GLIBCPP_CHECK_GNU_MAKE): Bourne shell portability bug + (use ${MAKE-make}, not ${MAKE:-make}). + * aclocal.m4, configure: Regenerate. + 2001-01-25 Mark Mitchell * src/ios.cc: Remove accidental inclusion of in last diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 5b7a9e8..3c815f0 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1555,11 +1555,14 @@ dnl #### GLIBCPP_ to the macro name; adding the :-make fallback in the dnl #### conditional's subshell (" --version" is not a command), using a dnl #### different option to grep(1). dnl #### -pme +dnl #### Fixed Bourne shell portability bug (use ${MAKE-make}, not +dnl #### ${MAKE:-make}). +dnl #### -msokolov AC_DEFUN( GLIBCPP_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}" make gmake gnumake ; do + for a in "${MAKE-make}" make gmake gnumake ; do if ( $a --version 2> /dev/null | grep -c GNU > /dev/null ) then _cv_gnu_make_command=$a ; diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 5de8abd..a6bfcc6 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -1567,11 +1567,14 @@ dnl #### GLIBCPP_ to the macro name; adding the :-make fallback in the dnl #### conditional's subshell (" --version" is not a command), using a dnl #### different option to grep(1). dnl #### -pme +dnl #### Fixed Bourne shell portability bug (use ${MAKE-make}, not +dnl #### ${MAKE:-make}). +dnl #### -msokolov AC_DEFUN( GLIBCPP_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}" make gmake gnumake ; do + for a in "${MAKE-make}" make gmake gnumake ; do if ( $a --version 2> /dev/null | grep -c GNU > /dev/null ) then _cv_gnu_make_command=$a ; diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 91a2a6a..692078d 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -2510,7 +2510,7 @@ if eval "test \"`echo '$''{'_cv_gnu_make_command'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else _cv_gnu_make_command='' ; - for a in "${MAKE:-make}" make gmake gnumake ; do + for a in "${MAKE-make}" make gmake gnumake ; do if ( $a --version 2> /dev/null | grep -c GNU > /dev/null ) then _cv_gnu_make_command=$a ; -- 2.7.4