diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2018-03-21 11:00:00 +0100 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2018-03-21 11:00:00 +0100 |
| commit | 02ae31b0b7ebb85bd4e7d01ff1608a33a664d3ae (patch) | |
| tree | 326a4aea6efba830da7230ab6c357852b887a92c /lib | |
| parent | 384bd17e6cfcde9e6e1dee6f8d8cccc4c7d07516 (diff) | |
[cpluff] link with cpluff instead of loading it dynamic
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cpluff/libcpluff/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/cpluff/libcpluff/Makefile.am b/lib/cpluff/libcpluff/Makefile.am index a483bfae07..0f121e012a 100644 --- a/lib/cpluff/libcpluff/Makefile.am +++ b/lib/cpluff/libcpluff/Makefile.am @@ -10,6 +10,8 @@ LIBS = @LIBS_LIBCPLUFF@ @LTLIBINTL@ @LIBS@ CPPFLAGS = @CPPFLAGS@ CPPFLAGS += -I. -DCP_C_API=CP_EXPORT -DCP_HOST="\"$(host)\"" -DCP_DATADIR="\"$(datadir)\"" +# the following symbols are clashing with mariadb symbols +CPPFLAGS += -Dhash_delete=kazlib_hash_delete -Dhash_free=kazlib_hash_free -Dhash_insert=kazlib_hash_insert -Dlist_delete=kazlib_list_delete DOXYGEN = doxygen DOXYGEN_SOURCE = cpluffdef.h $(srcdir)/cpluff.h $(srcdir)/docsrc/*.dox |