summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2009-01-22 19:06:01 +0000
committerWerner Koch <wk@gnupg.org>2009-01-22 19:06:01 +0000
commit8316958553958ddb20c2f18a1d6287e48d022946 (patch)
tree263889255a9e4d2299c020e362b2711b6d95dc48 /m4
parent235ece0c96f473a101a18e9521ad05dd8d3b3fac (diff)
downloadlibgcrypt-8316958553958ddb20c2f18a1d6287e48d022946.tar.gz
Diffstat (limited to 'm4')
-rw-r--r--m4/ChangeLog5
-rw-r--r--m4/noexecstack.m42
2 files changed, 6 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 49c1b321..fc1433b0 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-22 Werner Koch <wk@g10code.com>
+
+ * noexecstack.m4: Replace non portable grep -q. Reported by
+ Albert Chin.
+
2007-02-22 Werner Koch <wk@g10code.com>
* noexecstack.m4: Change default to enable it.
diff --git a/m4/noexecstack.m4 b/m4/noexecstack.m4
index f1924a79..4aab484f 100644
--- a/m4/noexecstack.m4
+++ b/m4/noexecstack.m4
@@ -37,7 +37,7 @@ void foo() {}
EOF
if AC_TRY_COMMAND([${CC} $CFLAGS $CPPFLAGS
-S -o conftest.s conftest.c >/dev/null]) \
- && grep -q .note.GNU-stack conftest.s \
+ && grep .note.GNU-stack conftest.s >/dev/null \
&& AC_TRY_COMMAND([${CCAS} $CCASFLAGS $CPPFLAGS -Wa,--noexecstack
-c -o conftest.o conftest.s >/dev/null])
then