Infrastructure for external package interaction
authorPhil Miller <mille121@illinois.edu>
Thu, 17 Feb 2011 21:39:21 +0000 (15:39 -0600)
committerPhil Miller <mille121@illinois.edu>
Thu, 17 Feb 2011 21:40:50 +0000 (15:40 -0600)
build
src/scripts/Makefile
src/scripts/configure
src/scripts/configure.in

diff --git a/build b/build
index 99fb6a2d209d7acb5a2a69aee2735d8eec475ec7..c1b891c84f79f3e38ec3b051a6eb07d6379bbc96 100755 (executable)
--- a/build
+++ b/build
@@ -512,6 +512,7 @@ $DESTINATION/tmp/system_ln "../../src/ck-ldb/Make.lb" $DESTINATION/tmp/Make.lb
 $DESTINATION/tmp/system_ln "../../src/scripts/Makefile" $DESTINATION/tmp/Makefile
 $DESTINATION/tmp/system_ln "../../src/scripts/Make.tau" $DESTINATION/tmp/Make.tau
 touch $DESTINATION/tmp/Makefile.machine
+touch $DESTINATION/tmp/Make.extlib
 
 ConvUsr="$DESTINATION/tmp/conv-mach-pre.sh"
 Echo "Generating $ConvUsr"
index 958ac15ca98da698bf35aeccf3202c892ba26c60..c4eefd9a5f8d60f7dbd2621c0a1f5a6cc03b7f4b 100644 (file)
@@ -173,6 +173,9 @@ CIFILES = $(wildcard *.ci)
 # Automatically generated by script Makefile_lb.sh
 include Make.lb
 
+# Build changes for external libraries
+include Make.extlib
+
 ###############################################################################
 #
 # The basics (bin, lib, include, headers, charmc, conv-mach.sh)
index 1a931066b6403d9b209acea198900fbf7c07b48c..1b3dd39243b0028a9abf76d4e929cf3f7ebf6f91 100755 (executable)
@@ -1675,6 +1675,7 @@ _ACEOF
 
 charmout="charmconfig.out"
 /bin/rm -rf $charmout
+MAKEFILE_EXT=Make.extlib
 
 Echo() {
        echo $*
@@ -1813,7 +1814,6 @@ then
   WITH_NUMA=yes
 fi
 
-
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking machine name" >&5
 $as_echo_n "checking machine name... " >&6; }
index 36d07aacc7fd598a8d46c6304620beac5b533342..08ea638327672a8022d7c252ff3ac10cb93aaf66 100644 (file)
@@ -15,6 +15,7 @@ AC_DEFINE_UNQUOTED([CHARM_VERSION], $VERSION, [Charm++ Release/API version numbe
 
 charmout="charmconfig.out"
 /bin/rm -rf $charmout
+MAKEFILE_EXT=Make.extlib
 
 Echo() {
        echo $* 
@@ -100,7 +101,6 @@ then
   Echo "Charm NUMA support is builtin"
   WITH_NUMA=yes
 fi
-          
 
 #
 AC_MSG_CHECKING(machine name)