[ddccontrol-cvs] ddccontrol Makefile.am, 1.12, 1.13 configure.ac, 1.39, 1.40

[el_cubano <el_...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv20309

Modified Files:
	Makefile.am configure.ac 
Log Message:
Fixed man page, added Makefile.am for man directory and fixed configure.ac to allow an option to circumvent checking for whether or not xsltproc works (default is still to perform check).

Index: configure.ac
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/configure.ac,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- configure.ac	26 Apr 2006 19:54:50 -0000	1.39
+++ configure.ac	26 Jul 2006 22:02:15 -0000	1.40
@@ -22,6 +22,13 @@
 AC_STDC_HEADERS
 AC_CHECK_HEADERS([stdio.h unistd.h sys/time.h stdlib.h errno.h unistd.h string.h sys/types.h sys/stat.h fcntl.h sys/ioctl.h dirent.h], [], [AC_MSG_ERROR([Important header not found, please install it.], [1])], [])
 
+check_xsltproc=yes
+AC_ARG_ENABLE(xsltproc-check,
+  [  --disable-xsltproc-check omit check to see if xsltproc works (enabled)],
+  [if test x$enableval = xno; then
+    check_xsltproc=no
+  fi])
+
 # /dev/i2c-* check
 support_i2c_dev=yes
 AC_ARG_ENABLE(i2cdev,
@@ -192,22 +199,24 @@
          AC_MSG_ERROR([tidy does not exists, install it or disable doc building])
       fi
                   
-      AC_MSG_CHECKING([whether xsltproc works])
-
-      DOCBOOK_ROOT="http://docbook.sourceforge.net/release/xsl/current/xhtml"
-      DB_FILE="$DOCBOOK_ROOT/docbook.xsl"
-
-      $XSLTPROC $XSLTPROC_FLAGS $DB_FILE >/dev/null 2>&1 << END
+      if test x$check_xsltproc = xyes ; then
+         AC_MSG_CHECKING([whether xsltproc works])
+   
+         DOCBOOK_ROOT="http://docbook.sourceforge.net/release/xsl/current/xhtml"
+         DB_FILE="$DOCBOOK_ROOT/docbook.xsl"
+   
+         $XSLTPROC $XSLTPROC_FLAGS $DB_FILE >/dev/null 2>&1 << END
 <?xml version="1.0" encoding='ISO-8859-1'?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <book id="test">
 </book>
 END
-      if test "$?" = 0; then
-         AC_MSG_RESULT(yes)
-         DOC=doc
-      else
-         AC_MSG_ERROR([xsltproc does not work, fix this problem or disable doc building])
+         if test "$?" = 0; then
+            AC_MSG_RESULT(yes)
+            DOC=doc
+         else
+            AC_MSG_ERROR([xsltproc does not work, fix this problem or disable doc building])
+         fi
       fi
    fi
 fi
@@ -226,5 +235,6 @@
 	src/gddccontrol/Makefile
 	src/ddcpci/Makefile
 	src/gnome-ddcc-applet/Makefile
-	doc/Makefile])
+	doc/Makefile
+	man/Makefile])
 AC_OUTPUT

Index: Makefile.am
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am	4 Apr 2006 22:00:29 -0000	1.12
+++ Makefile.am	26 Jul 2006 22:02:14 -0000	1.13
@@ -1,4 +1,4 @@
-SUBDIRS = src po $(DOC)
+SUBDIRS = src po man $(DOC)
 
 EXTRA_DIST = config.rpath mkinstalldirs  config.rpath mkinstalldirs  intltool-extract.in intltool-merge.in intltool-update.in
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update