diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-01-21 03:32:21 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-01-21 03:40:26 +0100 |
| commit | 5eb1006299f14414947e50669136268ecbc5753f (patch) | |
| tree | 7fe76ddf87c0801f2d9831c6f7b9bd91eacd2305 | |
| parent | 6f0c3c98e0336f1aecce491f141498bc69bdaacf (diff) | |
| download | libgphoto2-issue-467-wip.tar.gz | |
Use AC_PROG_GREP and ${GREP} for grepissue-467-wip
| -rw-r--r-- | gphoto-m4/gp-camlibs.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gphoto-m4/gp-camlibs.m4 b/gphoto-m4/gp-camlibs.m4 index 885901dac..739ce6d3e 100644 --- a/gphoto-m4/gp-camlibs.m4 +++ b/gphoto-m4/gp-camlibs.m4 @@ -49,6 +49,7 @@ dnl #################################################################### dnl AC_DEFUN([GP_CAMLIBS_INIT],[dnl AC_BEFORE([$0],[GP_CAMLIB])dnl +AC_PROG_GREP AC_PROG_SED GP_PROG_CMP GP_PROG_DIFF @@ -136,11 +137,11 @@ if test "$camlibs" = "all"; then else # If the string starts with "all,", we start with the default list # and add the explicitly defined ones later - if echo "$camlibs" | grep "^all," > /dev/null; then + if echo "$camlibs" | ${GREP} "^all," > /dev/null; then INSTALL_THESE_CAMLIBS_BASE="$ALL_DEFAULT_CAMLIBS" camlibs="$(echo "$camlibs" | ${SED} 's/^all,//')" fi - if echo "$camlibs" | grep "outdated" > /dev/null; then + if echo "$camlibs" | ${GREP} "outdated" > /dev/null; then INSTALL_THESE_CAMLIBS_BASE="$INSTALL_THESE_CAMLIBS_BASE m4_strip(gp_camlibs_outdated)" camlibs="$(echo "$camlibs" | ${SED} 's/outdated[,]*//')" fi |