X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0c407956508eef71f5c6d1942193026cd9404c66..912dc7a4eb7ee59f8d146c869c4f9a1ff0c8190f:/configure.ac

diff --git a/configure.ac b/configure.ac
index bb1528f1..bb42a6ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,19 +97,14 @@ if test x"$enable_debug" = x"yes"; then
   test -z "$LDFLAGS" && LDFLAGS=-g
 fi
 
-dnl Use SunStudio cc, if present, on Solaris if user didn't set CC.
-if test -z "$CC"  -a  -d /opt/solarisstudio12.3/bin; then
-  CC=/opt/solarisstudio12.3/bin/cc; export CC
-fi
-
-AC_PROG_CC
+AC_PROG_CC(cc gcc)
 AM_PROG_CC_C_O
 
 dnl Use -v and some other options with SunStudio cc.
-dnl case `cc -V` in
-dnl   cc:\ Sun\ C*) CFLAGS="${CFLAGS:+$CFLAGS }-v -errtags=yes"
-dnl                CFLAGS="${CFLAGS} -erroff=E_STATEMENT_NOT_REACHED" ;;
-dnl esac
+case `${CC} -V 2>&1` in
+  cc:\ Sun\ C*) CFLAGS="${CFLAGS:+$CFLAGS }-v -errtags=yes"
+                CFLAGS="${CFLAGS} -erroff=E_STATEMENT_NOT_REACHED" ;;
+esac
 
 AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],
 [nmh_saved_cflags="$CFLAGS"