Do not call egrep to determine emacs version in EDE.

* ede/emacs.el (ede-emacs-version): Do not call 'egrep' to
determine Emacs version (it was dead code anyway).  Make sure that
configure.ac or configure.in exist.  (Bug#18476)

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 750e0bca0952a9415a04316d799fddc19457091e..05bd95a50cccbab30c30e48ef881f1752e2fd169 100644 (file)
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-18  David Engster  <deng@randomsample.de>
+
+       * ede/emacs.el (ede-emacs-version): Do not call 'egrep' to
+       determine Emacs version (it was dead code anyway).  Make sure that
+       configure.ac or configure.in exist.  (Bug#18476)
+
 2014-05-01  Glenn Morris  <rgm@gnu.org>
 
        * ede.el (ede-project-directories, ede-check-project-directory):

diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index 43f16da8a7774fd9d8bc2f58b42ec765c957019b..76925a66713c3625abf99198262ece226918fb78 100644 (file)
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -80,12 +80,6 @@ Return a tuple of ( EMACSNAME . VERSION )."
     (with-current-buffer buff
       (erase-buffer)
       (setq default-directory (file-name-as-directory dir))
-      (or (file-exists-p configure_ac)
-         (setq configure_ac "configure.in"))
-      ;(call-process "egrep" nil buff nil "-n" "-e" "^version=" "Makefile")
-      (call-process "egrep" nil buff nil "-n" "-e" "AC_INIT" configure_ac)
-      (goto-char (point-min))
-      ;(re-search-forward "version=\\([0-9.]+\\)")
       (cond
        ;; Maybe XEmacs?
        ((file-exists-p "version.sh")
@@ -113,7 +107,8 @@ m4_define(\\[SXEM4CS_BETA_VERSION\\], \\[\\([0-9]+\\)\\])")
        ;; Insert other Emacs here...
 
        ;; Vaguely recent version of GNU Emacs?
-       (t
+       ((or (file-exists-p configure_ac)
+           (file-exists-p (setq configure_ac "configure.in")))
        (insert-file-contents configure_ac)
        (goto-char (point-min))
        (re-search-forward "AC_INIT(\\(?:GNU \\)?[eE]macs,\\s-*\\([0-9.]+\\)\\s-*[,)]")