[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.21-26-g8ee53e2
|
From: |
Paul Eggert |
|
Subject: |
grep branch, master, updated. v2.21-26-g8ee53e2 |
|
Date: |
Mon, 06 Apr 2015 23:11:00 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".
The branch, master has been updated
via 8ee53e2a2804a7cecda91a5e249aa29e6c18f65a (commit)
via 6d569b5cd719bd367581fb62b32a228900d43a70 (commit)
via 936ae4a5e6c8fd27d86c2f9e0f46c61c8c15c4ff (commit)
from ff38f097a41ddf908e3036524319de5a3aa6188e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=8ee53e2a2804a7cecda91a5e249aa29e6c18f65a
commit 8ee53e2a2804a7cecda91a5e249aa29e6c18f65a
Author: Paul Eggert <address@hidden>
Date: Mon Apr 6 16:09:39 2015 -0700
build: improve pkg-config doc and error handling
Error-handling improvement suggested by Mike Frysinger in:
http://bugs.gnu.org/16757#29
* NEWS: Document pkg-config changes.
* README-prereq: pkg-config is now a prereq when building from
repository.
* m4/pcre.m4 (gl_FUNC_PCRE): Report an error if pcre is explicitly
requested but not available. Defer to user-supplied PCRE_CFLAGS
and PCRE_LIBS.
diff --git a/NEWS b/NEWS
index 071caab..ae8f38f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ GNU grep NEWS -*- outline
-*-
* Noteworthy changes in release ?.? (????-??-??) [?]
+** Improvements
+
+ When building grep, 'configure' now uses PCRE's pkg-config module for
+ configuration information, rather than attempting to guess it by hand.
+
** Bug fixes
grep no longer reads from uninitialized memory or from beyond the end
diff --git a/README-prereq b/README-prereq
index 056f42d..0422aa6 100644
--- a/README-prereq
+++ b/README-prereq
@@ -1,17 +1,18 @@
This gives some notes on obtaining the tools required for development.
I.E. the tools checked for by the bootstrap script and include:
-- Autoconf <http://www.gnu.org/software/autoconf/>
-- Automake <http://www.gnu.org/software/automake/>
-- Bison <http://www.gnu.org/software/bison/>
-- Gettext <http://www.gnu.org/software/gettext/>
-- Git <http://git.or.cz/>
-- Gperf <http://www.gnu.org/software/gperf/>
-- Gzip <http://www.gnu.org/software/gzip/>
-- Perl <http://www.cpan.org/>
-- Rsync <http://samba.anu.edu.au/rsync/>
-- Tar <http://www.gnu.org/software/tar/>
-- Texinfo <http://www.gnu.org/software/texinfo/>
+- Autoconf <http://www.gnu.org/software/autoconf/>
+- Automake <http://www.gnu.org/software/automake/>
+- Bison <http://www.gnu.org/software/bison/>
+- Gettext <http://www.gnu.org/software/gettext/>
+- Git <http://git.or.cz/>
+- Gperf <http://www.gnu.org/software/gperf/>
+- Gzip <http://www.gnu.org/software/gzip/>
+- Perl <http://www.cpan.org/>
+- Pkg-config <http://www.freedesktop.org/wiki/Software/pkg-config/>
+- Rsync <http://samba.anu.edu.au/rsync/>
+- Tar <http://www.gnu.org/software/tar/>
+- Texinfo <http://www.gnu.org/software/texinfo/>
Note please try to install/build official packages for your system.
If these programs are not available use the following instructions
diff --git a/m4/pcre.m4 b/m4/pcre.m4
index 37de4c5..0effc53 100644
--- a/m4/pcre.m4
+++ b/m4/pcre.m4
@@ -14,16 +14,14 @@ AC_DEFUN([gl_FUNC_PCRE],
yes|no) test_pcre=$enableval;;
*) AC_MSG_ERROR([invalid value $enableval for --disable-perl-regexp]);;
esac],
- [test_pcre=yes])
+ [test_pcre=maybe])
- PCRE_CFLAGS=
- PCRE_LIBS=
AC_SUBST([PCRE_CFLAGS])
AC_SUBST([PCRE_LIBS])
use_pcre=no
- if test $test_pcre = yes; then
- PKG_CHECK_MODULES([PCRE], [libpcre], [], [PCRE_LIBS=-lpcre])
+ if test $test_pcre != no; then
+ PKG_CHECK_MODULES([PCRE], [libpcre], [], [: ${PCRE_LIBS=-lpcre}])
AC_CACHE_CHECK([for pcre_compile], [pcre_cv_have_pcre_compile],
[pcre_saved_CFLAGS=$CFLAGS
@@ -42,8 +40,10 @@ AC_DEFUN([gl_FUNC_PCRE],
if test "$pcre_cv_have_pcre_compile" = yes; then
use_pcre=yes
- else
+ elif test $test_pcre = maybe; then
AC_MSG_WARN([AC_PACKAGE_NAME will be built without pcre support.])
+ else
+ AC_MSG_ERROR([pcre support not available])
fi
fi
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=6d569b5cd719bd367581fb62b32a228900d43a70
commit 8ee53e2a2804a7cecda91a5e249aa29e6c18f65a
Author: Paul Eggert <address@hidden>
Date: Mon Apr 6 16:09:39 2015 -0700
build: improve pkg-config doc and error handling
Error-handling improvement suggested by Mike Frysinger in:
http://bugs.gnu.org/16757#29
* NEWS: Document pkg-config changes.
* README-prereq: pkg-config is now a prereq when building from
repository.
* m4/pcre.m4 (gl_FUNC_PCRE): Report an error if pcre is explicitly
requested but not available. Defer to user-supplied PCRE_CFLAGS
and PCRE_LIBS.
diff --git a/NEWS b/NEWS
index 071caab..ae8f38f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ GNU grep NEWS -*- outline
-*-
* Noteworthy changes in release ?.? (????-??-??) [?]
+** Improvements
+
+ When building grep, 'configure' now uses PCRE's pkg-config module for
+ configuration information, rather than attempting to guess it by hand.
+
** Bug fixes
grep no longer reads from uninitialized memory or from beyond the end
diff --git a/README-prereq b/README-prereq
index 056f42d..0422aa6 100644
--- a/README-prereq
+++ b/README-prereq
@@ -1,17 +1,18 @@
This gives some notes on obtaining the tools required for development.
I.E. the tools checked for by the bootstrap script and include:
-- Autoconf <http://www.gnu.org/software/autoconf/>
-- Automake <http://www.gnu.org/software/automake/>
-- Bison <http://www.gnu.org/software/bison/>
-- Gettext <http://www.gnu.org/software/gettext/>
-- Git <http://git.or.cz/>
-- Gperf <http://www.gnu.org/software/gperf/>
-- Gzip <http://www.gnu.org/software/gzip/>
-- Perl <http://www.cpan.org/>
-- Rsync <http://samba.anu.edu.au/rsync/>
-- Tar <http://www.gnu.org/software/tar/>
-- Texinfo <http://www.gnu.org/software/texinfo/>
+- Autoconf <http://www.gnu.org/software/autoconf/>
+- Automake <http://www.gnu.org/software/automake/>
+- Bison <http://www.gnu.org/software/bison/>
+- Gettext <http://www.gnu.org/software/gettext/>
+- Git <http://git.or.cz/>
+- Gperf <http://www.gnu.org/software/gperf/>
+- Gzip <http://www.gnu.org/software/gzip/>
+- Perl <http://www.cpan.org/>
+- Pkg-config <http://www.freedesktop.org/wiki/Software/pkg-config/>
+- Rsync <http://samba.anu.edu.au/rsync/>
+- Tar <http://www.gnu.org/software/tar/>
+- Texinfo <http://www.gnu.org/software/texinfo/>
Note please try to install/build official packages for your system.
If these programs are not available use the following instructions
diff --git a/m4/pcre.m4 b/m4/pcre.m4
index 37de4c5..0effc53 100644
--- a/m4/pcre.m4
+++ b/m4/pcre.m4
@@ -14,16 +14,14 @@ AC_DEFUN([gl_FUNC_PCRE],
yes|no) test_pcre=$enableval;;
*) AC_MSG_ERROR([invalid value $enableval for --disable-perl-regexp]);;
esac],
- [test_pcre=yes])
+ [test_pcre=maybe])
- PCRE_CFLAGS=
- PCRE_LIBS=
AC_SUBST([PCRE_CFLAGS])
AC_SUBST([PCRE_LIBS])
use_pcre=no
- if test $test_pcre = yes; then
- PKG_CHECK_MODULES([PCRE], [libpcre], [], [PCRE_LIBS=-lpcre])
+ if test $test_pcre != no; then
+ PKG_CHECK_MODULES([PCRE], [libpcre], [], [: ${PCRE_LIBS=-lpcre}])
AC_CACHE_CHECK([for pcre_compile], [pcre_cv_have_pcre_compile],
[pcre_saved_CFLAGS=$CFLAGS
@@ -42,8 +40,10 @@ AC_DEFUN([gl_FUNC_PCRE],
if test "$pcre_cv_have_pcre_compile" = yes; then
use_pcre=yes
- else
+ elif test $test_pcre = maybe; then
AC_MSG_WARN([AC_PACKAGE_NAME will be built without pcre support.])
+ else
+ AC_MSG_ERROR([pcre support not available])
fi
fi
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=936ae4a5e6c8fd27d86c2f9e0f46c61c8c15c4ff
commit 8ee53e2a2804a7cecda91a5e249aa29e6c18f65a
Author: Paul Eggert <address@hidden>
Date: Mon Apr 6 16:09:39 2015 -0700
build: improve pkg-config doc and error handling
Error-handling improvement suggested by Mike Frysinger in:
http://bugs.gnu.org/16757#29
* NEWS: Document pkg-config changes.
* README-prereq: pkg-config is now a prereq when building from
repository.
* m4/pcre.m4 (gl_FUNC_PCRE): Report an error if pcre is explicitly
requested but not available. Defer to user-supplied PCRE_CFLAGS
and PCRE_LIBS.
diff --git a/NEWS b/NEWS
index 071caab..ae8f38f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ GNU grep NEWS -*- outline
-*-
* Noteworthy changes in release ?.? (????-??-??) [?]
+** Improvements
+
+ When building grep, 'configure' now uses PCRE's pkg-config module for
+ configuration information, rather than attempting to guess it by hand.
+
** Bug fixes
grep no longer reads from uninitialized memory or from beyond the end
diff --git a/README-prereq b/README-prereq
index 056f42d..0422aa6 100644
--- a/README-prereq
+++ b/README-prereq
@@ -1,17 +1,18 @@
This gives some notes on obtaining the tools required for development.
I.E. the tools checked for by the bootstrap script and include:
-- Autoconf <http://www.gnu.org/software/autoconf/>
-- Automake <http://www.gnu.org/software/automake/>
-- Bison <http://www.gnu.org/software/bison/>
-- Gettext <http://www.gnu.org/software/gettext/>
-- Git <http://git.or.cz/>
-- Gperf <http://www.gnu.org/software/gperf/>
-- Gzip <http://www.gnu.org/software/gzip/>
-- Perl <http://www.cpan.org/>
-- Rsync <http://samba.anu.edu.au/rsync/>
-- Tar <http://www.gnu.org/software/tar/>
-- Texinfo <http://www.gnu.org/software/texinfo/>
+- Autoconf <http://www.gnu.org/software/autoconf/>
+- Automake <http://www.gnu.org/software/automake/>
+- Bison <http://www.gnu.org/software/bison/>
+- Gettext <http://www.gnu.org/software/gettext/>
+- Git <http://git.or.cz/>
+- Gperf <http://www.gnu.org/software/gperf/>
+- Gzip <http://www.gnu.org/software/gzip/>
+- Perl <http://www.cpan.org/>
+- Pkg-config <http://www.freedesktop.org/wiki/Software/pkg-config/>
+- Rsync <http://samba.anu.edu.au/rsync/>
+- Tar <http://www.gnu.org/software/tar/>
+- Texinfo <http://www.gnu.org/software/texinfo/>
Note please try to install/build official packages for your system.
If these programs are not available use the following instructions
diff --git a/m4/pcre.m4 b/m4/pcre.m4
index 37de4c5..0effc53 100644
--- a/m4/pcre.m4
+++ b/m4/pcre.m4
@@ -14,16 +14,14 @@ AC_DEFUN([gl_FUNC_PCRE],
yes|no) test_pcre=$enableval;;
*) AC_MSG_ERROR([invalid value $enableval for --disable-perl-regexp]);;
esac],
- [test_pcre=yes])
+ [test_pcre=maybe])
- PCRE_CFLAGS=
- PCRE_LIBS=
AC_SUBST([PCRE_CFLAGS])
AC_SUBST([PCRE_LIBS])
use_pcre=no
- if test $test_pcre = yes; then
- PKG_CHECK_MODULES([PCRE], [libpcre], [], [PCRE_LIBS=-lpcre])
+ if test $test_pcre != no; then
+ PKG_CHECK_MODULES([PCRE], [libpcre], [], [: ${PCRE_LIBS=-lpcre}])
AC_CACHE_CHECK([for pcre_compile], [pcre_cv_have_pcre_compile],
[pcre_saved_CFLAGS=$CFLAGS
@@ -42,8 +40,10 @@ AC_DEFUN([gl_FUNC_PCRE],
if test "$pcre_cv_have_pcre_compile" = yes; then
use_pcre=yes
- else
+ elif test $test_pcre = maybe; then
AC_MSG_WARN([AC_PACKAGE_NAME will be built without pcre support.])
+ else
+ AC_MSG_ERROR([pcre support not available])
fi
fi
-----------------------------------------------------------------------
Summary of changes:
NEWS | 5 ++++
README-prereq | 23 +++++++++++----------
bootstrap.conf | 15 ++++++++++++++
configure.ac | 1 +
m4/pcre.m4 | 58 +++++++++++++++++++++++++++++++----------------------
src/Makefile.am | 4 +-
src/pcresearch.c | 6 +----
7 files changed, 70 insertions(+), 42 deletions(-)
hooks/post-receive
--
grep
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.21-26-g8ee53e2,
Paul Eggert <=