zsh-workers
 help / color / mirror / code / Atom feed
* [PATCH] configure: use user set pcre-config
@ 2016-03-03 21:37 Baruch Siach
  2016-03-04 12:05 ` Peter Stephenson
  0 siblings, 1 reply; 2+ messages in thread
From: Baruch Siach @ 2016-03-03 21:37 UTC (permalink / raw)
  To: zsh-workers; +Cc: Baruch Siach

Setting a non default configuration script location is common practice when
cross compiling, since the target library might need different flags. zsh
configure scripts allows the user to set pcre-config location but doesn't
actually use it. Fix this.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c3bd713c126a..9947b16066b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -925,7 +925,7 @@ fi
 if test x$enable_pcre = xyes; then
 dnl pcre-config should probably be employed here
 dnl AC_SEARCH_LIBS(pcre_compile, pcre)
-  LIBS="`pcre-config --libs` $LIBS"
+  LIBS="`$ac_cv_prog_PCRECONF --libs` $LIBS"
 fi
 
 dnl ---------------------
-- 
2.7.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] configure: use user set pcre-config
  2016-03-03 21:37 [PATCH] configure: use user set pcre-config Baruch Siach
@ 2016-03-04 12:05 ` Peter Stephenson
  0 siblings, 0 replies; 2+ messages in thread
From: Peter Stephenson @ 2016-03-04 12:05 UTC (permalink / raw)
  To: Baruch Siach, zsh-workers

On Thu, 3 Mar 2016 23:37:27 +0200
Baruch Siach <baruch@tkos.co.il> wrote:
> Setting a non default configuration script location is common practice when
> cross compiling, since the target library might need different flags. zsh
> configure scripts allows the user to set pcre-config location but doesn't
> actually use it. Fix this.

Thanks, that looks fine and I've committed it.

I wonder if we should be doing something similar further up?  I was
evidently a bit tentative when I committed the code here since it
insists only on tweaking the flags if the pcre-config set up was
standard.  But I don't know this is actually a problem.


if test x$enable_pcre = xyes; then
AC_CHECK_PROG([PCRECONF], pcre-config, pcre-config)
dnl Typically (meaning on this single RedHat 9 box in front of me)
dnl pcre-config --cflags produces a -I output which needs to go into
dnl CPPFLAGS else configure's preprocessor tests don't pick it up,
dnl producing a warning.
if test "x$ac_cv_prog_PCRECONF" = xpcre-config; then
  CPPFLAGS="$CPPFLAGS `pcre-config --cflags`"
fi
fi


pws


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-03-04 12:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-03 21:37 [PATCH] configure: use user set pcre-config Baruch Siach
2016-03-04 12:05 ` Peter Stephenson

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).