The define WITH_HIREDIS_PATH causes the source files to include "<hiredis/hiredis.h>". But the Makefiles check HIREDISDEFS for the string "hiredis" and set WITH_HIREDIS_PATH if not found. Which is exactly the opposite of what is needed. This commit corrects the logic.
Signed-off-by: Sebastian Kemper sebastian_ml@gmx.net
<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1816
-- Commit Summary --
* modules: fix hiredis handling
-- File Changes --
M src/modules/db_redis/Makefile (2) M src/modules/ndb_redis/Makefile (2) M src/modules/topos_redis/Makefile (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1816.patch https://github.com/kamailio/kamailio/pull/1816.diff
Did you have issues compiling?
Iirc, we tested to get this solution and at least the deb packages built fine for the past months since this change, after having couple of builds failed back then.
What it tries to do is that if pkg-config for cflags is not giving a path that has `hiredis` in it, then include `<hiredis/hiredis.h>`. If what pkg-config returns has `hiredis`, then just include `<hiredis.h>`.
I got on different systems and versions, either (1):
``` -I/opt/local/include/hiredis ```
or (2):
``` -I/opt/local/include ```
So for (1), include `<hiredis.h>` and for (2), include `<hiredis/hiredis.h>`.
Am I wrong in what is doing it right now?
Maybe there is something else to fix, but I find the current behaviour as expected.
Hello Daniel,
Sorry, my mistake. The current handling is correct.
I'll close this pull request.
With kind regards, Seb
Closed #1816.
-
Daniel-Constantin Mierla -
micmac1