diff options
Diffstat (limited to 'stacker/autoconf/configure.ac')
| -rw-r--r-- | stacker/autoconf/configure.ac | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/stacker/autoconf/configure.ac b/stacker/autoconf/configure.ac index 3f5326e5e77..d4a8bc584bc 100644 --- a/stacker/autoconf/configure.ac +++ b/stacker/autoconf/configure.ac @@ -1,7 +1,7 @@ dnl ************************************************************************** dnl * Initialize dnl ************************************************************************** -AC_INIT([[[Stacker]]],[[[1.0]]],[rspencer@x10sys.com]) +AC_INIT([[[Stacker]]],[[[2.0]]],[rspencer@reidspencer.com]) dnl Place all of the extra autoconf files into the config subdirectory AC_CONFIG_AUX_DIR([autoconf]) @@ -11,16 +11,6 @@ AC_CONFIG_SRCDIR([lib/compiler/StackerParser.y]) AC_CONFIG_FILES([Makefile.common]) -dnl Configure Makefiles -dnl List every Makefile that exists within your source tree - -AC_CONFIG_MAKEFILE(Makefile) -AC_CONFIG_MAKEFILE(lib/Makefile) -AC_CONFIG_MAKEFILE(lib/compiler/Makefile) -AC_CONFIG_MAKEFILE(lib/runtime/Makefile) -AC_CONFIG_MAKEFILE(test/Makefile) -AC_CONFIG_MAKEFILE(tools/Makefile) -AC_CONFIG_MAKEFILE(tools/stkrc/Makefile) dnl ************************************************************************** dnl * Determine which system we are building on @@ -68,12 +58,28 @@ dnl * Set the location of various third-party software packages dnl ************************************************************************** dnl Location of LLVM source code -AC_ARG_WITH(llvmsrc,AC_HELP_STRING([--with-llvmsrc],[Location of LLVM Source Code]),AC_SUBST(LLVM_SRC,[$withval]),AC_SUBST(LLVM_SRC,[`cd ${srcdir}/../..; pwd`])) +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_CONFIG_COMMANDS([llvm_src],[],[llvm_src=$LLVM_SRC]) 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,[`cd ../..; 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_CONFIG_COMMANDS([llvm_obj],[],[llvm_obj=$LLVM_OBJ]) + +dnl ************************************************************************** +dnl Configure Makefiles +dnl List every Makefile that exists within your source tree +dnl ************************************************************************** + +AC_CONFIG_MAKEFILE(Makefile) +AC_CONFIG_MAKEFILE(lib/Makefile) +AC_CONFIG_MAKEFILE(lib/compiler/Makefile) +AC_CONFIG_MAKEFILE(lib/runtime/Makefile) +AC_CONFIG_MAKEFILE(test/Makefile) +AC_CONFIG_MAKEFILE(tools/Makefile) +AC_CONFIG_MAKEFILE(tools/stkrc/Makefile) dnl ************************************************************************** dnl * Create the output files dnl ************************************************************************** + AC_OUTPUT |
