diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2017-07-22 16:23:37 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-07-22 16:24:49 +0200 |
| commit | c452cace52ca26cff42346eb2af2ec58ace89780 (patch) | |
| tree | 2a7dce99a53baff0ce4a4c401c6bfb61e9ed58f2 | |
| parent | 5c00f5d90696455f6810515a92ca4e947d77243a (diff) | |
| download | kcmldapcontroller-c452cace52ca26cff42346eb2af2ec58ace89780.tar.gz kcmldapcontroller-c452cace52ca26cff42346eb2af2ec58ace89780.zip | |
Fix FTBFS on Mageia 6
Signed-off-by: François Andriot <francois.andriot@free.fr>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f07bc86d04ab4e2ea471306c2f54c9c702076b0c)
| -rw-r--r-- | acl-updater/plugin/Makefile.am | 4 | ||||
| -rw-r--r-- | acl-updater/plugin/configure.in.in | 6 | ||||
| -rw-r--r-- | acl-updater/plugin/interface.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/acl-updater/plugin/Makefile.am b/acl-updater/plugin/Makefile.am index ea1c02a..febfacb 100644 --- a/acl-updater/plugin/Makefile.am +++ b/acl-updater/plugin/Makefile.am @@ -3,5 +3,5 @@ INCLUDES = $(all_includes) $(KDE_INCLUDES)/tde -I$(top_srcdir) lib_LTLIBRARIES = slapi-acl-manager.la slapi_acl_manager_la_SOURCES = interface.c plugin.cpp plugin.h -slapi_acl_manager_la_LIBADD = -ltqt-mt -ltdeldap -slapi_acl_manager_la_LDFLAGS = -module -avoid-version $(all_libraries)
\ No newline at end of file +slapi_acl_manager_la_LIBADD = -ltqt-mt -ltdeldap $(SLAPI_LIBRARIES) +slapi_acl_manager_la_LDFLAGS = -module -avoid-version $(all_libraries) diff --git a/acl-updater/plugin/configure.in.in b/acl-updater/plugin/configure.in.in new file mode 100644 index 0000000..9feb979 --- /dev/null +++ b/acl-updater/plugin/configure.in.in @@ -0,0 +1,6 @@ + +# Check for slapi-plugin.h +AC_CHECK_HEADERS(slapi-plugin.h) + +# Check for the slapi library +AC_CHECK_LIB(slapi, slapi_pblock_get, AC_SUBST(SLAPI_LIBRARIES, "-lslapi"), [], [-shared -fPIC]) diff --git a/acl-updater/plugin/interface.c b/acl-updater/plugin/interface.c index da85863..a5e2e28 100644 --- a/acl-updater/plugin/interface.c +++ b/acl-updater/plugin/interface.c @@ -18,6 +18,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include "config.h" + #ifdef HAVE_SLAPI_PLUGIN_H #include <slapi-plugin.h> #else |