r23320 - gnucash/trunk - Check for availability of xsltproc at configure time

[Geert Janssens]

Author: gjanssens
Date: 2013-10-24 08:27:26 -0400 (Thu, 24 Oct 2013)
New Revision: 23320
Trac: http://svn.gnucash.org/trac/changeset/23320

Modified:
   gnucash/trunk/Makefile.am
   gnucash/trunk/configure.ac
   gnucash/trunk/src/gnome-utils/Makefile.am
Log:
Check for availability of xsltproc at configure time

Modified: gnucash/trunk/Makefile.am
===================================================================
--- gnucash/trunk/Makefile.am	2013-10-24 12:27:15 UTC (rev 23319)
+++ gnucash/trunk/Makefile.am	2013-10-24 12:27:26 UTC (rev 23320)
@@ -187,7 +187,6 @@
 
 GIT_CMD = @GIT_CMD@
 SVN = svn
-XSLTPROC = xsltproc
 SCM_TYPE = @SCM_TYPE@
 
 if BUILDING_FROM_SCM

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2013-10-24 12:27:15 UTC (rev 23319)
+++ gnucash/trunk/configure.ac	2013-10-24 12:27:26 UTC (rev 23320)
@@ -492,6 +492,14 @@
 AC_SUBST(LIBXSLT_CFLAGS)
 AC_SUBST(LIBXSLT_LIBS)
 
+# xsltproc is not included in libxslt on all distributions
+# so check for it separately
+AC_PATH_PROG(XSLTPROC, xsltproc, [""])
+
+if test -z "$XSLTPROC"; then
+  AC_MSG_ERROR([xsltproc is required to build GnuCash])
+fi
+
 ### --------------------------------------------------------------------------
 ### Zlib
 

Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am	2013-10-24 12:27:15 UTC (rev 23319)
+++ gnucash/trunk/src/gnome-utils/Makefile.am	2013-10-24 12:27:26 UTC (rev 23320)
@@ -212,10 +212,10 @@
 BUILT_SOURCES = gnc-warnings.c gnc-warnings.h
 
 gnc-warnings.c: gschemas/org.gnucash.warnings.gschema.xml.in make-gnc-warnings-c.xsl
-	xsltproc -o $@ $(srcdir)/make-gnc-warnings-c.xsl $<
+	$(XSLTPROC) -o $@ $(srcdir)/make-gnc-warnings-c.xsl $<
 
 gnc-warnings.h: gschemas/org.gnucash.warnings.gschema.xml.in make-gnc-warnings-h.xsl
-	xsltproc -o $@ $(srcdir)/make-gnc-warnings-h.xsl $<
+	$(XSLTPROC) -o $@ $(srcdir)/make-gnc-warnings-h.xsl $<
 
 if HAVE_X11_XLIB_H
   libgncmod_gnome_utils_la_LIBADD += -lX11