author | John Beck <John.Beck@Oracle.COM> |
Thu, 20 Feb 2014 11:35:57 -0800 | |
branch | s11-update |
changeset 2959 | 436698adc770 |
parent 2435 | 33cb297fa37c |
permissions | -rw-r--r-- |
2435
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
1 |
From 60b3f4eb672a85de28ecaad47ed426f8c8fe6c32 Mon Sep 17 00:00:00 2001 |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
2 |
From: Paul Eggert <[email protected]> |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
3 |
Date: Sun, 21 Oct 2012 06:15:26 +0000 |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
4 |
Subject: zgrep: do not assume standard 'grep' has -e |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
5 |
|
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
6 |
On Solaris 11, /usr/bin/grep -e does not work. |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
7 |
Problem reported by Petr Sumbera in |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
8 |
<http://lists.gnu.org/archive/html/bug-gzip/2012-10/msg00003.html>. |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
9 |
* Makefile.am (.in): Substitute @GREP@. |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
10 |
* configure.ac (AC_PROG_GREP): Invoke. |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
11 |
* zgrep.in (grep): Use @GREP@. |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
12 |
--- |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
13 |
diff --git a/Makefile.am b/Makefile.am |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
14 |
index 86a0297..90fff2d 100644 |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
15 |
--- a/Makefile.am |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
16 |
+++ b/Makefile.am |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
17 |
@@ -84,6 +84,7 @@ SUFFIXES = .in |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
18 |
$(AM_V_GEN)sed \ |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
19 |
-e 's|/bin/sh|$(SHELL)|g' \ |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
20 |
-e 's|[@]bindir@|'\''$(bindir)'\''|g' \ |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
21 |
+ -e 's|[@]GREP@|$(GREP)|g' \ |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
22 |
-e 's|[@]VERSION@|$(VERSION)|g' \ |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
23 |
$(srcdir)/[email protected] >$@-t \ |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
24 |
&& chmod a+x $@-t \ |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
25 |
diff --git a/configure.ac b/configure.ac |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
26 |
index 4705ce4..ecb362b 100644 |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
27 |
--- a/configure.ac |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
28 |
+++ b/configure.ac |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
29 |
@@ -33,6 +33,7 @@ AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
30 |
AC_PROG_CC_STDC |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
31 |
AM_PROG_CC_C_O |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
32 |
AC_PROG_CPP |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
33 |
+AC_PROG_GREP |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
34 |
AC_CHECK_TOOL([NM], [nm], [nm]) |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
35 |
AC_PROG_LN_S |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
36 |
AC_PROG_RANLIB |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
37 |
diff --git a/zgrep.in b/zgrep.in |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
38 |
index f878acf..aec4a67 100644 |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
39 |
--- a/zgrep.in |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
40 |
+++ b/zgrep.in |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
41 |
@@ -28,7 +28,7 @@ case $1 in |
755
e7d0aed114ef
7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
42 |
esac |
2435
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
43 |
PATH=$bindir:$PATH |
755
e7d0aed114ef
7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
44 |
|
e7d0aed114ef
7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
45 |
-grep='${GREP-grep}' |
2435
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
46 |
+grep='${GREP-'\''@GREP@'\''}' |
755
e7d0aed114ef
7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
47 |
|
e7d0aed114ef
7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
48 |
version='zgrep (gzip) @VERSION@ |
2402
21ebf6c9a4fa
7183526 Update gzip to version 1.5
Rich Burridge <rich.burridge@oracle.com>
parents:
755
diff
changeset
|
49 |
Copyright (C) 2010-2012 Free Software Foundation, Inc. |
2435
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
50 |
-- |
33cb297fa37c
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2402
diff
changeset
|
51 |
cgit v0.9.0.2 |