summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-07-22 14:23:37 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2017-07-22 14:23:37 (GMT)
commitf07bc86d04ab4e2ea471306c2f54c9c702076b0c (patch)
tree057ce8256e214c51cd8618f66cff451b343e61bb
parent5a660f4af9dee65a8e4b6d2a8b6fbafac1c17482 (diff)
downloadkcmldapcontroller-f07bc86d.zip
kcmldapcontroller-f07bc86d.tar.gz
Signed-off-by: François Andriot <francois.andriot@free.fr> Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--acl-updater/plugin/Makefile.am4
-rw-r--r--acl-updater/plugin/configure.in.in6
-rw-r--r--acl-updater/plugin/interface.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/acl-updater/plugin/Makefile.am b/acl-updater/plugin/Makefile.am
index e0a1924..d1d2ed8 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) $(KRB5_CFLAGS)
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) $(KRB5_LIBS) \ 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) $(KRB5_LIBS)
diff --git a/acl-updater/plugin/configure.in.in b/acl-updater/plugin/configure.in.in
new file mode 100644
index 0000000..9feb979
--- a/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