[vmkit-commits] [vmkit] r134157 - in /vmkit/trunk: Makefile.config.in autoconf/configure.ac configure lib/Makefile
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Thu Jun 30 07:37:02 PDT 2011
Author: geoffray
Date: Thu Jun 30 09:37:02 2011
New Revision: 134157
URL: http://llvm.org/viewvc/llvm-project?rev=134157&view=rev
Log:
Remove more references to N3 and unused configs.
Modified:
vmkit/trunk/Makefile.config.in
vmkit/trunk/autoconf/configure.ac
vmkit/trunk/configure
vmkit/trunk/lib/Makefile
Modified: vmkit/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.config.in?rev=134157&r1=134156&r2=134157&view=diff
==============================================================================
--- vmkit/trunk/Makefile.config.in (original)
+++ vmkit/trunk/Makefile.config.in Thu Jun 30 09:37:02 2011
@@ -1,10 +1,4 @@
-WITH_N3 = @WITH_N3@
-WITH_N3_PNETLIB = @WITH_N3_PNETLIB@
-WITH_N3_MONO = @WITH_N3_MONO@
-WITH_J3 = @WITH_J3@
-N3_LIB = @N3_LIB@
MMTK_PLAN = @MMTK_PLAN@
MMTK_PLAN_HEADER = @MMTK_PLAN_HEADER@
WITH_64 = @WITH_64@
-
ANT = @ANT@
Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=134157&r1=134156&r2=134157&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Thu Jun 30 09:37:02 2011
@@ -199,84 +199,12 @@
[[classpathglibj=/usr/share/classpath/glibj.zip]]
)
-AC_ARG_WITH(j3,
- [AS_HELP_STRING(--with-j3=yes|no,
- [Build J3 (default is yes)])],
- [[WITH_J3=$withval]],
- [[WITH_J3=yes]]
-)
-
classpathinclude="-I${classpathlibs}/../include -I/usr/include/classpath";
-if test "x${WITH_J3}" = "xyes"; then
- WITH_J3=1;
- AC_DEFINE([WITH_J3], [1], [With J3])
-else
- WITH_J3=0;
-fi
-
AC_SUBST([classpathglibj])
AC_SUBST([classpathlibs])
AC_SUBST([classpathinclude])
AC_SUBST([classpathversion])
-AC_SUBST([WITH_J3])
-
-dnl **************************************************************************
-dnl Local PNet directory
-dnl **************************************************************************
-AC_ARG_WITH(pnet-local-prefix,
- [AS_HELP_STRING(--with-pnet-local-prefix=something,
- [PNET local prefix (no default)])],
- [[pnetlocalprefix=$withval]],
- [[ echo Not using PNETlocal prefix.
- pnetlocalprefix=''
- ]]
-)
-
-AC_ARG_WITH(pnetlib,
- [AS_HELP_STRING(--with-pnetlib=something,
- [Pnetlib's mscorlib.dll location (default is /usr/lib/cscc/lib/)])],
- [[pnetlibpath=$withval]],
- [[pnetlibpath=/usr/lib/cscc/lib/]]
-)
-
-WITH_N3=0
-
-if test "x$pnetlocalprefix" != x; then
- echo Using ${pnetlocalprefix} as PNET local prefix;
- WITH_N3_PNETLIB=1;
- WITH_N3=1;
- AC_DEFINE([WITH_N3], [1], [With N3])
-else
- WITH_N3_PNETLIB=0;
-fi
-
-AC_SUBST([pnetlocalprefix])
-AC_SUBST([WITH_N3_PNETLIB])
-
-N3_LIB=PNetLib
-AC_SUBST([N3_LIB])
-AC_SUBST([pnetlibpath])
-
-AC_ARG_WITH(mono,
- [AS_HELP_STRING(--with-mono=something,
- [Mono's mscorlib.dll location (no default)])],
- [[monopath=$withval]],
- [[echo Not using Mono]]
-)
-
-if test "x$monopath" != x; then
- echo Building N3 with Mono;
- WITH_N3_MONO=1;
- WITH_N3=1;
-else
- WITH_N3_MONO=0;
-fi
-
-AC_SUBST([WITH_N3_MONO])
-AC_SUBST([monopath])
-
-AC_SUBST([WITH_N3])
dnl===-----------------------------------------------------------------------===
dnl===
@@ -315,64 +243,6 @@
dnl Find the install program
AC_PROG_INSTALL
-if test "$WITH_LLVMGCCDIR" = "default" ; then
- LLVMGCC="llvm-gcc${EXEEXT}"
- LLVMGXX="llvm-g++${EXEEXT}"
- AC_PATH_PROG(LLVMGCC, $LLVMGCC, [])
- AC_PATH_PROG(LLVMGXX, $LLVMGXX, [])
-else
- if test -z "$LLVMGCC"; then
- LLVMGCC="$WITH_LLVMGCCDIR/bin/llvm-gcc${EXEEXT}"
- fi
- if test -z "$LLVMGXX"; then
- LLVMGXX="$WITH_LLVMGCCDIR/bin/llvm-g++${EXEEXT}"
- fi
- AC_SUBST(LLVMGCC,$LLVMGCC)
- AC_SUBST(LLVMGXX,$LLVMGXX)
-fi
-
-AC_MSG_CHECKING([tool compatibility])
-
-dnl Ensure that compilation tools are GCC or a GNU compatible compiler such as
-dnl ICC; we use GCC specific options in the makefiles so the compiler needs
-dnl to support those options.
-dnl "icc" emits gcc signatures
-dnl "icc -no-gcc" emits no gcc signature BUT is still compatible
-ICC=no
-IXX=no
-case $CC in
- icc*|icpc*)
- ICC=yes
- IXX=yes
- ;;
- *)
- ;;
-esac
-
-if test "$GCC" != "yes" && test "$ICC" != "yes"
-then
- AC_MSG_ERROR([gcc|icc required but not found])
-fi
-
-dnl Ensure that compilation tools are GCC; we use GCC specific extensions
-if test "$GXX" != "yes" && test "$IXX" != "yes"
-then
- AC_MSG_ERROR([g++|icc required but not found])
-fi
-
-dnl Verify that GCC is version 3.0 or higher
-if test "$GCC" = "yes"
-then
- AC_COMPILE_IFELSE([[#if !defined(__GNUC__) || __GNUC__ < 3
-#error Unsupported GCC version
-#endif
-]], [], [AC_MSG_ERROR([gcc 3.x required, but you have a lower version])])
-fi
-
-dnl Tool compatibility is okay if we make it here.
-AC_MSG_RESULT([ok])
-
-
dnl===-----------------------------------------------------------------------===
dnl===
dnl=== SECTION 5: Check for libraries
@@ -449,7 +319,6 @@
dnl Do special configuration of Makefiles
AC_CONFIG_MAKEFILE(Makefile)
-AC_CONFIG_MAKEFILE(lib/Makefile)
AC_OUTPUT
Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=134157&r1=134156&r2=134157&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Thu Jun 30 09:37:02 2011
@@ -600,8 +600,6 @@
ac_subst_vars='LTLIBOBJS
LIBOBJS
EGREP
-LLVMGXX
-LLVMGCC
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
@@ -634,14 +632,6 @@
LDFLAGS
CFLAGS
CC
-WITH_N3
-monopath
-WITH_N3_MONO
-pnetlibpath
-N3_LIB
-WITH_N3_PNETLIB
-pnetlocalprefix
-WITH_J3
classpathversion
classpathinclude
classpathlibs
@@ -711,10 +701,6 @@
with_mmtk_plan
with_gnu_classpath_libs
with_gnu_classpath_glibj
-with_j3
-with_pnet_local_prefix
-with_pnetlib
-with_mono
'
ac_precious_vars='build_alias
host_alias
@@ -1353,13 +1339,6 @@
--with-gnu-classpath-glibj
Build J3 with GNU Classpath install (default is
'/usr/share/classpath/glibj.zip')
- --with-j3=yes|no Build J3 (default is yes)
- --with-pnet-local-prefix=something
- PNET local prefix (no default)
- --with-pnetlib=something
- Pnetlib's mscorlib.dll location (default is
- /usr/lib/cscc/lib/)
- --with-mono=something Mono's mscorlib.dll location (no default)
Some influential environment variables:
CC C compiler command
@@ -2560,93 +2539,8 @@
fi
-
-# Check whether --with-j3 was given.
-if test "${with_j3+set}" = set; then :
- withval=$with_j3; WITH_J3=$withval
-else
- WITH_J3=yes
-
-fi
-
-
classpathinclude="-I${classpathlibs}/../include -I/usr/include/classpath";
-if test "x${WITH_J3}" = "xyes"; then
- WITH_J3=1;
-
-$as_echo "#define WITH_J3 1" >>confdefs.h
-
-else
- WITH_J3=0;
-fi
-
-
-
-
-
-
-
-
-# Check whether --with-pnet-local-prefix was given.
-if test "${with_pnet_local_prefix+set}" = set; then :
- withval=$with_pnet_local_prefix; pnetlocalprefix=$withval
-else
- echo Not using PNETlocal prefix.
- pnetlocalprefix=''
-
-
-fi
-
-
-
-# Check whether --with-pnetlib was given.
-if test "${with_pnetlib+set}" = set; then :
- withval=$with_pnetlib; pnetlibpath=$withval
-else
- pnetlibpath=/usr/lib/cscc/lib/
-
-fi
-
-
-WITH_N3=0
-
-if test "x$pnetlocalprefix" != x; then
- echo Using ${pnetlocalprefix} as PNET local prefix;
- WITH_N3_PNETLIB=1;
- WITH_N3=1;
-
-$as_echo "#define WITH_N3 1" >>confdefs.h
-
-else
- WITH_N3_PNETLIB=0;
-fi
-
-
-
-
-N3_LIB=PNetLib
-
-
-
-
-# Check whether --with-mono was given.
-if test "${with_mono+set}" = set; then :
- withval=$with_mono; monopath=$withval
-else
- echo Not using Mono
-
-fi
-
-
-if test "x$monopath" != x; then
- echo Building N3 with Mono;
- WITH_N3_MONO=1;
- WITH_N3=1;
-else
- WITH_N3_MONO=0;
-fi
-
@@ -5054,147 +4948,6 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-if test "$WITH_LLVMGCCDIR" = "default" ; then
- LLVMGCC="llvm-gcc${EXEEXT}"
- LLVMGXX="llvm-g++${EXEEXT}"
- # Extract the first word of "$LLVMGCC", so it can be a program name with args.
-set dummy $LLVMGCC; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LLVMGCC+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $LLVMGCC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_LLVMGCC="$LLVMGCC" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_LLVMGCC="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-LLVMGCC=$ac_cv_path_LLVMGCC
-if test -n "$LLVMGCC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVMGCC" >&5
-$as_echo "$LLVMGCC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- # Extract the first word of "$LLVMGXX", so it can be a program name with args.
-set dummy $LLVMGXX; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LLVMGXX+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $LLVMGXX in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_LLVMGXX="$LLVMGXX" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_LLVMGXX="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-LLVMGXX=$ac_cv_path_LLVMGXX
-if test -n "$LLVMGXX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVMGXX" >&5
-$as_echo "$LLVMGXX" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-else
- if test -z "$LLVMGCC"; then
- LLVMGCC="$WITH_LLVMGCCDIR/bin/llvm-gcc${EXEEXT}"
- fi
- if test -z "$LLVMGXX"; then
- LLVMGXX="$WITH_LLVMGCCDIR/bin/llvm-g++${EXEEXT}"
- fi
- LLVMGCC=$LLVMGCC
-
- LLVMGXX=$LLVMGXX
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking tool compatibility" >&5
-$as_echo_n "checking tool compatibility... " >&6; }
-
-ICC=no
-IXX=no
-case $CC in
- icc*|icpc*)
- ICC=yes
- IXX=yes
- ;;
- *)
- ;;
-esac
-
-if test "$GCC" != "yes" && test "$ICC" != "yes"
-then
- as_fn_error $? "gcc|icc required but not found" "$LINENO" 5
-fi
-
-if test "$GXX" != "yes" && test "$IXX" != "yes"
-then
- as_fn_error $? "g++|icc required but not found" "$LINENO" 5
-fi
-
-if test "$GCC" = "yes"
-then
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if !defined(__GNUC__) || __GNUC__ < 3
-#error Unsupported GCC version
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- as_fn_error $? "gcc 3.x required, but you have a lower version" "$LINENO" 5
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
@@ -5653,9 +5406,6 @@
ac_config_commands="$ac_config_commands Makefile"
-ac_config_commands="$ac_config_commands lib/Makefile"
-
-
cat >confcache <<\_ACEOF
@@ -6366,7 +6116,6 @@
"mmtk/java/src/org/j3/config/Selected.java") CONFIG_FILES="$CONFIG_FILES mmtk/java/src/org/j3/config/Selected.java" ;;
"mmtk/java/build.xml") CONFIG_FILES="$CONFIG_FILES mmtk/java/build.xml" ;;
"Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
- "lib/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
@@ -6921,8 +6670,6 @@
case $ac_file$ac_mode in
"Makefile":C) ${llvm_src}/autoconf/mkinstalldirs `dirname Makefile`
${SHELL} ${llvm_src}/autoconf/install-sh -m 0644 -c ${srcdir}/Makefile Makefile ;;
- "lib/Makefile":C) ${llvm_src}/autoconf/mkinstalldirs `dirname lib/Makefile`
- ${SHELL} ${llvm_src}/autoconf/install-sh -m 0644 -c ${srcdir}/lib/Makefile lib/Makefile ;;
esac
done # for ac_tag
Modified: vmkit/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Makefile?rev=134157&r1=134156&r2=134157&view=diff
==============================================================================
--- vmkit/trunk/lib/Makefile (original)
+++ vmkit/trunk/lib/Makefile Thu Jun 30 09:37:02 2011
@@ -8,17 +8,9 @@
##===----------------------------------------------------------------------===##
LEVEL = ..
-PARALLEL_DIRS = Mvm
+PARALLEL_DIRS = Mvm J3
include $(LEVEL)/Makefile.config
-ifeq ($(WITH_J3), 1)
-PARALLEL_DIRS += J3
-endif
-
-ifeq ($(WITH_N3), 1)
-PARALLEL_DIRS += N3
-endif
-
include $(LEVEL)/Makefile.common
More information about the vmkit-commits
mailing list