[llvm-commits] [release_19] CVS: llvm-poolalloc/Makefile.common.in configure

[John Criswell]

Changes in directory llvm-poolalloc:

Makefile.common.in updated: 1.11 -> 1.11.2.1
configure updated: 1.11.2.2 -> 1.11.2.3
---
Log message:

Added --with-safecodesrc and --with=safecodeobj options to specify the
location of SAFECode.  There should be no more hard coded paths in the
poolalloc source tree.
These should default to LLVM_SRC_ROOT/project/safecode and
LLVM_OBJ_ROOT/projects/safecode, respectively.


---
Diffs of the changes:  (+21 -2)

 Makefile.common.in |    7 +++++++
 configure          |   16 ++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)


Index: llvm-poolalloc/Makefile.common.in
diff -u llvm-poolalloc/Makefile.common.in:1.11 llvm-poolalloc/Makefile.common.in:1.11.2.1
--- llvm-poolalloc/Makefile.common.in:1.11	Wed May 18 14:56:19 2005
+++ llvm-poolalloc/Makefile.common.in	Thu Jan 11 17:27:33 2007
@@ -19,6 +19,13 @@
 # Set the root directory of this project's install prefix
 PROJ_INSTALL_ROOT := @prefix@
 
+SAFECODESRC := @SAFECODESRC@
+SAFECODEOBJ := @SAFECODEOBJ@
+
+CFLAGS   += -I${SAFECODESRC}/include -I${SAFECODEOBJ}/include
+CXXFLAGS += -I${SAFECODESRC}/include -I${SAFECODEOBJ}/include
+CPPFLAGS += -I${SAFECODESRC}/include -I${SAFECODEOBJ}/include
+
 # Include LLVM's Master Makefile.
 include $(LLVM_SRC_ROOT)/Makefile.common
 


Index: llvm-poolalloc/configure
diff -u llvm-poolalloc/configure:1.11.2.2 llvm-poolalloc/configure:1.11.2.3
--- llvm-poolalloc/configure:1.11.2.2	Wed Dec 13 17:22:40 2006
+++ llvm-poolalloc/configure	Thu Jan 11 17:27:33 2007
@@ -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 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 SAFECODESRC SAFECODEOBJ LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -855,6 +855,7 @@
   --with-llvmsrc          Location of LLVM Source Code
   --with-llvmobj          Location of LLVM Object Code
   --with-safecode         Location of SAFECode Source Code
+  --with-safecode         Location of SAFECode Object Code
 
 Some influential environment variables:
   CC          C compiler command
@@ -3671,7 +3672,17 @@
   SAFECODESRC=$withval
 
 else
-  SAFECODESRC=`cd ../safecode; pwd`
+  SAFECODESRC=`cd $LLVM_SRC_ROOT/projects/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 $LLVM_OBJ_ROOT/projects/safecode; pwd`
 
 fi;
 
@@ -4320,6 +4331,7 @@
 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