Autotool ipa-server - patch from William Jon McCann <mccann@jhu.edu>.

10 files changed, 144 insertions, 94 deletions

diff --git a/ipa-server/ipa-slapi-plugins/Makefile b/ipa-server/ipa-slapi-plugins/Makefile
deleted file mode 100644
index 23bcd94bd..000000000
--- a/ipa-server/ipa-slapi-plugins/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS=ipa-pwd-extop ipa-memberof dna
-
-all:
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-
-install:
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-
-clean:
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-	rm -f *~
diff --git a/ipa-server/ipa-slapi-plugins/Makefile.am b/ipa-server/ipa-slapi-plugins/Makefile.am
new file mode 100644
index 000000000..134f29d2f
--- /dev/null
+++ b/ipa-server/ipa-slapi-plugins/Makefile.am
@@ -0,0 +1,15 @@
+NULL =
+
+SUBDIRS =			\
+	ipa-pwd-extop		\
+	ipa-memberof		\
+	dna			\
+	$(NULL)
+
+EXTRA_DIST =			\
+	README			\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-slapi-plugins/dna/Makefile b/ipa-server/ipa-slapi-plugins/dna/Makefile
deleted file mode 100644
index 1e37d7793..000000000
--- a/ipa-server/ipa-slapi-plugins/dna/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-include ../../Makefile.common
-
-SONAME = libipa-dna-plugin.so
-LDFLAGS += -llber
-CFLAGS += -I/usr/include/$(DIRSRV) -I/usr/include/nss3 -I/usr/include/mozldap -I/usr/include/nspr4 -fPIC -DPIC
-
-OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
-
-all: $(OBJS)
-	$(CC) $(LDFLAGS) $(OBJS) -Wl,-soname -Wl,$(SONAME) -shared -o $(SONAME)
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-install:
-	mkdir -p $(PLUGINDIR); \
-	install -m 644 $(SONAME) $(PLUGINDIR); \
-	install -m 644 *.ldif $(SHAREDIR)
-
-clean:
-	rm -f *.o
-	rm -f $(SONAME)
-	rm -f *~
-
-
diff --git a/ipa-server/ipa-slapi-plugins/dna/Makefile.am b/ipa-server/ipa-slapi-plugins/dna/Makefile.am
new file mode 100644
index 000000000..d8d6d1d7b
--- /dev/null
+++ b/ipa-server/ipa-slapi-plugins/dna/Makefile.am
@@ -0,0 +1,41 @@
+NULL =
+
+INCLUDES =							\
+	-I.							\
+	-I$(srcdir)						\
+	-DPREFIX=\""$(prefix)"\" 				\
+	-DBINDIR=\""$(bindir)"\"				\
+	-DLIBDIR=\""$(libdir)"\" 				\
+	-DLIBEXECDIR=\""$(libexecdir)"\"			\
+	-DDATADIR=\""$(datadir)"\"				\
+	$(MOZLDAP_CFLAGS)					\
+	$(LDAP_CFLAGS)						\
+	$(KRB5_CFLAGS)						\
+	$(WARN_CFLAGS)						\
+	$(NULL)
+
+plugindir = $(libdir)/dirsrv/plugins
+plugin_LTLIBRARIES = 			\
+	libipa-dna-plugin.la		\
+	$(NULL)
+
+libipa_dna_plugin_la_SOURCES = 		\
+	dna.c				\
+	$(NULL)
+
+libipa_dna_plugin_la_LIBADD = 		\
+	$(MOZLDAP_LIBS)			\
+	$(NULL)
+
+appdir = $(IPA_DATA_DIR)
+app_DATA =			\
+	dna-conf.ldif		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(app_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-slapi-plugins/dna/dna.c b/ipa-server/ipa-slapi-plugins/dna/dna.c
index 399f89f00..7c8dad1aa 100644
--- a/ipa-server/ipa-slapi-plugins/dna/dna.c
+++ b/ipa-server/ipa-slapi-plugins/dna/dna.c
@@ -45,7 +45,9 @@
 /**
  * Distributed Numeric Assignment plug-in 
  */
-#include "slapi-plugin.h"
+
+#include <dirsrv/slapi-plugin.h>
+
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile b/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile
deleted file mode 100644
index e13446c4b..000000000
--- a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-include ../../Makefile.common
-
-SONAME = libipa-memberof-plugin.so
-LDFLAGS += -llber
-CFLAGS += -I/usr/include/$(DIRSRV) -I/usr/include/nss3 -I/usr/include/mozldap -I/usr/include/nspr4 -fPIC -DPIC
-
-OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
-
-all: $(OBJS)
-	$(CC) $(LDFLAGS) $(OBJS) -Wl,-soname -Wl,$(SONAME) -shared -o $(SONAME)
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-install:
-	mkdir -p $(PLUGINDIR); \
-	install -m 644 $(SONAME) $(PLUGINDIR); \
-	install -m 644 *.ldif $(SHAREDIR)
-
-clean:
-	rm -f *.o
-	rm -f $(SONAME)
-	rm -f *~
-
-
diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am b/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am
new file mode 100644
index 000000000..bc236c32c
--- /dev/null
+++ b/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am
@@ -0,0 +1,41 @@
+NULL =
+
+INCLUDES =							\
+	-I.							\
+	-I$(srcdir)						\
+	-DPREFIX=\""$(prefix)"\" 				\
+	-DBINDIR=\""$(bindir)"\"				\
+	-DLIBDIR=\""$(libdir)"\" 				\
+	-DLIBEXECDIR=\""$(libexecdir)"\"			\
+	-DDATADIR=\""$(datadir)"\"				\
+	$(MOZLDAP_CFLAGS)					\
+	$(LDAP_CFLAGS)						\
+	$(KRB5_CFLAGS)						\
+	$(WARN_CFLAGS)						\
+	$(NULL)
+
+plugindir = $(libdir)/dirsrv/plugins
+plugin_LTLIBRARIES = 			\
+	libipa-memberof-plugin.la	\
+	$(NULL)
+
+libipa_memberof_plugin_la_SOURCES = 	\
+	ipa-memberof.c			\
+	$(NULL)
+
+libipa_memberof_plugin_la_LIBADD = 	\
+	$(MOZLDAP_LIBS)			\
+	$(NULL)
+
+appdir = $(IPA_DATA_DIR)
+app_DATA =			\
+	memberof-conf.ldif	\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(app_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof.c b/ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof.c
index c247d2590..b23a04ae6 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof.c
+++ b/ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof.c
@@ -65,7 +65,8 @@
 #  include <config.h>
 #endif
 
-#include "slapi-plugin.h"
+#include <dirsrv/slapi-plugin.h>
+
 #include "string.h"
 #include "nspr.h"
 
diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile
deleted file mode 100644
index 034b8e60b..000000000
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-include ../../Makefile.common
-
-SONAME = libipa_pwd_extop.so
-LDFLAGS += -lkrb5 -llber -lldap -llber -lssl
-CFLAGS += -I/usr/include/$(DIRSRV) -I/usr/include/nss3 -I/usr/include/mozldap -I/usr/include/nspr4 -fPIC -DPIC
-
-OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
-
-all: $(OBJS)
-	$(CC) $(LDFLAGS) $(OBJS) -Wl,-soname -Wl,$(SONAME) -shared -o $(SONAME)
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-install:
-	mkdir -p $(PLUGINDIR); \
-	install -m 644 $(SONAME) $(PLUGINDIR); \
-	install -m 644 *.ldif $(SHAREDIR)
-
-clean:
-	rm -f *.o
-	rm -f $(SONAME)
-	rm -f *~
-
-
diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am
new file mode 100644
index 000000000..684243839
--- /dev/null
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am
@@ -0,0 +1,42 @@
+NULL =
+
+INCLUDES =							\
+	-I.							\
+	-I$(srcdir)						\
+	-DPREFIX=\""$(prefix)"\" 				\
+	-DBINDIR=\""$(bindir)"\"				\
+	-DLIBDIR=\""$(libdir)"\" 				\
+	-DLIBEXECDIR=\""$(libexecdir)"\"			\
+	-DDATADIR=\""$(datadir)"\"				\
+	$(MOZLDAP_CFLAGS)					\
+	$(LDAP_CFLAGS)						\
+	$(KRB5_CFLAGS)						\
+	$(WARN_CFLAGS)						\
+	$(NULL)
+
+plugindir = $(libdir)/dirsrv/plugins
+plugin_LTLIBRARIES = 			\
+	libipa_pwd_extop.la		\
+	$(NULL)
+
+libipa_pwd_extop_la_SOURCES = 		\
+	ipa_pwd_extop.c			\
+	$(NULL)
+
+libipa_pwd_extop_la_LIBADD = 		\
+	$(MOZLDAP_LIBS)			\
+	$(NULL)
+
+appdir = $(IPA_DATA_DIR)
+app_DATA =			\
+	pwd-extop-conf.ldif	\
+	$(NULL)
+
+EXTRA_DIST =			\
+	README			\
+	$(app_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in