[llvm-commits] [poolalloc] r50185 - in /poolalloc/trunk: Makefile.common.in autoconf/configure.ac configure

[John Criswell]

Author: criswell
Date: Wed Apr 23 16:24:38 2008
New Revision: 50185

URL: http://llvm.org/viewvc/llvm-project?rev=50185&view=rev
Log:
Spring cleaning: removed circular dependency on the SAFECode project when
enabling the SAFECode defaults.
The --with-safecodesrc related configure options are now gone.

Modified:
    poolalloc/trunk/Makefile.common.in
    poolalloc/trunk/autoconf/configure.ac
    poolalloc/trunk/configure

Modified: poolalloc/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/Makefile.common.in?rev=50185&r1=50184&r2=50185&view=diff

==============================================================================
--- poolalloc/trunk/Makefile.common.in (original)
+++ poolalloc/trunk/Makefile.common.in Wed Apr 23 16:24:38 2008
@@ -19,16 +19,6 @@
 # Set the root directory of this project's install prefix
 PROJ_INSTALL_ROOT := @prefix@
 
-# Location of SAFECode source tree
-SAFECODE_SRC_ROOT := @SAFECODESRC@
-SAFECODE_OBJ_ROOT := @SAFECODEOBJ@
-
-# All of the code should additionally look inside the pool allocation source
-# code for include files
-CFLAGS   += -I$(SAFECODE_SRC_ROOT)/include -I$(SAFECODE_OBJ_ROOT)/include
-CXXFLAGS += -I$(SAFECODE_SRC_ROOT)/include -I$(SAFECODE_OBJ_ROOT)/include
-CPPFLAGS += -I$(SAFECODE_SRC_ROOT)/include -I$(SAFECODE_OBJ_ROOT)/include
-
 # Include LLVM's Master Makefile.
 include $(LLVM_SRC_ROOT)/Makefile.common
 

Modified: poolalloc/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/autoconf/configure.ac?rev=50185&r1=50184&r2=50185&view=diff

==============================================================================
--- poolalloc/trunk/autoconf/configure.ac (original)
+++ poolalloc/trunk/autoconf/configure.ac Wed Apr 23 16:24:38 2008
@@ -90,10 +90,6 @@
 dnl * Set the location of various third-party software packages
 dnl **************************************************************************
 
-dnl Location of SAFECode
-AC_ARG_WITH(safecodesrc,AS_HELP_STRING(--with-safecodesrc,Location of SAFECode Source Code),AC_SUBST(SAFECODESRC,[$withval]),AC_SUBST(SAFECODESRC,[`cd ../safecode; pwd`]))
-AC_ARG_WITH(safecodeobj,AS_HELP_STRING(--with-safecodeobj,Location of SAFECode Object Code),AC_SUBST(SAFECODEOBJ,[$withval]),AC_SUBST(SAFECODEOBJ,[`cd ../safecode; pwd`]))
-
 dnl **************************************************************************
 dnl * Create the output files
 dnl **************************************************************************

Modified: poolalloc/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/configure?rev=50185&r1=50184&r2=50185&view=diff

==============================================================================
--- poolalloc/trunk/configure (original)
+++ poolalloc/trunk/configure Wed Apr 23 16:24:38 2008
@@ -311,7 +311,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP MMAP_FILE SAFECODESRC SAFECODEOBJ LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP MMAP_FILE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -854,8 +854,6 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-llvmsrc          Location of LLVM Source Code
   --with-llvmobj          Location of LLVM Object Code
-  --with-safecodesrc      Location of SAFECode Source Code
-  --with-safecodeobj      Location of SAFECode Object Code
 
 Some influential environment variables:
   CC          C compiler command
@@ -3665,27 +3663,6 @@
 fi;
 
 
-
-# Check whether --with-safecodesrc or --without-safecodesrc was given.
-if test "${with_safecodesrc+set}" = set; then
-  withval="$with_safecodesrc"
-  SAFECODESRC=$withval
-
-else
-  SAFECODESRC=`cd ../safecode; pwd`
-
-fi;
-
-# Check whether --with-safecodeobj or --without-safecodeobj was given.
-if test "${with_safecodeobj+set}" = set; then
-  withval="$with_safecodeobj"
-  SAFECODEOBJ=$withval
-
-else
-  SAFECODEOBJ=`cd ../safecode; pwd`
-
-fi;
-
           ac_config_headers="$ac_config_headers include/poolalloc/Config/config.h"
 
 
@@ -4330,8 +4307,6 @@
 s, at CPP@,$CPP,;t t
 s, at EGREP@,$EGREP,;t t
 s, at MMAP_FILE@,$MMAP_FILE,;t t
-s, at SAFECODESRC@,$SAFECODESRC,;t t
-s, at SAFECODEOBJ@,$SAFECODEOBJ,;t t
 s, at LIBOBJS@,$LIBOBJS,;t t
 s, at LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF