[llvm-commits] CVS: reopt/autoconf/aclocal.m4 configure.ac

[John Criswell]

Changes in directory reopt/autoconf:

aclocal.m4 updated: 1.1.1.1 -> 1.2
configure.ac updated: 1.2 -> 1.3

---
Log message:

Added the ability to configure reopt with separate source and object root
directories.



---
Diffs of the changes:

Index: reopt/autoconf/aclocal.m4
diff -u reopt/autoconf/aclocal.m4:1.1.1.1 reopt/autoconf/aclocal.m4:1.2
--- reopt/autoconf/aclocal.m4:1.1.1.1	Mon Aug 11 16:29:15 2003
+++ reopt/autoconf/aclocal.m4	Tue Sep 30 10:31:12 2003
@@ -6156,3 +6156,13 @@
 fi
 ])
 
+#
+# Configure a Makefile without clobbering it if it exists and is not out of
+# date.  This is modified from:
+# http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html
+#
+AC_DEFUN([AC_CONFIG_MAKEFILE],
+[AC_CONFIG_COMMANDS($1,${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/$1 $1,${srcdir}/autoconf/mkinstalldirs `dirname $1`)
+])
+
+


Index: reopt/autoconf/configure.ac
diff -u reopt/autoconf/configure.ac:1.2 reopt/autoconf/configure.ac:1.3
--- reopt/autoconf/configure.ac:1.2	Wed Sep 10 10:05:14 2003
+++ reopt/autoconf/configure.ac	Tue Sep 30 10:31:12 2003
@@ -21,7 +21,24 @@
 AC_CONFIG_AUX_DIR([autoconf])
 
 dnl Configure a header file
-dnl AC_CONFIG_HEADERS(include/Config/config.h)
+
+dnl Configure Makefiles
+AC_CONFIG_MAKEFILE(Makefile)
+AC_CONFIG_MAKEFILE(lib/Makefile)
+AC_CONFIG_MAKEFILE(lib/BinInterface/Makefile)
+AC_CONFIG_MAKEFILE(lib/Inst/Makefile)
+AC_CONFIG_MAKEFILE(lib/Inst/lib/Makefile)
+AC_CONFIG_MAKEFILE(lib/Inst/lib/Phase1/Makefile)
+AC_CONFIG_MAKEFILE(lib/Inst/rtl/Makefile)
+AC_CONFIG_MAKEFILE(lib/LightWtProfiling/Makefile)
+AC_CONFIG_MAKEFILE(lib/Mapping/Makefile)
+AC_CONFIG_MAKEFILE(lib/ScratchMemory/Makefile)
+AC_CONFIG_MAKEFILE(lib/TraceCache/Makefile)
+AC_CONFIG_MAKEFILE(lib/Trigger/Makefile)
+AC_CONFIG_MAKEFILE(test/Makefile)
+AC_CONFIG_MAKEFILE(test/TEST.reopt.Makefile)
+AC_CONFIG_MAKEFILE(tools/Makefile)
+AC_CONFIG_MAKEFILE(tools/mkexcl/Makefile)
 
 dnl **************************************************************************
 dnl * Determine which system we are building on
@@ -69,7 +86,7 @@
 AC_ARG_WITH(llvmsrc,AC_HELP_STRING([--with-llvmsrc],[Location of LLVM Source Code]),AC_SUBST(LLVM_SRC,[$withval]),AC_SUBST(LLVM_SRC,[/home/vadve/${USER}/llvm]))
 
 dnl Location of LLVM object code
-AC_ARG_WITH(llvmobj,AC_HELP_STRING([--with-llvmobj],[Location of LLVM Object Code]),AC_SUBST(LLVM_OBJ,[$withval]),AC_SUBST(LLVM_OBJ,[/home/vadve/${USER}/llvm]))
+AC_ARG_WITH(llvmobj,AC_HELP_STRING([--with-llvmobj],[Location of LLVM Object Code]),AC_SUBST(LLVM_OBJ,[$withval]),AC_SUBST(LLVM_OBJ,[`cd ../..; pwd`]))
 
 dnl **************************************************************************
 dnl * Create the output files