[llvm-commits] [llvm-gcc-4.2] r46181 - in /llvm-gcc-4.2/trunk/gcc: configure configure.ac

[Devang Patel]

Author: dpatel
Date: Fri Jan 18 16:41:06 2008
New Revision: 46181

URL: http://llvm.org/viewvc/llvm-project?rev=46181&view=rev
Log:
Do not raise error if system llvm (e.g. --enable-llvm=/usr/local) is used.

Modified:
    llvm-gcc-4.2/trunk/gcc/configure
    llvm-gcc-4.2/trunk/gcc/configure.ac

Modified: llvm-gcc-4.2/trunk/gcc/configure
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/configure?rev=46181&r1=46180&r2=46181&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure (original)
+++ llvm-gcc-4.2/trunk/gcc/configure Fri Jan 18 16:41:06 2008
@@ -7407,8 +7407,7 @@
  fi
  if test -x "$LLVMBASEPATH/bin/llc$EXEEXT"; then
      echo Found Installed LLVM Tree in $LLVMBASEPATH
- fi
- if test x$LLVMBUILDMODE == x; then
+ elif test x$LLVMBUILDMODE == x; then
      { { echo "$as_me:$LINENO: error: You must specify valid path to your LLVM tree with --enable-llvm=DIR" >&5
 echo "$as_me: error: You must specify valid path to your LLVM tree with --enable-llvm=DIR" >&2;}
    { (exit 1); exit 1; }; }
@@ -8034,7 +8033,7 @@
 else
     ac_prog_version=`$MAKEINFO --version 2>&1 |
                    sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-  echo "configure:8037: version of makeinfo is $ac_prog_version" >&5
+  echo "configure:8036: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
     4.[4-9]*)

Modified: llvm-gcc-4.2/trunk/gcc/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/configure.ac?rev=46181&r1=46180&r2=46181&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure.ac (original)
+++ llvm-gcc-4.2/trunk/gcc/configure.ac Fri Jan 18 16:41:06 2008
@@ -892,8 +892,7 @@
  fi
  if test -x "$LLVMBASEPATH/bin/llc$EXEEXT"; then
      echo Found Installed LLVM Tree in $LLVMBASEPATH
- fi
- if test x$LLVMBUILDMODE == x; then
+ elif test x$LLVMBUILDMODE == x; then
      AC_MSG_ERROR([You must specify valid path to your LLVM tree with --enable-llvm=DIR])
  fi
 ],