[llvm-commits] CVS: llvm-java/autoconf/configure.ac mkinstalldirs ltmain.sh install-sh Makefile

[Alkis Evlogimenos]

Changes in directory llvm-java/autoconf:

configure.ac updated: 1.11 -> 1.12
mkinstalldirs (r1.1) removed
ltmain.sh (r1.1) removed
install-sh (r1.1) removed
Makefile (r1.1) removed
---
Log message:

Adapt to new project build structure.


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

 configure.ac |   34 +++++++++++++---------------------
 1 files changed, 13 insertions(+), 21 deletions(-)


Index: llvm-java/autoconf/configure.ac
diff -u llvm-java/autoconf/configure.ac:1.11 llvm-java/autoconf/configure.ac:1.12
--- llvm-java/autoconf/configure.ac:1.11	Wed Dec  8 00:37:37 2004
+++ llvm-java/autoconf/configure.ac	Thu Feb 24 22:20:53 2005
@@ -3,14 +3,22 @@
 dnl **************************************************************************
 AC_INIT([[Java]], [[0.0]], [llvmbugs at cs.uiuc.edu])
 
-dnl Place all of the extra autoconf files into the config subdirectory
-AC_CONFIG_AUX_DIR([autoconf])
+dnl Tell autoconf that the auxilliary files are actually located in
+dnl the LLVM autoconf directory, not here.
+AC_CONFIG_AUX_DIR([../../autoconf])
+
+dnl Tell autoconf that this is an LLVM project being configured
+dnl This provides the --with-llvmsrc and --with-llvmobj options
+LLVM_CONFIG_PROJECT
 
-dnl Configure a header file
+dnl Verify that the source directory is valid
+AC_CONFIG_SRCDIR([Makefile.common.in])
 
-dnl Configure Makefiles
-dnl List every Makefile that exists within your source tree
+dnl Configure a common Makefile
+AC_CONFIG_FILES(Makefile.common)
 
+dnl Configure project makefiles
+dnl List every Makefile that exists within your source tree
 AC_CONFIG_MAKEFILE([Makefile])
 AC_CONFIG_MAKEFILE([lib/Makefile])
 AC_CONFIG_MAKEFILE([lib/ClassFile/Makefile])
@@ -25,8 +33,6 @@
 AC_CONFIG_MAKEFILE([tools/Makefile])
 AC_CONFIG_MAKEFILE([tools/classdump/Makefile])
 
-AC_CONFIG_FILES(Makefile.common)
-
 dnl **************************************************************************
 dnl * Determine which system we are building on
 dnl **************************************************************************
@@ -83,20 +89,6 @@
 dnl * Set the location of various third-party software packages
 dnl **************************************************************************
 
-dnl Location of LLVM source code
-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`]))
-
-dnl Location of LLVM object code
-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`]))
-
 dnl **************************************************************************
 dnl * Create the output files
 dnl **************************************************************************