diff --git a/acinclude.m4 b/acinclude.m4
index 6d34609ed7..4b521c434a 100644
--- 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
index 0000000000..820108ea2d
--- /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.])])])
+])