[git] KSBA - branch, master, updated. libksba-1.3.5-2-g100ed50

[by Werner Koch]

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 "KSBA is a library to access X.509 certificates and CMS data.".

The branch, master has been updated
       via  100ed5092aec0afe16ca7a4fe660602745e92a36 (commit)
      from  861cd1eb38453a39226c7e206486078e9ac4a12c (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 100ed5092aec0afe16ca7a4fe660602745e92a36
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 14 15:40:37 2016 +0200

    Let configure print a note if Yacc is not Bison.
    
    * m4/ax_prog_bison.m4: New.
    * m4/Makefile.am (EXTRA_DIST): Add it.
    * configure.ac: Test for Bison and print a note.
    --
    
    GnuPG-bug-id: 2753
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/configure.ac b/configure.ac
index 44da1cb..1efb3ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,6 +125,8 @@ AC_PROG_MAKE_SET
 gl_EARLY
 #AC_ARG_PROGRAM
 AC_PROG_YACC
+AX_PROG_BISON([have_bison=yes],[have_bison=no])
+
 AC_C_INLINE
 
 # We need to compile and run a program on the build machine.
@@ -419,6 +421,13 @@ doc/Makefile
 ])
 AC_OUTPUT
 
+if test x"$have_bison" = xno; then
+    AC_MSG_NOTICE([[
+***
+*** Note: The installed yacc version is not GNU Bison.  You need
+*** to install Bison if you want to change any grammar (.y) file.
+***]])
+fi
 
 echo "
         Libksba v${VERSION} has been configured as follows:
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 3a1716c..6078d25 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,5 +1,5 @@
 
 EXTRA_DIST = autobuild.m4  gnupg-typedef.m4  gpg-error.m4  libgcrypt.m4 \
-             libtool.m4
+             libtool.m4 ax_prog_bison.m4
 
 
diff --git a/m4/ax_prog_bison.m4 b/m4/ax_prog_bison.m4
new file mode 100644
index 0000000..b7ba31d
--- /dev/null
+++ b/m4/ax_prog_bison.m4
@@ -0,0 +1,64 @@
+# ===========================================================================
+#       http://www.gnu.org/software/autoconf-archive/ax_prog_bison.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_BISON(ACTION-IF-TRUE,ACTION-IF-FALSE)
+#
+# DESCRIPTION
+#
+#   Check whether bison is the parser generator. Run ACTION-IF-TRUE if
+#   successful, ACTION-IF-FALSE otherwise
+#
+# LICENSE
+#
+#   Copyright (c) 2009 Francesco Salvestrini <salvestrini at users.sourceforge.net>
+#   Copyright (c) 2010 Diego Elio Petteno` <flameeyes at gmail.com>
+#
+#   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 2 of the License, or (at your
+#   option) any later version.
+#
+#   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/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 9
+
+AC_DEFUN([AX_PROG_BISON], [
+  AC_REQUIRE([AC_PROG_YACC])
+  AC_REQUIRE([AC_PROG_EGREP])
+
+  AC_CACHE_CHECK([if bison is the parser generator],[ax_cv_prog_bison],[
+    AS_IF([$YACC --version 2>/dev/null | $EGREP -q '^bison '],
+      [ax_cv_prog_bison=yes], [ax_cv_prog_bison=no])
+  ])
+  AS_IF([test "$ax_cv_prog_bison" = "yes"], [
+      dnl replace the yacc-compatible compiler with the real bison, as
+      dnl otherwise autoconf limits us to the POSIX yacc.
+      dnl We also change the generated filename to the old one, so that
+      dnl automake's ylwrap can deal with it.
+      YACC="${YACC% -y} -o y.tab.c"
+    ] m4_ifnblank([$1], [[$1]]),
+    m4_ifnblank([$2], [[$2]])
+  )
+])

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

Summary of changes:
 configure.ac        |  9 ++++++++
 m4/Makefile.am      |  2 +-
 m4/ax_prog_bison.m4 | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 m4/ax_prog_bison.m4


hooks/post-receive
-- 
KSBA is a library to access X.509 certificates and CMS data.
http://git.gnupg.org