From d102a911ce103c413796f36ee1d90bcb0eb479a9 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Sat, 25 Feb 2017 20:33:00 -0500 Subject: [PATCH] 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 Tested-by: BuildBot (cherry picked from commit 69aadea298825f1f224406064b83d1a947abf96b) Change-Id: I1dadc037727c3b73d61104d03c5051c1dc154433 Reviewed-on: https://gerrit.openafs.org/12536 Tested-by: BuildBot Reviewed-by: Michael Meffie Tested-by: Michael Meffie Reviewed-by: Stephan Wiesand --- acinclude.m4 | 6 +----- src/cf/solaris-cc.m4 | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 src/cf/solaris-cc.m4 diff --git a/acinclude.m4 b/acinclude.m4 index 6d34609ed..4b521c434 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 000000000..820108ea2 --- /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.])])]) +]) -- 2.39.5