summaryrefslogtreecommitdiff
path: root/projects/sample
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2005-02-24 18:50:53 +0000
committerReid Spencer <rspencer@reidspencer.com>2005-02-24 18:50:53 +0000
commit1a87ddc03bc77dc9f9bff297bdbf90dbf959f77f (patch)
tree16b05a7457c165c2a39fc6781f3fbb473864163a /projects/sample
parentb2da6507b0979892dfe63a87b7f20d8c5a68362f (diff)
* Move all the "standard" configuration stuff to the start of the file
* Make the auxilliary directory be llvm/autoconf not the project's * Use the LLVM_CONFIG_PROJECT macro to get the --with-llvm{src,obj} args git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20310 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'projects/sample')
-rw-r--r--projects/sample/autoconf/configure.ac30
1 files changed, 15 insertions, 15 deletions
diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac
index b3ea7fa7fdd..43a2e903efd 100644
--- a/projects/sample/autoconf/configure.ac
+++ b/projects/sample/autoconf/configure.ac
@@ -3,15 +3,22 @@ dnl * Initialize
dnl **************************************************************************
AC_INIT([[[SAMPLE]]],[[[x.xx]]],[bugs@yourdomain])
-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 Configure a header file
-AC_CONFIG_FILES(Makefile.common)
+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 Verify that the source directory is valid
+AC_CONFIG_SRCDIR(["Makefile.common.in"])
-dnl Configure Makefiles
-dnl List every Makefile that ecists 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/sample/Makefile)
@@ -26,9 +33,6 @@ dnl **************************************************************************
dnl * Check for programs.
dnl **************************************************************************
-dnl Verify that the source directory is valid
-AC_CONFIG_SRCDIR(["Makefile.common.in"])
-
dnl **************************************************************************
dnl * Check for libraries.
dnl **************************************************************************
@@ -53,13 +57,9 @@ dnl **************************************************************************
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 **************************************************************************
+
+dnl This must be last
AC_OUTPUT