X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=m4%2Fensc_pathprog.m4;h=1678a74d034d84584582fec32d28f78f8e9f78a3;hb=35370e2d11f661d780b71204d61439e31b91fb57;hp=fc8521d9636c8756603157e33d4f16508c90c73d;hpb=1b96bb97c3fdffceb51d942db4efed50302b57f3;p=util-vserver.git diff --git a/m4/ensc_pathprog.m4 b/m4/ensc_pathprog.m4 index fc8521d..1678a74 100644 --- a/m4/ensc_pathprog.m4 +++ b/m4/ensc_pathprog.m4 @@ -29,7 +29,7 @@ AC_DEFUN([ENSC_PATHPROG_INIT], ]) -dnl Usage: ENSC_PATHPROG(, [, , ]) +dnl Usage: ENSC_PATHPROG(, [, , , ]) AC_DEFUN([ENSC_PATHPROG], [ AC_REQUIRE([ENSC_SET_SEARCHPATH]) @@ -59,8 +59,10 @@ $4]) fi fi - if test -e "${$1}"; then - $1=`readlink -f "${$1}"` + if test "x$5" = x; then + if test -h "${$1}"; then + $1=`readlink -f "${$1}"` + fi fi test "${$1}" && ENSC_PATHPROG_SED="${ENSC_PATHPROG_SED}s!@'$1'@!${$1}!g;" @@ -78,7 +80,7 @@ AC_DEFUN([ENSC_PATHPROG_STANDARD_TOOLS], ENSC_PATHPROG(CMP, cmp) ENSC_PATHPROG(CP, cp) ENSC_PATHPROG(DIRNAME, dirname) - ENSC_PATHPROG(EGREP, egrep) + ENSC_PATHPROG(EGREP, egrep, [], [], no-deref) ENSC_PATHPROG(ENV, env) ENSC_PATHPROG(GREP, grep) ENSC_PATHPROG(LN, ln)