summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac20
-rw-r--r--doc/Makefile.am3
-rw-r--r--doc/user-guide/Makefile.am2
3 files changed, 24 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 4d90307..c5e0da8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,6 +134,26 @@ AC_CANONICAL_HOST
AC_PROG_CC
AC_PROG_LIBTOOL
+# texinfo check
+AC_CHECK_PROG([INFO], [makeinfo], [yes], [no])
+if test "x$INFO" = "xno"; then
+ AC_MSG_WARN([
+*** Makeinfo is missing. Info documentation will not be built.])
+ BUILD_INFO=
+else
+ BUILD_INFO=user-guide
+ case "$INFO" in
+ */missing\ makeinfo*)
+ BUILD_INFO=
+ AC_MSG_WARN([
+*** Makeinfo is missing. Info documentation will not be built.])
+ ;;
+ *)
+ esac
+fi
+AC_SUBST(INFO)
+AC_SUBST(BUILD_INFO)
+
# LEX needs a check
AC_PROG_LEX
if test "x${LEX}" != "xflex" -a "x${FLEX}" != "xlex"; then
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 83f8832..0934c1c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,8 @@
EXTRA_DIST = glusterfs.vol.sample glusterfsd.vol.sample glusterfs.8 \
porting_guide.txt authentication.txt coding-standard.pdf get_put_api_using_xattr.txt \
translator-options.txt mac-related-xattrs.txt replicate.pdf
-SUBDIRS = examples hacker-guide user-guide
+
+SUBDIRS = examples hacker-guide $(BUILD_INFO)
voldir = $(sysconfdir)/glusterfs
vol_DATA = glusterfs.vol.sample glusterfsd.vol.sample
diff --git a/doc/user-guide/Makefile.am b/doc/user-guide/Makefile.am
index 8d7068f..800e732 100644
--- a/doc/user-guide/Makefile.am
+++ b/doc/user-guide/Makefile.am
@@ -1 +1,3 @@
info_TEXINFOS = user-guide.texi
+CLEANFILES = *~
+DISTCLEANFILES = .deps/*.P *.info *vti