[llvm-commits] [TV] r79238 - in /television/trunk: README.txt autoconf/configure.ac

[Misha Brukman]

Author: brukman
Date: Mon Aug 17 10:20:16 2009
New Revision: 79238

URL: http://llvm.org/viewvc/llvm-project?rev=79238&view=rev
Log:
* Added -with-poolalloc-{src,obj} switches to pick up DSA from poolalloc
* Changed LLVM configure switches format to match those of poolalloc and improve
  readability: --with-llvm-{src,obj}

Modified:
    television/trunk/README.txt
    television/trunk/autoconf/configure.ac

Modified: television/trunk/README.txt
URL: http://llvm.org/viewvc/llvm-project/television/trunk/README.txt?rev=79238&r1=79237&r2=79238&view=diff

==============================================================================
--- television/trunk/README.txt (original)
+++ television/trunk/README.txt Mon Aug 17 10:20:16 2009
@@ -20,19 +20,20 @@
 
 How to compile:
 
-1. You must have wxWindows installed on your system, and wx-config has to be
+1. You must have wxWidgets installed on your system, and wx-config has to be
    in your path.
 
-   Make absolutely sure that wxwindows's configure picks up the same
+   Make absolutely sure that wxWidgets' configure picks up the same
    C++ compiler that you're using for llvm. Otherwise, you may get
    weird link errors when trying to link the llvm-tv tool.
 
 2. Configure and compile llvm-tv (you need an LLVM source and build trees):
 
 % cd path/to/llvm-tv
-% ./configure --with-llvmsrc=[path] --with-llvmobj=[path]
-   If you're building in llvm/projects/llvm-tv, then you don't need
-   to specify these --with options.
+# If you're building in llvm/projects/llvm-tv, then you don't need
+# to specify the --with-llvm-* options.
+% ./configure --with-llvm-src=[path] --with-llvm-obj=[path] \
+              --with-poolalloc-src=[path] --with-poolalloc-obj=[path]
 % gmake
 
 Example of usage:

Modified: television/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/television/trunk/autoconf/configure.ac?rev=79238&r1=79237&r2=79238&view=diff

==============================================================================
--- television/trunk/autoconf/configure.ac (original)
+++ television/trunk/autoconf/configure.ac Mon Aug 17 10:20:16 2009
@@ -21,8 +21,29 @@
 dnl have been specified by the user. By default, assume we've unpacked this
 dnl project in projects/<project-name>, as is customary, and look in ../..
 dnl for the main LLVM source and object trees.
-AC_ARG_WITH(llvmsrc,AS_HELP_STRING([--with-llvmsrc],[Location of LLVM Source Code]),AC_SUBST(LLVM_SRC,[$withval]),AC_SUBST(LLVM_SRC,[`cd ${srcdir}/../..; pwd`]))
-AC_ARG_WITH(llvmobj,AS_HELP_STRING([--with-llvmobj],[Location of LLVM Object Code]),AC_SUBST(LLVM_OBJ,[$withval]),AC_SUBST(LLVM_OBJ,[`cd ../..; pwd`]))
+AC_ARG_WITH(llvm-src,
+            AS_HELP_STRING([--with-llvm-src],
+                           [Location of LLVM Source Code]),
+            AC_SUBST(LLVM_SRC, [$withval]),
+            AC_SUBST(LLVM_SRC, [`cd ${srcdir}/../..; pwd`]))
+AC_ARG_WITH(llvm-obj,
+            AS_HELP_STRING([--with-llvm-obj],
+                           [Location of LLVM Object Code]),
+            AC_SUBST(LLVM_OBJ, [$withval]),
+            AC_SUBST(LLVM_OBJ, [`cd ../..; pwd`]))
+
+dnl We need to get the DataStructure Analysis headers and libraries from
+dnl poolalloc, since that is where they live now.
+AC_ARG_WITH(poolalloc-src,
+            AS_HELP_STRING([--with-poolalloc-src],
+                           [Location of PoolAlloc Source Code]),
+            AC_SUBST(POOLALLOC_SRC, [$withval]),
+            AC_SUBST(POOLALLOC_SRC, [`cd ${srcdir}/../..; pwd`]))
+AC_ARG_WITH(poolalloc-obj,
+            AS_HELP_STRING([--with-poolalloc-obj],
+                           [Location of PoolAlloc Object Code]),
+            AC_SUBST(POOLALLOC_OBJ, [$withval]),
+            AC_SUBST(POOLALLOC_OBJ, [`cd ../..; pwd`]))
 
 dnl Create the output files
 AC_OUTPUT