Removed --posix from awk invocation in test-anno.

[nmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index ee5ce4520cd19595d4b09f3254a85f38c63e1d37..bb42a6ac44456e68cd9f54a3dc960c29c6660733 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -97,16 +97,15 @@ if test x"$enable_debug" = x"yes"; then
   test -z "$LDFLAGS" && LDFLAGS=-g
 fi
 
   test -z "$LDFLAGS" && LDFLAGS=-g
 fi
 

-dnl Use SunStudio cc, with -v, 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
-  ${CC} -V
-  CFLAGS="${CFLAGS:+$CFLAGS }-v -errtags=yes -erroff=E_STATEMENT_NOT_REACHED"
-fi
-
-AC_PROG_CC
+AC_PROG_CC(cc gcc)

 AM_PROG_CC_C_O
 
 AM_PROG_CC_C_O
 

+dnl Use -v and some other options with SunStudio cc.
+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"
  CFLAGS="$CFLAGS -Wextra -Werror"
 AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],
 [nmh_saved_cflags="$CFLAGS"
  CFLAGS="$CFLAGS -Wextra -Werror"