diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2006-03-23 23:21:29 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2006-03-23 23:21:29 +0000 |
| commit | b195d9d365e5f960c93ddfdf10638d5d147d9f6f (patch) | |
| tree | b9e444706691bb8fc0ff717926bb4e02fc3080e7 /autoconf | |
| parent | 7e0911585ec2996837f151baab3d3fc9145a7e02 (diff) | |
| download | llvm-b195d9d365e5f960c93ddfdf10638d5d147d9f6f.tar.gz llvm-b195d9d365e5f960c93ddfdf10638d5d147d9f6f.tar.bz2 llvm-b195d9d365e5f960c93ddfdf10638d5d147d9f6f.tar.xz | |
Update to llvm-config tool, by Erik Kidd:
1. Check for Perl and only build llvm-config if its available.
2. Add some virtual components
3. Don't depend on "standard" location for Perl, but configured location
4. Document the tool with a POD file.
This version is now ready for testing by users.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@27005 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'autoconf')
| -rw-r--r-- | autoconf/configure.ac | 23 | ||||
| -rw-r--r-- | autoconf/m4/path_perl.m4 | 16 |
2 files changed, 32 insertions, 7 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 42d38c8dff..81dc0aa5d0 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -218,13 +218,13 @@ then AC_SUBST(JIT,[[]]) else case "$llvm_cv_target_arch" in - x86) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;; - Sparc) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;; - PowerPC) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;; - x86_64) AC_SUBST(JIT,[[]]) ;; - Alpha) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;; - IA64) AC_SUBST(JIT,[[]]) ;; - *) AC_SUBST(JIT,[[]]) ;; + x86) AC_SUBST(TARGET_HAS_JIT,1) ;; + Sparc) AC_SUBST(TARGET_HAS_JIT,1) ;; + PowerPC) AC_SUBST(TARGET_HAS_JIT,1) ;; + x86_64) AC_SUBST(TARGET_HAS_JIT,0) ;; + Alpha) AC_SUBST(TARGET_HAS_JIT,1) ;; + IA64) AC_SUBST(TARGET_HAS_JIT,0) ;; + *) AC_SUBST(TARGET_HAS_JIT,0) ;; esac fi @@ -338,6 +338,15 @@ if test "$GV" != "echo gv" ; then [Define to path to gv program if found or 'echo gv' otherwise]) fi +dnl Look for a sufficiently recent version of Perl. +LLVM_PROG_PERL([5.006]) +AC_SUBST(PERL) +if test x"$PERL" = xnone; then + AC_SUBST(HAVE_PERL,0) +else + AC_SUBST(HAVE_PERL,1) +fi + dnl Find the install program AC_PROG_INSTALL diff --git a/autoconf/m4/path_perl.m4 b/autoconf/m4/path_perl.m4 new file mode 100644 index 0000000000..406656cb03 --- /dev/null +++ b/autoconf/m4/path_perl.m4 @@ -0,0 +1,16 @@ +dnl Check for a reasonable version of Perl. +dnl $1 - Minimum Perl version. Typically 5.006. +dnl +AC_DEFUN([LLVM_PROG_PERL], [ +AC_PATH_PROG(PERL, [perl], [none]) +if test "$PERL" != "none"; then + AC_MSG_CHECKING(for Perl $1 or newer) + if $PERL -e 'use $1;' 2>&1 > /dev/null; then + AC_MSG_RESULT(yes) + else + PERL=none + AC_MSG_RESULT(not found) + fi +fi +]) + |