X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=autoconf%2Fconfigure.ac;h=b7e11e69e6a482ab7d73a42e29cb57882de7ca5a;hb=0c09a411e0c763d69aaefa2321c2ae8daabc80e4;hp=b12c32136f57c87c7693a41da5de210c04def1e0;hpb=8a2246f32ec6480b6430078ff2c5740a0a11a3fb;p=oota-llvm.git

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index b12c32136f5..b7e11e69e6a 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -212,7 +212,7 @@ else
     Sparc)   AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
     PowerPC) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
     x86_64)  AC_SUBST(JIT,[[]]) ;;
-    Alpha)   AC_SUBST(JIT,[[]]) ;;
+    Alpha)   AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
     IA64)    AC_SUBST(JIT,[[]]) ;;
     *)       AC_SUBST(JIT,[[]]) ;;
   esac
@@ -304,9 +304,17 @@ AC_PROG_RANLIB
 AC_PATH_PROG(RM,   [rm],   [rm])
 AC_PATH_PROG(SED,  [sed],  [sed])
 AC_PATH_PROG(TAR,  [tar],  [gtar])
-AC_PATH_PROG(GRAPHVIZ, [Graphviz], [echo GraphViz])
-if test "$GRAPHVIZ" != "echo GraphViz" ; then
+AC_PATH_PROG(GRAPHVIZ, [Graphviz], [echo Graphviz])
+if test "$GRAPHVIZ" != "echo Graphviz" ; then
   AC_DEFINE([HAVE_GRAPHVIZ],[1],[Define if the Graphviz program is available])
+  AC_DEFINE_UNQUOTED([LLVM_PATH_GRAPHVIZ],"$GRAPHVIZ",
+   [Define to path to Graphviz program if found or 'echo Graphviz' otherwise])
+fi
+AC_PATH_PROG(GV, [gv], [echo gv])
+if test "$GRAPHVIZ" != "echo gv" ; then
+  AC_DEFINE([HAVE_GV],[1],[Define if the gv program is available])
+  AC_DEFINE_UNQUOTED([LLVM_PATH_GV],"$GV",
+   [Define to path to gv program if found or 'echo gv' otherwise])
 fi
 
 dnl Find the install program
@@ -396,7 +404,7 @@ fi
 dnl Verify that GCC is version 3.0 or higher
 if test "$GCC" = "yes"
 then
-  gccmajor=`$CC --version | head -n 1 | awk '{print $NF;}' | cut -d. -f1`
+  gccmajor=`$CC --version | head -n 1 | sed 's/[[^0-9]]*\([[0-9.]]\).*/\1/'` 
   if test "$gccmajor" -lt "3"
   then
     AC_MSG_ERROR([gcc 3.x required, but you have a lower version])