build: update search paths for solaris cc

Move the macros to search for the solaris cc to a separate macro and
update the search paths to keep up with released versions.

Reviewed-on: https://gerrit.openafs.org/12528
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit 69aadea298825f1f224406064b83d1a947abf96b)

Change-Id: I1dadc037727c3b73d61104d03c5051c1dc154433
Reviewed-on: https://gerrit.openafs.org/12536
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/acinclude.m4 b/acinclude.m4
index 6d34609ed7b2c7135cc247fe7c072cc37c1f3516..4b521c434a2a33a20c5231411b71cbb95530b521 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -386,11 +386,7 @@ case $system in
         *-solaris*)
                MKAFS_OSTYPE=SOLARIS
                 AC_MSG_RESULT(sun4)
-               AC_PATH_PROG(SOLARISCC, [cc], ,
-                   [/opt/SUNWspro/bin:/opt/SunStudioExpress/bin:/opt/solarisstudio12.3/bin:/opt/solstudio12.2/bin:/opt/sunstudio12.1/bin])
-               if test "x$SOLARISCC" = "x" ; then
-                   AC_MSG_FAILURE(Could not find the solaris cc program.  Please define the environment variable SOLARISCC to specify the path.)
-               fi
+               SOLARIS_PATH_CC
                SOLARIS_UFSVFS_HAS_DQRWLOCK
                SOLARIS_FS_HAS_FS_ROLLED
                SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS

diff --git a/src/cf/solaris-cc.m4 b/src/cf/solaris-cc.m4
new file mode 100644 (file)
index 0000000..820108e
--- /dev/null
+++ b/src/cf/solaris-cc.m4
@@ -0,0 +1,15 @@
+AC_DEFUN([SOLARIS_PATH_CC], [
+  AC_PATH_PROG([SOLARISCC], [cc], [],
+    [m4_join([:],
+      [/opt/SUNWspro/bin],
+      [/opt/SunStudioExpress/bin],
+      [/opt/developerstudio12.5/bin],
+      [/opt/solarisstudio12.4/bin],
+      [/opt/solarisstudio12.3/bin],
+      [/opt/solstudio12.2/bin],
+      [/opt/sunstudio12.1/bin])])
+   AS_IF([test "x$SOLARISCC" = "x"],
+      [AC_MSG_FAILURE([m4_join([ ],
+         [Could not find the solaris cc program.],
+         [Please define the environment variable SOLARISCC to specify the path.])])])
+])