r14587: Allow building without GNU make and/or without xsltproc

(This used to be commit 33709dc5b3652f4d4c7281bec4ba7160a6d87598)

diff --git a/source4/lib/talloc/Makefile.in b/source4/lib/talloc/Makefile.in
index f11124e707b199fff21d8638ee8c8421c12f5f3b..083ab449bf2e7baadf220a7ce7334a7ba416c4e4 100644 (file)
--- a/source4/lib/talloc/Makefile.in
+++ b/source4/lib/talloc/Makefile.in
@@ -7,17 +7,20 @@ XSLTPROC = @XSLTPROC@
 INSTALLCMD = @INSTALL@
 CC = @CC@
 CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H=
+EXTRA_TARGETS = @DOC_TARGET@
+
+.SUFFIXES: .c .o .3 .3.xml .xml .html
 
 LIBOBJ = talloc.o
 
-all: libtalloc.a testsuite 
+all: libtalloc.a testsuite $(EXTRA_TARGETS)
 
 testsuite: $(LIBOBJ) testsuite.o
        $(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS)
 
 libtalloc.a: libtalloc.a($(LIBOBJ))
 
-install: all doc
+install: all 
        ${INSTALLCMD} -d ${libdir}
        ${INSTALLCMD} -m 755 libtalloc.a $(libdir)
        ${INSTALLCMD} -d ${includedir}
@@ -28,10 +31,10 @@ install: all doc
 
 doc: talloc.3
 
-%.3: %.3.xml
+.3.xml.3:
        test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-%.html: %.xml
+.xml.html:
        test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
 
 clean:

diff --git a/source4/lib/talloc/configure.in b/source4/lib/talloc/configure.in
index 24a2e4ead6b9ee916d153aca808517c8de67fa69..76d7c74366eec04e155b40702df58841963da340 100644 (file)
--- a/source4/lib/talloc/configure.in
+++ b/source4/lib/talloc/configure.in
@@ -6,6 +6,11 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_PROG_INSTALL
 AC_PATH_PROG(XSLTPROC,xsltproc)
+DOC_TARGET=""
+if test -n "$XSLTPROC"; then
+       DOC_TARGET=doc
+fi
+AC_SUBST(DOC_TARGET)
 AC_CONFIG_HEADER(config.h)
 sinclude(config.m4)
 AC_OUTPUT(Makefile talloc.pc)