X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1761743053b665d3d25c51195ff8e56f2eb2e165..439c0aa8fdbcba3dd6aba558df13f6c115077e7f:/configure.ac?ds=inline

diff --git a/configure.ac b/configure.ac
index 9b7bb49e..4f7229a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,18 +167,17 @@ AC_SUBST([POSTLINK])
 dnl -----------------
 dnl CUSTOMIZE LDFLAGS
 dnl -----------------
-if test "$GCC" = yes; then
+AS_IF([test "$GCC" = yes  &&  `${CC} --version 2>&1 | grep clang >/dev/null`],
   dnl Disable clang complaint about unused -ansi when linking.
-  AC_CACHE_CHECK([whether linker supports -Qunused-arguments],
-                 [nmh_cv_has_q_unused_arguments],
-                 [nmh_saved_ldflags="$LDFLAGS"
-                  LDFLAGS="$LDFLAGS -Qunused-arguments"
-                  AC_TRY_LINK([],[],nmh_cv_has_q_unused_arguments=yes,
-                                    nmh_cv_has_q_unused_arguments=no)
-                  LDFLAGS="$nmh_saved_ldflags"])
-  test "$nmh_cv_has_q_unused_arguments" = "yes"  &&  \
-    LDFLAGS="${LDFLAGS:+$LDFLAGS }-Qunused-arguments"
-fi
+  [AC_CACHE_CHECK([whether linker supports -Qunused-arguments],
+                  [nmh_cv_has_q_unused_arguments],
+                  [nmh_saved_ldflags="$LDFLAGS"
+                   LDFLAGS="$LDFLAGS -Qunused-arguments"
+                   AC_TRY_LINK([],[],nmh_cv_has_q_unused_arguments=yes,
+                                     nmh_cv_has_q_unused_arguments=no)
+                   LDFLAGS="$nmh_saved_ldflags"])])
+test "$nmh_cv_has_q_unused_arguments" = "yes"  &&  \
+  LDFLAGS="${LDFLAGS:+$LDFLAGS }-Qunused-arguments"
 
 dnl This hack turns off assertions by default, assuming
 dnl that configure still uses this shell variable.  Without
@@ -503,11 +502,9 @@ dnl http://sourceforge.net/p/flex/bugs/140/
 AS_IF([test "$LEX" = flex],
       [AS_CASE([`$LEX -V`],
                [flex\ 2.5.35], [LFLAGS=\
-'; printf "%s\n" '\''1,$$s/(size_t) \(num_to_read\)/\1/'\'' w q | ed -s $@; \
-true'],
+'; sed -e "s/	int n;/	size_t n;/" $@ >$@.tmp && mv -f $@.tmp $@; true'],
                [flex\ 2.5.36], [LFLAGS=\
-'; printf "%s\n" '\''1,$$s/\(	\)int i;/\1yy_size_t i;/'\'' w q | ed -s $@; \
-true'])
+'; sed -s "s/\(	\)int i;/\1yy_size_t i;/" $@ >$.tmp && mv -f $@.tmp $@; true'])
        AC_SUBST([LFLAGS])])
 
 dnl ----------------