Some of this gets hoisted up to Makefile.common

[oota-llvm.git] / configure

diff --git a/configure b/configure
index ba2dddc1b574e743aaf051fa93c3a36881288b2c..af7852c9a0cd92e92f984c2a612367d0db453470 100755 (executable)
--- a/configure
+++ b/configure
@@ -1035,7 +1035,7 @@ Optional Features:
   --enable-precompiled_bytecode
                           Use pre-compiled bytecode (default is NO)
   --enable-llc_diffs      Enable LLC Diffs when testing (default is YES)
-  --enable-jit            Enable Just In Time Compiling (default is NO)
+  --enable-jit            Enable Just In Time Compiling (default is YES)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1049,9 +1049,9 @@ Optional Packages:
   --with-llvmgccdir       Location of LLVM GCC front-end
   --with-bcrepos          Location of Bytecode Repository
   --with-papi             Location of PAPI
+  --with-purify           Location of purify program
   --with-objroot          Location where object files should be placed
                           (default is .)
-  --with-purify           Location of purify program
 
 Some influential environment variables:
   CXX         C++ compiler command
@@ -5140,7 +5140,7 @@ no_glob_subst='s/\*/\\\*/g'
 rm="rm -f"
 
 # Global variables:
-default_ofile=libtool
+default_ofile=mklib
 can_build_shared=yes
 
 # All known linkers require a `.a' archive for static linking (except M$VC,
@@ -17880,7 +17880,7 @@ fi
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+LIBTOOL='$(SHELL) $(top_builddir)/mklib'
 
 # Prevent multiple expansion
 
@@ -20476,7 +20476,7 @@ using namespace std;
 int
 main ()
 {
-bidirectional_iterator<int,int,int> t; return 0;
+bidirectional_iterator<int,int> t; return 0;
   ;
   return 0;
 }
@@ -20547,7 +20547,7 @@ using namespace std;
 int
 main ()
 {
-forward_iterator<int,int,int> t; return 0;
+forward_iterator<int,int> t; return 0;
   ;
   return 0;
 }
@@ -21918,70 +21918,117 @@ echo "$as_me: error: Function mprotect() required but not found" >&2;}
 fi
 
 
+
 # Check whether --enable-purify or --disable-purify was given.
 if test "${enable_purify+set}" = set; then
   enableval="$enable_purify"
-  ENABLE_PURIFY=ENABLE_PURIFY=1
 
 else
-  ENABLE_PURIFY=
-
+  enableval="no"
 fi;
+if test ${enableval} = "no"
+then
+       ENABLE_PURIFY=
+
+else
+       ENABLE_PURIFY=ENABLE_PURIFY=1
+
+fi
+
 # Check whether --enable-optimized or --disable-optimized was given.
 if test "${enable_optimized+set}" = set; then
   enableval="$enable_optimized"
-  ENABLE_OPTIMIZED=ENABLE_OPTIMIZED=1
 
 else
-  ENABLE_OPTIMIZED=
-
+  enableval=no
 fi;
+if test ${enableval} = "no"
+then
+       ENABLE_OPTIMIZED=
+
+else
+       ENABLE_OPTIMIZED=ENABLE_OPTIMIZED=1
+
+fi
+
 # Check whether --enable-spec or --disable-spec was given.
 if test "${enable_spec+set}" = set; then
   enableval="$enable_spec"
-  USE_SPEC=USE_SPEC=1
 
 else
-  USE_SPEC=
-
+  enableval=no
 fi;
+if test ${enableval} = "no"
+then
+       USE_SPEC=
+
+else
+       USE_SPEC=USE_SPEC=1
+
+fi
+
 # Check whether --enable-precompiled_bytecode or --disable-precompiled_bytecode was given.
 if test "${enable_precompiled_bytecode+set}" = set; then
   enableval="$enable_precompiled_bytecode"
-  UPB=USE_PRECOMPILED_BYTECODE=1
 
 else
-  UPB=
-
+  enableval=no
 fi;
+if test ${enableval} = "no"
+then
+       UPB=
 
-DISABLE_LLC_DIFFS=
+else
+       UPB=USE_PRECOMPILED_BYTECODE=1
+
+fi
 
 
 # Check whether --enable-llc_diffs or --disable-llc_diffs was given.
 if test "${enable_llc_diffs+set}" = set; then
   enableval="$enable_llc_diffs"
-  if test ${enableval} = "no"; then DISABLE_LLC_DIFFS=DISABLE_LLC_DIFFS:=1; fi;
 
 else
-  DISABLE_LLC_DIFFS=
-
+  enableval=yes
 fi;
+if test ${enableval} = "no"
+then
+       DISABLE_LLC_DIFFS=DISABLE_LLC_DIFFS:=1
 
-case $build in
-       *i*86*)  # Check whether --enable-jit or --disable-jit was given.
+else
+       DISABLE_LLC_DIFFS=
+
+fi
+
+# Check whether --enable-jit or --disable-jit was given.
 if test "${enable_jit+set}" = set; then
   enableval="$enable_jit"
-  JIT=TARGET_HAS_JIT=1
 
 else
-  JIT=
-
+  enableval=default
 fi;
-                ;;
-       *)
-                ;;
-esac
+
+if test ${enableval} = "no"
+then
+       JIT=
+
+else
+       case $target in
+               *i*86*)
+                       JIT=TARGET_HAS_JIT=1
+
+                       ;;
+               *sparc*)
+                       JIT=TARGET_HAS_JIT=1
+
+                       ;;
+               *)
+                       JIT=
+
+                       ;;
+       esac
+fi
+
 
 
 # Check whether --with-spec or --without-spec was given.
@@ -21994,6 +22041,7 @@ else
 
 fi;
 
+
 # Check whether --with-llvmgccdir or --without-llvmgccdir was given.
 if test "${with_llvmgccdir+set}" = set; then
   withval="$with_llvmgccdir"
@@ -22001,6 +22049,7 @@ if test "${with_llvmgccdir+set}" = set; then
 
 fi;
 
+
 # Check whether --with-bcrepos or --without-bcrepos was given.
 if test "${with_bcrepos+set}" = set; then
   withval="$with_bcrepos"
@@ -22011,6 +22060,7 @@ else
 
 fi;
 
+
 # Check whether --with-papi or --without-papi was given.
 if test "${with_papi+set}" = set; then
   withval="$with_papi"
@@ -22021,21 +22071,35 @@ else
 
 fi;
 
-# Check whether --with-objroot or --without-objroot was given.
-if test "${with_objroot+set}" = set; then
-  withval="$with_objroot"
-  OBJROOT=$withval
-
-else
-  OBJROOT=.
-
-fi;
 
 # Check whether --with-purify or --without-purify was given.
 if test "${with_purify+set}" = set; then
   withval="$with_purify"
   PURIFY=$withval
 
+fi;
+
+if test ${USER}
+then
+       if test -d /localhome/${USER}
+       then
+               OBJROOT=/localhome/${USER}
+
+       else
+               OBJROOT=.
+
+       fi
+else
+       OBJROOT=.
+
+fi
+
+
+# Check whether --with-objroot or --without-objroot was given.
+if test "${with_objroot+set}" = set; then
+  withval="$with_objroot"
+  OBJROOT=$withval
+
 fi;
 
           ac_config_files="$ac_config_files Makefile.config"