(c-macro-preprocessor): Use locate-file to look for the preprocessor

with exec-suffixes.  If not found in standard places, look in exec-path.
Remove most of the tests that used system-type.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e1d5845581ec52e4d41ae66108c47789efff5d8..372298cf5faad2713bcb98f9bee485052a060fb3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2005-05-06  Eli Zaretskii  <eliz@gnu.org>
 
+       * progmodes/cmacexp.el (c-macro-preprocessor): Use locate-file to
+       look for the preprocessor with exec-suffixes.  If not found in
+       standard places, look in exec-path.  Remove most of the tests that
+       used system-type.
+
        * loadup.el: Load jka-cmpr-hook instead of jka-comp-hook.
 
        * jka-compr.el (jka-compr-uninstall): Add autoload cookie.

diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 28d988961a604df5f95bf3bc3d9fb6f4ea8ff6f1..65eea658d4ee029a5444dcab3f599ee505a041fa 100644 (file)
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -108,18 +108,23 @@
   :group 'c-macro)
 
 (defcustom c-macro-preprocessor
-  ;; Cannot rely on standard directory on MS-DOS to find CPP.  In
-  ;; fact, cannot rely on having cpp.exe, either, in latest GCC
-  ;; versions.
-  (cond ((eq system-type 'ms-dos) "gcc -E -C -o - -")
-       ;; Solaris has it in an unusual place.
+  (cond ;; Solaris has it in an unusual place.
        ((and (string-match "^[^-]*-[^-]*-\\(solaris\\|sunos5\\)"
                            system-configuration)
              (file-exists-p "/opt/SUNWspro/SC3.0.1/bin/acomp"))
         "/opt/SUNWspro/SC3.0.1/bin/acomp -C -E")
-        ((file-exists-p "/usr/ccs/lib/cpp") "/usr/ccs/lib/cpp -C")
-       ((memq system-type '(darwin berkeley-unix)) "gcc -E -C -")
-       (t "/lib/cpp -C"))
+        ((locate-file "/usr/ccs/lib/cpp"
+                     '("/") exec-suffixes 'file-executable-p)
+        "/usr/ccs/lib/cpp -C")
+       ((locate-file "/lib/cpp"
+                     '("/") exec-suffixes 'file-executable-p)
+        "/lib/cpp -C")
+       ;; On some systems, we cannot rely on standard directories to
+       ;; find CPP.  In fact, we cannot rely on having cpp, either,
+       ;; in some GCC versions.
+       ((locate-file "cpp" exec-path exec-suffixes 'file-executable-p)
+        "cpp -C")
+       (t "gcc -E -C -o - -"))
   "The preprocessor used by the cmacexp package.
 
 If you change this, be sure to preserve the `-C' (don't strip comments)