qlibc-0003-fix-openssl-mysql-checks.patch 1.9 KB

123456789101112131415161718192021222324252627282930313233343536
  1. Allow to explicitly disable openssl and mysql
  2. AC_ARG_WITH() is being incorrectly used: the third argument indicates
  3. the action that needs to be taken when a value was passed, when not
  4. the option is enabled. Therefore, the result of the existing code was
  5. that when you passed --without-mysql or --without-openssl, the
  6. $withval variable would get the value 'yes', which is obviously wrong.
  7. Instead, we simply empty this third argument, because $withval is
  8. already properly filled with 'yes' or 'no' by the AC_ARG_WITH()
  9. function.
  10. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  11. Index: b/configure.ac
  12. ===================================================================
  13. --- a/configure.ac
  14. +++ b/configure.ac
  15. @@ -170,7 +170,7 @@
  16. ## --with section
  17. ##
  18. -AC_ARG_WITH([openssl],[AS_HELP_STRING([--with-openssl], [This will enable HTTPS support in qhttpclient extension API. When it's enabled, user applications will need to link openssl library with -lssl option.])],[withval=yes],[withval=no])
  19. +AC_ARG_WITH([openssl],[AS_HELP_STRING([--with-openssl], [This will enable HTTPS support in qhttpclient extension API. When it's enabled, user applications will need to link openssl library with -lssl option.])],[],[withval=no])
  20. if test "$withval" = yes; then
  21. if test "$with_openssl" = yes; then
  22. with_openssl="/usr/include"
  23. @@ -185,7 +185,7 @@
  24. fi
  25. fi
  26. -AC_ARG_WITH([mysql],[AS_HELP_STRING([--with-mysql], [This will enable MySQL database support in qdatabase extension API. When it's enabled, user applications need to link mysql client library. (ex: -lmysqlclient)])],[withval=yes],[withval=no])
  27. +AC_ARG_WITH([mysql],[AS_HELP_STRING([--with-mysql], [This will enable MySQL database support in qdatabase extension API. When it's enabled, user applications need to link mysql client library. (ex: -lmysqlclient)])],[],[withval=no])
  28. if test "$withval" = yes; then
  29. if test "$with_mysql" = yes; then
  30. with_mysql="/usr/include/mysql"