From ae079f16eec2e86e8348dea15f799e335622ee0c Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 14 Feb 2014 14:29:42 -0500 Subject: [PATCH] 3rd travis try via el-get --- .travis.yml | 1 + configure.ac | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d396f9e58..ad6ec9b31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: emacs-lisp env: - EMACS=emacs24 + - NO_CHECK_EMACS_PACKAGES=1 # run the tests script: diff --git a/configure.ac b/configure.ac index 1e8accbec..50590482c 100644 --- a/configure.ac +++ b/configure.ac @@ -8,17 +8,26 @@ AC_PATH_PROG([EMACS], [emacs], [emacs]) AC_ARG_WITH(emacs, AC_HELP_STRING([--with-emacs], [location of emacs program]), EMACS=$withval) -AC_MSG_NOTICE("Checking emacs version and prerequiste packages") +AC_MSG_NOTICE("Checking emacs version") $EMACS -batch -q --no-site-file -eval \ '(if (<= emacs-major-version 22) (progn (error "You need GNU Emacs 23 or better.") (kill-emacs 1) ) - (dolist (package + )' +if test $? -ne 0 ; then + AC_MSG_ERROR([Can't continue until above error is corrected.]) +fi + +if test "$NO_CHECK_EMACS_PACKAGES" = "" ; then +AC_MSG_NOTICE("Checking prerequiste packages") +$EMACS -batch -q --no-site-file -eval \ + '(dolist (package (quote (cl-lib loc-changes load-relative test-simple))) (require package)) )' +fi if test $? -ne 0 ; then AC_MSG_ERROR([Can't continue until above error is corrected.]) fi -- 2.39.2