[llvm-commits] CVS: llvm/autoconf/m4/find_std_program.m4

[Reid Spencer]

Changes in directory llvm/autoconf/m4:

find_std_program.m4 updated: 1.2 -> 1.3
---
Log message:

Get rid of bash specific syntax for variable dereferencing, replacing it 
with the more crufty (but more widely available) "eval" command.


---
Diffs of the changes:  (+22 -22)

 find_std_program.m4 |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)


Index: llvm/autoconf/m4/find_std_program.m4
diff -u llvm/autoconf/m4/find_std_program.m4:1.2 llvm/autoconf/m4/find_std_program.m4:1.3
--- llvm/autoconf/m4/find_std_program.m4:1.2	Sun Jul 17 00:30:33 2005
+++ llvm/autoconf/m4/find_std_program.m4	Mon Jul 25 15:25:08 2005
@@ -48,22 +48,22 @@
   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})
+eval pfxval=\$\{$1pfxdir\}
+eval binval=\$\{$1bindir\}
+eval incval=\$\{$1incdir\}
+eval libvar=\$\{$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(),[1])
             AC_MSG_RESULT([found via --with options])
           else
@@ -95,17 +95,17 @@
     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