[roboptim-commit] [SCM] build-aux branch, master, updated. fc8dffa45c182ab7198d0905c83a4bc3866ea6a4

[Thomas M. <tho...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "build-aux".

The branch, master has been updated
       via  fc8dffa45c182ab7198d0905c83a4bc3866ea6a4 (commit)
      from  6d7fc1db4a946e2b82334052de97d934a2fb0b10 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fc8dffa45c182ab7198d0905c83a4bc3866ea6a4
Author: Thomas Moulard <tho...@gm...>
Date:   Mon Jan 11 18:33:20 2010 +0100

    Add asciidoc related m4/mk files.
    
    	* asciidoc.m4: New.
    	* asciidoc.mk: New.
    
    Signed-off-by: Thomas Moulard <tho...@gm...>

diff --git a/ChangeLog b/ChangeLog
index 1bbe697..7561a58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-11  Thomas Moulard  <tho...@gm...>
+
+	Add asciidoc related m4/mk files.
+	* asciidoc.m4: New.
+	* asciidoc.mk: New.
+
 2009-12-03  Thomas Moulard  <tho...@gm...>
 
 	Do not assume in Kineo rules the library prefix.
diff --git a/asciidoc.m4 b/asciidoc.m4
new file mode 100644
index 0000000..11a970d
--- /dev/null
+++ b/asciidoc.m4
@@ -0,0 +1,70 @@
+#                                                                -*-Autoconf-*-
+# asciidoc.m4: asciidoc generation rules.
+# Copyright (C) 2010 by Thomas Moulard, CNRS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Additional permission under section 7 of the GNU General Public
+# License, version 3 ("GPLv3"):
+#
+# If you convey this file as part of a work that contains a
+# configuration script generated by Autoconf, you may do so under
+# terms of your choice.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# serial 1
+
+# ------ #
+# README #
+# ------ #
+
+# This m4 file can be used to enable asciidoc support in Autoconf.
+
+m4_pattern_forbid([^JRL_])
+
+# JRL_PROG_ASCIIDOC([VARIABLE], [VERSION_MIN])
+# -----------------------------------------------------
+# Check that asciidoc and its dependencies are available and is
+# newer thatn VERSION_MIN
+AC_DEFUN([JRL_PROG_ASCIIDOC],
+[AC_CHECK_PROGS([$1], [asciidoc],
+	       AC_MSG_ERROR([failed to find asciidoc.]))
+
+# Required by asciidoc for source code syntax highlighting.
+AC_CHECK_PROGS([SOURCE_HIGHLIGHT], [source-highlight],
+	       AC_MSG_ERROR([Failed to find source-highlight.]))
+
+ASCIIDOC_REQUIRED_VERSION=$2
+AC_MSG_CHECKING([asciidoc is at least version $ASCIIDOC_REQUIRED_VERSION])
+ASCIIDOC_VERSION=`asciidoc --version 2> /dev/null | sed 's/^asciidoc //'`
+
+for i in 1 2 3; do
+ if test -z "$asciidoc_version_ok"; then
+  wantedversion=`echo "$ASCIIDOC_REQUIRED_VERSION" | cut -d'.' -f$i`
+  version=`echo "$ASCIIDOC_VERSION" | cut -d'.' -f$i`
+
+  if test $version -lt $wantedversion; then
+   asciidoc_version_ok=no
+  fi
+  if test $version -gt $wantedversion; then
+   asciidoc_version_ok=yes
+  fi
+ fi
+done
+
+if test x"$asciidoc_version_ok" = xno; then
+ AC_MSG_RESULT([no])
+else
+ AC_MSG_RESULT([yes])
+fi
+])
diff --git a/asciidoc.mk b/asciidoc.mk
new file mode 100644
index 0000000..9f2fd04
--- /dev/null
+++ b/asciidoc.mk
@@ -0,0 +1,40 @@
+#                                                                -*-Automake-*-
+# Copyright (C) 2010 by Thomas Moulard, CNRS.
+# This file is part of HPP.
+#
+# roboptim is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Additional permission under section 7 of the GNU General Public
+# License, version 3 ("GPLv3"):
+#
+# If you convey this file as part of a work that contains a
+# configuration script generated by Autoconf, you may do so under
+# terms of your choice.
+#
+# roboptim is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with roboptim.  If not, see <http://www.gnu.org/licenses/>.
+
+# ------ #
+# README #
+# ------ #
+#
+# This mk file contains asciidoc generation rules.
+#
+# To use this mk file, include init.mk and this file into
+# your Makefile.am.
+
+SUFFIXES += .html
+
+ASCIIDOC_OPTIONS ?= -a icons
+
+
+.txt.html:
+	$(ASCIIDOC) $(ASCIIDOC_OPTIONS)  -o $@ $<

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                   |    6 ++++
 asciidoc.m4                 |   70 +++++++++++++++++++++++++++++++++++++++++++
 dist-sign.mk => asciidoc.mk |   22 +++++--------
 3 files changed, 85 insertions(+), 13 deletions(-)
 create mode 100644 asciidoc.m4
 copy dist-sign.mk => asciidoc.mk (68%)


hooks/post-receive
-- 
build-aux