X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=autoconf%2Fm4%2Ffind_std_program.m4;h=c789df8e641d96e67928ba3c2421692f39448682;hb=0a230e0d985625a3909cb78fd867a3abaf434565;hp=7660663a1a2b5e0c7fd79dee437ae70e72161aef;hpb=72f71e18a3cca42c3b2a289a5cec27232e6e34c0;p=oota-llvm.git

diff --git a/autoconf/m4/find_std_program.m4 b/autoconf/m4/find_std_program.m4
index 7660663a1a2..c789df8e641 100644
--- a/autoconf/m4/find_std_program.m4
+++ b/autoconf/m4/find_std_program.m4
@@ -48,23 +48,23 @@ AC_ARG_WITH($1[-inc],
   AS_HELP_STRING([--with-]stdprog_long_name()[-inc=DIR],
   [Specify that the ]stdprog_long_name()[ includes are in DIR]),
   $1[incdir=$withval],$1[incdir=nada])
-pfxvar=$1pfxdir
-binvar=$1bindir
-incvar=$1incdir
-libvar=$1libdir
-if test "${!pfxvar}" != "nada" ; then
-  CHECK_STD_PROGRAM(${!pfxvar},$1,$2,$3)
-elif test "${!binvar}" != "nada" ; then
-  if test "${!libvar}" != "nada" ; then
-    if test "${!incvar}" != "nada" ; then
-      if test -d "${!binvar}" ; then
-        if test -d "${!incvar}" ; then
-          if test -d "${!libvar}" ; then
-            AC_SUBST(allcapsname(),${!binvar}/$1)
-            AC_SUBST(allcapsname()[_BIN],${!binvar})
-            AC_SUBST(allcapsname()[_INC],${!incvar})
-            AC_SUBST(allcapsname()[_LIB],${!libvar})
-            AC_SUBST([USE_]allcapsname(),[1])
+eval pfxval=\$\{$1pfxdir\}
+eval binval=\$\{$1bindir\}
+eval incval=\$\{$1incdir\}
+eval libval=\$\{$1libdir\}
+if test "${pfxval}" != "nada" ; then
+  CHECK_STD_PROGRAM(${pfxval},$1,$2,$3)
+elif test "${binval}" != "nada" ; then
+  if test "${libval}" != "nada" ; then
+    if test "${incval}" != "nada" ; then
+      if test -d "${binval}" ; then
+        if test -d "${incval}" ; then
+          if test -d "${libval}" ; then
+            AC_SUBST(allcapsname(),${binval}/$1)
+            AC_SUBST(allcapsname()[_BIN],${binval})
+            AC_SUBST(allcapsname()[_INC],${incval})
+            AC_SUBST(allcapsname()[_LIB],${libval})
+            AC_SUBST([USE_]allcapsname(),["USE_]allcapsname()[ = 1"])
             AC_MSG_RESULT([found via --with options])
           else
             AC_MSG_RESULT([failed])
@@ -95,17 +95,17 @@ else
     AC_MSG_RESULT([found in PATH at ]$tmppfxdir)
   else
     checkresult="yes"
-    checkvar="USE_"allcapsname()
+    eval checkval=\$\{"USE_"allcapsname()\}
     CHECK_STD_PROGRAM([/usr],$1,$2,$3)
-    if test -z "${!checkvar}" ; then
+    if test -z "${checkval}" ; then
       CHECK_STD_PROGRAM([/usr/local],$1,$2,$3)
-      if test -z "${!checkvar}" ; then
+      if test -z "${checkval}" ; then
         CHECK_STD_PROGRAM([/sw],$1,$2,$3)
-        if test -z "${!checkvar}" ; then
+        if test -z "${checkval}" ; then
           CHECK_STD_PROGRAM([/opt],$1,$2,$3)
-          if test -z "${!checkvar}" ; then
+          if test -z "${checkval}" ; then
             CHECK_STD_PROGRAM([/],$1,$2,$3)
-            if test -z "${!checkvar}" ; then
+            if test -z "${checkval}" ; then
               checkresult="no"
             fi
           fi