0001-build-Use-MYSQL_CONFIG-variable-instead-of-mysql_con.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. From bc966656d8598a6d87c901a67ecdb91c436f4939 Mon Sep 17 00:00:00 2001
  2. From: Herve Codina <herve.codina@bootlin.com>
  3. Date: Wed, 29 Sep 2021 15:08:33 +0200
  4. Subject: [PATCH] build: Use MYSQL_CONFIG variable instead of
  5. 'mysql_config'
  6. The MYSQL_CONFIG variable is used to check 'mysql_config' prog.
  7. This variable can be override by the user but was not used for
  8. retrieving MYSQL_INCLUDE, MYSQL_LIBS, ...
  9. This commit replaces the hardcoded usage of 'mysql_config' by
  10. the use of MYSQL_CONFIG variable.
  11. This lead to 'MYSQL_CONFIG=/some/where/mysql_config ./configure'
  12. command to work properly.
  13. Signed-off-by: Herve Codina <herve.codina@bootlin.com>
  14. ---
  15. acinclude.m4 | 6 +++---
  16. 1 file changed, 3 insertions(+), 3 deletions(-)
  17. diff --git a/acinclude.m4 b/acinclude.m4
  18. index e99318f..9dd2b0f 100644
  19. --- a/acinclude.m4
  20. +++ b/acinclude.m4
  21. @@ -116,15 +116,15 @@ if test "$ac_mysql" = "yes"; then
  22. fi
  23. if test "$ac_mysql_incdir" = "no"; then
  24. - MYSQL_INCLUDE=`mysql_config --include`
  25. + MYSQL_INCLUDE=`$MYSQL_CONFIG --include`
  26. else
  27. MYSQL_INCLUDE=-I$ac_mysql_incdir
  28. fi
  29. if test "$ac_mysql_libdir" = "no"; then
  30. if test "$ac_mysql_threadsafe" = "YES"; then
  31. - MYSQL_LIBS=`mysql_config --libs_r`
  32. + MYSQL_LIBS=`$MYSQL_CONFIG --libs_r`
  33. else
  34. - MYSQL_LIBS=`mysql_config --libs`
  35. + MYSQL_LIBS=`$MYSQL_CONFIG --libs`
  36. fi
  37. else
  38. if test "$ac_mysql_threadsafe" = "YES"; then
  39. --
  40. 2.31.1