Add SystemTap_Beginners_Guide to build.

* configure.ac: Add --enable-publican and --with-publican-brand.
  Setup "shadow" directory doc/beginners.
* Makefile.in: Regenerated.
* configure: Regenerated.
* doc/Makefile.am (SUBDIRS): Add beginners.
* doc/Makefile.in: Regenerated.
* doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml (productname):
  Set to Systemtap.
  (productnumber): Set to 1.0.
* SystemTap_Beginners_Guide/en-US/*.xml: Replace includes from
  extras/testsuite to ../testsuite,
* doc/SystemTap_Beginners_Guide/publican.cfg: Moved to ...
* doc/SystemTap_Beginners_Guide/publican.cfg.in: ... here.
* doc/SystemTap_Beginners_Guide/Makefile: Removed.
* doc/SystemTap_Beginners_Guide/old-syncandbuild.sh: Removed.
* doc/SystemTap_Beginners_Guide/syncandbuild.sh: Removed.
* doc/SystemTap_Tapset_Reference/Makefile.in: Regenerated.
* doc/beginners/Makefile.am: New makefile.
* doc/beginners/Makefile.in: New generated file.
* grapher/Makefile.in: Regenerated.
* systemtap.spec: Add with_publican and publican_brand.

1 files changed, 115 insertions, 1 deletions

diff --git a/configure b/configure
index e738e909..e3e358a6 100755
--- a/configure
+++ b/configure
@@ -672,6 +672,10 @@ XMLTO_STRINGPARAM_TRUE
 BUILD_REFDOCS_FALSE
 BUILD_REFDOCS_TRUE
 have_xmlto
+PUBLICAN_BRAND
+BUILD_PUBLICAN_FALSE
+BUILD_PUBLICAN_TRUE
+have_publican
 BUILD_DOCS_FALSE
 BUILD_DOCS_TRUE
 have_latex2html
@@ -795,6 +799,8 @@ enable_sqlite
 enable_translator
 enable_crash
 enable_docs
+enable_publican
+with_publican_brand
 enable_refdocs
 enable_server
 enable_grapher
@@ -1470,6 +1476,9 @@ Optional Features:
                           location).
   --enable-docs           enable building documentation (default on if latex
                           etc. found).
+  --enable-publican       enable building publican documentation guides
+                          (default on if publican found and other
+                          documentation built).
   --enable-refdocs        enable building reference documentation (default on
                           if xmlto etc. found and other documentation built).
   --enable-server         enable building of stap-server/client (default on if
@@ -1480,6 +1489,9 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-publican-brand=BRAND
+                          building publican documentation guides using given
+                          brand (defaults to "fedora").
   --with-rpm              query rpm database for missing debuginfos [yes/no,
                           def. auto=librpm.so]
   --with-elfutils=DIRECTORY
@@ -6758,6 +6770,87 @@ else
 fi
 
 
+building_publican="no"
+# Check whether --enable-publican was given.
+if test "${enable_publican+set}" = set; then
+  enableval=$enable_publican; enable_publican=$enableval
+else
+  enable_publican="check"
+fi
+
+if test "$building_docs" == "no" -a "$enable_publican" == "yes" ; then
+   { { $as_echo "$as_me:$LINENO: error: must use --enable-docs with --enable-publican" >&5
+$as_echo "$as_me: error: must use --enable-docs with --enable-publican" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+# Extract the first word of "publican", so it can be a program name with args.
+set dummy publican; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_have_publican+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$have_publican"; then
+  ac_cv_prog_have_publican="$have_publican" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_have_publican="yes"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_have_publican" && ac_cv_prog_have_publican="no"
+fi
+fi
+have_publican=$ac_cv_prog_have_publican
+if test -n "$have_publican"; then
+  { $as_echo "$as_me:$LINENO: result: $have_publican" >&5
+$as_echo "$have_publican" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test "$enable_publican" == "yes"; then
+   if test "x${have_publican}" != "xyes"; then
+      { { $as_echo "$as_me:$LINENO: error: cannot find publican for building publican guides" >&5
+$as_echo "$as_me: error: cannot find publican for building publican guides" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+fi
+if test "x${have_publican}" == "xyes" -a "$enable_publican" != "no" -a "${building_docs}" == "yes"; then
+   building_publican="yes"
+fi
+ if test "$building_publican" == "yes"; then
+  BUILD_PUBLICAN_TRUE=
+  BUILD_PUBLICAN_FALSE='#'
+else
+  BUILD_PUBLICAN_TRUE='#'
+  BUILD_PUBLICAN_FALSE=
+fi
+
+publican_brand="fedora"
+
+# Check whether --with-publican-brand was given.
+if test "${with_publican_brand+set}" = set; then
+  withval=$with_publican_brand; publican_brand=$withval
+else
+  publican_brand="fedora"
+fi
+
+PUBLICAN_BRAND=$publican_brand
+
+
 building_refdocs="no"
 # Check whether --enable-refdocs was given.
 if test "${enable_refdocs+set}" = set; then
@@ -9603,7 +9696,7 @@ _ACEOF
 
 ac_config_headers="$ac_config_headers config.h:config.in"
 
-ac_config_files="$ac_config_files Makefile doc/Makefile doc/SystemTap_Tapset_Reference/Makefile grapher/Makefile grapher/stapgraph.1 stap.1 stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap staprun.8 stap-client.8 stap-server.8 stap-authorize-server-cert.8 stap-authorize-signing-cert.8 man/stapprobes.iosched.3stap man/stapprobes.irq.3stap man/stapprobes.netdev.3stap man/stapprobes.nfs.3stap man/stapprobes.nfsd.3stap man/stapprobes.pagefault.3stap man/stapprobes.kprocess.3stap man/stapprobes.rpc.3stap man/stapprobes.scsi.3stap man/stapprobes.signal.3stap man/stapprobes.socket.3stap man/stapprobes.tcp.3stap man/stapprobes.udp.3stap man/stapprobes.snmp.3stap initscript/systemtap initscript/stap-server"
+ac_config_files="$ac_config_files Makefile doc/Makefile doc/beginners/Makefile doc/SystemTap_Tapset_Reference/Makefile grapher/Makefile grapher/stapgraph.1 stap.1 stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap staprun.8 stap-client.8 stap-server.8 stap-authorize-server-cert.8 stap-authorize-signing-cert.8 man/stapprobes.iosched.3stap man/stapprobes.irq.3stap man/stapprobes.netdev.3stap man/stapprobes.nfs.3stap man/stapprobes.nfsd.3stap man/stapprobes.pagefault.3stap man/stapprobes.kprocess.3stap man/stapprobes.rpc.3stap man/stapprobes.scsi.3stap man/stapprobes.signal.3stap man/stapprobes.socket.3stap man/stapprobes.tcp.3stap man/stapprobes.udp.3stap man/stapprobes.snmp.3stap initscript/systemtap initscript/stap-server"
 
 
 
@@ -9617,6 +9710,16 @@ ac_config_files="$ac_config_files run-staprun"
 
 ac_config_files="$ac_config_files dtrace"
 
+
+# Setup "shadow" directory doc/beginners that has everything setup for
+# publican in one directory (through directory links if necessary).
+# It would be nice to use AC_CONFIG_LINKS, but automake complains when
+# the src is a directory and not a file.
+ac_config_files="$ac_config_files doc/beginners/publican.cfg:doc/SystemTap_Beginners_Guide/publican.cfg.in"
+
+ac_config_commands="$ac_config_commands doc/beginners"
+
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -9778,6 +9881,13 @@ $as_echo "$as_me: error: conditional \"BUILD_DOCS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${BUILD_PUBLICAN_TRUE}" && test -z "${BUILD_PUBLICAN_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PUBLICAN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_PUBLICAN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${BUILD_REFDOCS_TRUE}" && test -z "${BUILD_REFDOCS_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_REFDOCS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -10339,6 +10449,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "doc/beginners/Makefile") CONFIG_FILES="$CONFIG_FILES doc/beginners/Makefile" ;;
     "doc/SystemTap_Tapset_Reference/Makefile") CONFIG_FILES="$CONFIG_FILES doc/SystemTap_Tapset_Reference/Makefile" ;;
     "grapher/Makefile") CONFIG_FILES="$CONFIG_FILES grapher/Makefile" ;;
     "grapher/stapgraph.1") CONFIG_FILES="$CONFIG_FILES grapher/stapgraph.1" ;;
@@ -10371,6 +10482,8 @@ do
     "run-stap") CONFIG_FILES="$CONFIG_FILES run-stap" ;;
     "run-staprun") CONFIG_FILES="$CONFIG_FILES run-staprun" ;;
     "dtrace") CONFIG_FILES="$CONFIG_FILES dtrace" ;;
+    "doc/beginners/publican.cfg") CONFIG_FILES="$CONFIG_FILES doc/beginners/publican.cfg:doc/SystemTap_Beginners_Guide/publican.cfg.in" ;;
+    "doc/beginners") CONFIG_COMMANDS="$CONFIG_COMMANDS doc/beginners" ;;
 
   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -11163,6 +11276,7 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
     "run-stap":F) chmod +x run-stap ;;
     "run-staprun":F) chmod +x run-staprun ;;
     "dtrace":F) chmod +x dtrace ;;
+    "doc/beginners":C) rm -f $ac_abs_top_builddir/doc/beginners/en-US $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite && mkdir -p $ac_abs_top_builddir/doc/beginners/build/en-US && ln -s $ac_abs_top_srcdir/doc/SystemTap_Beginners_Guide/en-US $ac_abs_top_builddir/doc/beginners/en-US && ln -s $ac_abs_top_srcdir/testsuite $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite ;;
 
   esac
 done # for ac_tag