summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2020-01-21 03:15:42 +0100
committerHans Ulrich Niedermann <hun@n-dimensional.de>2020-01-21 03:15:42 +0100
commit08c4e066ba4b1502074827bf7329bfac3f8cc66a (patch)
tree7c58774bab988ddb79aca03985e7fe1804724819
parentffdc4a4dcc9d1a015dcf0005564add04d3b6f284 (diff)
downloadlibgphoto2-08c4e066ba4b1502074827bf7329bfac3f8cc66a.tar.gz
Revert "Use AC_PROG_SED and $(SED) for sed"
This reverts commit 49740208d5ee8efcc056016ec8fd7d837a7f7998. It broke the invocations of SED.
-rw-r--r--gphoto-m4/gp-camlibs.m47
1 files changed, 3 insertions, 4 deletions
diff --git a/gphoto-m4/gp-camlibs.m4 b/gphoto-m4/gp-camlibs.m4
index 6f252ea04..c96536284 100644
--- a/gphoto-m4/gp-camlibs.m4
+++ b/gphoto-m4/gp-camlibs.m4
@@ -49,7 +49,6 @@ dnl ####################################################################
dnl
AC_DEFUN([GP_CAMLIBS_INIT],[dnl
AC_BEFORE([$0],[GP_CAMLIB])dnl
-AC_PROG_SED
GP_PROG_CMP
GP_PROG_DIFF
GP_PROG_SORT
@@ -138,14 +137,14 @@ else
# and add the explicitly defined ones later
if echo "$camlibs" | grep "^all," > /dev/null; then
INSTALL_THESE_CAMLIBS_BASE="$ALL_DEFAULT_CAMLIBS"
- camlibs="$(echo "$camlibs" | $(SED) 's/^all,//')"
+ camlibs="$(echo "$camlibs" | sed 's/^all,//')"
fi
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[,]*//')"
+ camlibs="$(echo "$camlibs" | sed 's/outdated[,]*//')"
fi
- # camlibs=$(echo $camlibs | $(SED) 's/,/ /g')
+ # camlibs=$(echo $camlibs | sed 's/,/ /g')
IFS_save="$IFS"
IFS=",$IFS"
# Walk through enumeration of camlibs given by user and add them to list