zsh: don't use host pcre-config

package/zsh/0001-configure-use-user-set-pcre-config.patch line 27

Quoted 10 lines · Baruch Siach

package/zsh/0001-configure-use-user-set-pcre-config.patch new file +10 -0

+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"

I think it is more correct to use the PRECONF variable rather than ac_cv_prog_PCRECONF. Indeed, you have:

AC_CHECK_PROG([PCRECONF], pcre-config, pcre-config)

The documentation of AC_CHECK_PROG (at [1]) says:

? Macro: AC_CHECK_PROG (variable, prog-to-check-for, value-if-found, [value-if-not-found], [path = ?$PATH?], [reject])

Check whether program prog-to-check-for exists in path. If it is found, set <variable> to value-if-found, otherwise to value-if-not-found, if given. Always pass over reject (an absolute file name) even if it is the first found in the search path; in that case, set <variable> using the absolute file name of the prog-to-check-for found that is not reject. If <variable> was already set, do nothing. Calls AC_SUBST for variable. The result of this test can be overridden by setting the variable <variable> or the cache variable ac_cv_prog_<variable>.

So to me, this means that the expected "output" of this macro is to set <variable>, which in your case is PRECONF.

Quoted 2 lines

So to me, this means that the expected "output" of this macro is to set <variable>, which in your case is PRECONF.

Thanks for the information.

This patch is now upstream, so I'll send another one upstream changing $ac_cv_prog_PCRECONF to $PCRECONF. If upstream accepts that I'll send v2 with a combined patch.

Quoted 4 lines · Baruch Siach

Quoted 2 lines

So to me, this means that the expected "output" of this macro is to set <variable>, which in your case is PRECONF.

Thanks for the information.

Note that the above was my own interpretation of the autoconf rules, and what I generally see in most configure.ac. People knowing autoconf better might disagree.

Quoted 3 lines

This patch is now upstream, so I'll send another one upstream changing $ac_cv_prog_PCRECONF to $PCRECONF. If upstream accepts that I'll send v2 with a combined patch.

Notice that there is another place in the configure.ac where ac_cv_prog_PRECONF is already used.

Quoted 2 lines

Notice that there is another place in the configure.ac where ac_cv_prog_PRECONF is already used.

Right. Provided that other ac_cv_ variables are used throughout zsh configure.ac do you think is is worth the trouble to clean up ac_cv_prog_PCRECONF use?

Commit 5e05faec7b4 (zsh: use the correct target pcre-config) set ac_cv_prog_PCRECONF to the location of staging pcre-config. Unfortunately zsh configure script does not actually use this variable when running pcre-config. Complete the fix with a patch that makes use of ac_cv_prog_PCRECONF.

Signed-off-by Baruch Siach <[email protected]>

---
 .../0001-configure-use-user-set-pcre-config.patch  | 33 ++++++++++++++++++++++
 package/zsh/zsh.mk                                 |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 package/zsh/0001-configure-use-user-set-pcre-config.patch