gentoo: use /var/run for new /run compatibility
[util-vserver.git] / m4 / ensc_pathprog.m4
index fc8521d..cd99634 100644 (file)
@@ -29,7 +29,7 @@ AC_DEFUN([ENSC_PATHPROG_INIT],
 ])
 
 
-dnl Usage: ENSC_PATHPROG(<VAR>, <PROG>[, <DFLT>, <DESCR>])
+dnl Usage: ENSC_PATHPROG(<VAR>, <PROG>[, <DFLT>, <DESCR>, <DEREF>])
 AC_DEFUN([ENSC_PATHPROG],
 [
        AC_REQUIRE([ENSC_SET_SEARCHPATH])
@@ -59,8 +59,14 @@ $4])
                fi
        fi
 
-       if test -e "${$1}"; then
-               $1=`readlink -f "${$1}"`
+       if test "x$5" = x; then
+               ensc_pathprog_path="${$1}"
+               while test -h "$ensc_pathprog_path"; do
+                       case "$ensc_pathprog_path" in
+                               ../*) $1=`readlink -f "${$1}"`; break ;;
+                       esac
+                       ensc_pathprog_path=`readlink "$ensc_pathprog_path"`
+               done
        fi
 
        test "${$1}" && ENSC_PATHPROG_SED="${ENSC_PATHPROG_SED}s!@'$1'@!${$1}!g;"
@@ -78,7 +84,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)