Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced "egrep" by "$EGREP" (predefined by configure anyway).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-11-25 17:29:21 +00:00
parent ddbd3cd58b
commit 252a502277
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -15693,7 +15693,7 @@ if test "${wx_cv_prog_makeisgnu+set}" = set; then
else else
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null | if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
egrep -s GNU > /dev/null); then $EGREP -s GNU > /dev/null); then
wx_cv_prog_makeisgnu="yes" wx_cv_prog_makeisgnu="yes"
else else
wx_cv_prog_makeisgnu="no" wx_cv_prog_makeisgnu="no"
@@ -50500,7 +50500,7 @@ for subdir in `echo $SUBDIRS`; do
disabled_var=DISABLED_`echo $subdir | tr [a-z] [A-Z]`; disabled_var=DISABLED_`echo $subdir | tr [a-z] [A-Z]`;
eval "disabled=\$$disabled_var" eval "disabled=\$$disabled_var"
disabled=/`echo X $disabled | sed 's@ @/|/@g'`/ disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"` makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
fi fi
else if test ${subdir} = "samples"; then else if test ${subdir} = "samples"; then
makefiles="samples/Makefile.in samples/console/Makefile.in" makefiles="samples/Makefile.in samples/console/Makefile.in"

4
configure.in
View File

@@ -1519,7 +1519,7 @@ dnl does make support "-include" (only GNU make does AFAIK)?
AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu, AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
[ [
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null | if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
egrep -s GNU > /dev/null); then $EGREP -s GNU > /dev/null); then
wx_cv_prog_makeisgnu="yes" wx_cv_prog_makeisgnu="yes"
else else
wx_cv_prog_makeisgnu="no" wx_cv_prog_makeisgnu="no"
@@ -8032,7 +8032,7 @@ for subdir in `echo $SUBDIRS`; do
disabled_var=DISABLED_`echo $subdir | tr [[a-z]] [[A-Z]]`; disabled_var=DISABLED_`echo $subdir | tr [[a-z]] [[A-Z]]`;
eval "disabled=\$$disabled_var" eval "disabled=\$$disabled_var"
disabled=/`echo X $disabled | sed 's@ @/|/@g'`/ disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"` makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
fi fi
else dnl we build wxBase only else dnl we build wxBase only
dnl don't take all samples/utils, just those which build with dnl don't take all samples/utils, just those which build with