run autoreconf

diff --git a/configure b/configure
index 92cab81c610778af9bb15815e706045754ec9d48..24292d5cfaefd6d0f466150df26b0edf390d1a99 100755 (executable)
--- a/configure
+++ b/configure
@@ -658,6 +658,8 @@ BUILD_SERVER_FALSE
 BUILD_SERVER_TRUE
 nspr_CFLAGS
 nss_CFLAGS
+BUILD_PDFREFDOCS_FALSE
+BUILD_PDFREFDOCS_TRUE
 BUILD_REFDOCS_FALSE
 BUILD_REFDOCS_TRUE
 have_xmlto
@@ -6620,7 +6622,26 @@ $as_echo "no" >&6; }
 fi
 
 
-if test "x${have_xmlto}" == "xyes"; then
+if test "$enable_refdocs" == "yes"; then
+   if test "x${have_xmlto}" != "xyes"; then
+      { { $as_echo "$as_me:$LINENO: error: cannot find xmlto for building reference documentation" >&5
+$as_echo "$as_me: error: cannot find xmlto for building reference documentation" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+fi
+if test "x${have_xmlto}" == "xyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
+   building_refdocs="yes"
+fi
+ if test "$building_refdocs" == "yes"; then
+  BUILD_REFDOCS_TRUE=
+  BUILD_REFDOCS_FALSE='#'
+else
+  BUILD_REFDOCS_TRUE='#'
+  BUILD_REFDOCS_FALSE=
+fi
+
+
+if test "x${building_refdocs}" == "xyes"; then
 { $as_echo "$as_me:$LINENO: checking for xmlto pdf support" >&5
 $as_echo_n "checking for xmlto pdf support... " >&6; }
 cat > conftest.$ac_ext << EOF
@@ -6641,24 +6662,16 @@ $as_echo "yes" >&6; }
    else
       { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
+      { $as_echo "$as_me:$LINENO: WARNING: Not building reference documentation in PDF format" >&5
+$as_echo "$as_me: WARNING: Not building reference documentation in PDF format" >&2;}
    fi
 fi
-if test "$enable_refdocs" == "yes"; then
-   if test "x${have_xmlto}${have_xmlto_pdf}" != "xyesyes"; then
-      { { $as_echo "$as_me:$LINENO: error: cannot find proper xmlto for building reference documentation" >&5
-$as_echo "$as_me: error: cannot find proper xmlto for building reference documentation" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-fi
-if test "x${have_xmlto}${have_xmlto_pdf}" == "xyesyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
-   building_refdocs="yes"
-fi
- if test "$building_refdocs" == "yes"; then
-  BUILD_REFDOCS_TRUE=
-  BUILD_REFDOCS_FALSE='#'
+ if test "have_xmlto_pdf" == "yes"; then
+  BUILD_PDFREFDOCS_TRUE=
+  BUILD_PDFREFDOCS_FALSE='#'
 else
-  BUILD_REFDOCS_TRUE='#'
-  BUILD_REFDOCS_FALSE=
+  BUILD_PDFREFDOCS_TRUE='#'
+  BUILD_PDFREFDOCS_FALSE=
 fi
 
 
@@ -8437,6 +8450,13 @@ $as_echo "$as_me: error: conditional \"BUILD_REFDOCS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${BUILD_PDFREFDOCS_TRUE}" && test -z "${BUILD_PDFREFDOCS_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PDFREFDOCS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_PDFREFDOCS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${BUILD_SERVER_TRUE}" && test -z "${BUILD_SERVER_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_SERVER\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5

diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in
index b5665628c3d28e908ab19e24fb79115023168ed5..705ddbae5fd80ca2177a0fec2f14657f3a169c6d 100644 (file)
--- a/doc/SystemTap_Tapset_Reference/Makefile.in
+++ b/doc/SystemTap_Tapset_Reference/Makefile.in
@@ -176,7 +176,7 @@ MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man3
 HTML_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/tapsets
 SRCTREE = $(abs_top_srcdir)/
 DOCPROC = $(abs_builddir)/docproc
-@BUILD_REFDOCS_TRUE@PDFDOCS = tapsets.pdf
+@BUILD_PDFREFDOCS_TRUE@PDFDOCS = tapsets.pdf
 all: all-am
 
 .SUFFIXES:
@@ -340,7 +340,7 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-@BUILD_DOCS_FALSE@install-data-hook:
+@BUILD_REFDOCS_FALSE@install-data-hook:
 clean: clean-am
 
 clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
@@ -416,36 +416,36 @@ uninstall-am:
        uninstall-am
 
 
-@BUILD_DOCS_TRUE@all: $(PDFDOCS) stamp-htmldocs stamp-mandocs
-@BUILD_DOCS_TRUE@tapsets.xml: docproc $(shell find $(SRCTREE) -name '*.stp')
-@BUILD_DOCS_TRUE@      SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml.new
-@BUILD_DOCS_TRUE@      if cmp tapsets.xml.new tapsets.xml >/dev/null ; then \
-@BUILD_DOCS_TRUE@              echo tapsets.xml unchanged; \
-@BUILD_DOCS_TRUE@      else \
-@BUILD_DOCS_TRUE@              mv tapsets.xml.new tapsets.xml; \
-@BUILD_DOCS_TRUE@      fi
+@BUILD_REFDOCS_TRUE@all: $(PDFDOCS) stamp-htmldocs stamp-mandocs
+@BUILD_REFDOCS_TRUE@tapsets.xml: docproc $(shell find $(SRCTREE) -name '*.stp')
+@BUILD_REFDOCS_TRUE@   SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml.new
+@BUILD_REFDOCS_TRUE@   if cmp tapsets.xml.new tapsets.xml >/dev/null ; then \
+@BUILD_REFDOCS_TRUE@           echo tapsets.xml unchanged; \
+@BUILD_REFDOCS_TRUE@   else \
+@BUILD_REFDOCS_TRUE@           mv tapsets.xml.new tapsets.xml; \
+@BUILD_REFDOCS_TRUE@   fi
 
-@BUILD_DOCS_TRUE@stamp-htmldocs: tapsets.xml
-@BUILD_DOCS_TRUE@      xmlto html -o tapsets tapsets.xml
-@BUILD_DOCS_TRUE@      touch stamp-htmldocs
+@BUILD_REFDOCS_TRUE@stamp-htmldocs: tapsets.xml
+@BUILD_REFDOCS_TRUE@   xmlto html -o tapsets tapsets.xml
+@BUILD_REFDOCS_TRUE@   touch stamp-htmldocs
 
 # bump up the allocated space so "xmlto pdf" works
-@BUILD_DOCS_TRUE@tapsets.pdf: tapsets.xml
-@BUILD_DOCS_TRUE@      env pool_size=2000000 hash_extra=2000000 xmlto pdf tapsets.xml
+@BUILD_REFDOCS_TRUE@tapsets.pdf: tapsets.xml
+@BUILD_REFDOCS_TRUE@   env pool_size=2000000 hash_extra=2000000 xmlto pdf tapsets.xml
 
-@BUILD_DOCS_TRUE@stamp-mandocs: tapsets.xml
-@BUILD_DOCS_TRUE@      xmlto man -o man3 tapsets.xml
-@BUILD_DOCS_TRUE@      touch stamp-mandocs
+@BUILD_REFDOCS_TRUE@stamp-mandocs: tapsets.xml
+@BUILD_REFDOCS_TRUE@   xmlto man -o man3 tapsets.xml
+@BUILD_REFDOCS_TRUE@   touch stamp-mandocs
 
 #FIXME need to figure out where to install things appropriately
 #installmandocs: mandocs
-@BUILD_DOCS_TRUE@install-data-hook:
-@BUILD_DOCS_TRUE@@BUILD_REFDOCS_TRUE@  $(MKDIR_P)  $(DOC_INSTALL_DIR)
-@BUILD_DOCS_TRUE@@BUILD_REFDOCS_TRUE@  $(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR)
-@BUILD_DOCS_TRUE@      $(MKDIR_P)  $(MAN_INSTALL_DIR)
-@BUILD_DOCS_TRUE@      $(INSTALL_DATA) man3/* $(MAN_INSTALL_DIR)
-@BUILD_DOCS_TRUE@      $(MKDIR_P)  $(HTML_INSTALL_DIR)
-@BUILD_DOCS_TRUE@      $(INSTALL_DATA) tapsets/* $(HTML_INSTALL_DIR)
+@BUILD_REFDOCS_TRUE@install-data-hook:
+@BUILD_PDFREFDOCS_TRUE@@BUILD_REFDOCS_TRUE@    $(MKDIR_P)  $(DOC_INSTALL_DIR)
+@BUILD_PDFREFDOCS_TRUE@@BUILD_REFDOCS_TRUE@    $(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR)
+@BUILD_REFDOCS_TRUE@   $(MKDIR_P)  $(MAN_INSTALL_DIR)
+@BUILD_REFDOCS_TRUE@   $(INSTALL_DATA) man3/* $(MAN_INSTALL_DIR)
+@BUILD_REFDOCS_TRUE@   $(MKDIR_P)  $(HTML_INSTALL_DIR)
+@BUILD_REFDOCS_TRUE@   $(INSTALL_DATA) tapsets/* $(HTML_INSTALL_DIR)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: