summaryrefslogtreecommitdiff
blob: 76aade5c9341920f1a8443c80581a9b32c0103e0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
http://bugs.gentoo.org/309079
http://lists.gnu.org/archive/html/bug-gzip/2010-02/msg00032.html

From 61af16213a488af3a8e994399ebd0859d390edb6 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sat, 20 Mar 2010 13:05:58 +0100
Subject: [PATCH] use assembly code matcher when possible

* configure.ac (ASCPPPOST): Backslash-escape "#" in AC_SUBST'd
variable, to keep make from seeing it as a comment-introducer.
Based on a patch by Petr Pisar.
* lib/Makefile.am (match.$(OBJEXT)): Use AM_V_GEN and AM_V_at.
* lib/match.c: Don't include <config.h>.
It would impede configure-time assembler test.
* .x-sc_require_config_h: Exempt lib/match.c from syntax-check.
* .x-sc_require_config_h_first: Likewise.
---
 .x-sc_require_config_h       |    1 +
 .x-sc_require_config_h_first |    1 +
 THANKS                       |    1 +
 configure.ac                 |    2 +-
 lib/Makefile.am              |   12 ++++++------
 lib/match.c                  |    2 --
 6 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 .x-sc_require_config_h
 create mode 100644 .x-sc_require_config_h_first

--- a/configure
+++ b/configure
@@ -22588,5 +22588,5 @@
 
 # cc -E produces incorrect asm files on SVR4, so postprocess it.
-ASCPPPOST="sed '/^ *#/d; s,//.*,,; s/% /%/g; s/\\. /./g'"
+ASCPPPOST="sed '/^ *\\#/d; s,//.*,,; s/% /%/g; s/\\. /./g'"
 
 
diff --git a/lib/match.c b/lib/match.c
index 4ef6128..5dd8d64 100644
--- a/lib/match.c
+++ b/lib/match.c
@@ -28,8 +28,6 @@
  * David Mosberger-Tang <davidm@hpl.hp.com>.
  */
 
-#include <config.h>
-
 /* Preprocess with -DNO_UNDERLINE if your C compiler does not prefix
  * external symbols with an underline character '_'.
  */
-- 
1.7.1.1