[llvm-commits] [poolalloc] r47094 - in /poolalloc/trunk: autoconf/aclocal.m4 autoconf/configure.ac configure

[John Criswell]

Author: criswell
Date: Wed Feb 13 16:23:55 2008
New Revision: 47094

URL: http://llvm.org/viewvc/llvm-project?rev=47094&view=rev
Log:
Added the --with-safecodeobj option to configure the location of SAFECode's
object tree.
Fixed Makefiles so that they can now enable SAFECode builds properly.

Modified:
    poolalloc/trunk/autoconf/aclocal.m4
    poolalloc/trunk/autoconf/configure.ac
    poolalloc/trunk/configure

Modified: poolalloc/trunk/autoconf/aclocal.m4
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/autoconf/aclocal.m4?rev=47094&r1=47093&r2=47094&view=diff

==============================================================================
--- poolalloc/trunk/autoconf/aclocal.m4 (original)
+++ poolalloc/trunk/autoconf/aclocal.m4 Wed Feb 13 16:23:55 2008
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

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

==============================================================================
--- poolalloc/trunk/autoconf/configure.ac (original)
+++ poolalloc/trunk/autoconf/configure.ac Wed Feb 13 16:23:55 2008
@@ -91,7 +91,8 @@
 dnl **************************************************************************
 
 dnl Location of SAFECode
-AC_ARG_WITH(safecodesrc,AS_HELP_STRING(--with-safecode,Location of SAFECode Source Code),AC_SUBST(SAFECODESRC,[$withval]),AC_SUBST(SAFECODESRC,[`cd ../safecode; pwd`]))
+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

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

==============================================================================
--- poolalloc/trunk/configure (original)
+++ poolalloc/trunk/configure Wed Feb 13 16:23:55 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 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.
@@ -854,7 +854,8 @@
   --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-safecode         Location of SAFECode Source Code
+  --with-safecodesrc      Location of SAFECode Source Code
+  --with-safecodeobj      Location of SAFECode Object Code
 
 Some influential environment variables:
   CC          C compiler command
@@ -3675,6 +3676,16 @@
 
 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"
 
 
@@ -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