[git] Pinentry - branch, master, updated. pinentry-1.0.0-34-g89ae537

[by Damien Goutte-Gattat]

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 "The standard pinentry collection".

The branch, master has been updated
       via  89ae5378d1cc54be0825bcfa3ea567b1caa4a247 (commit)
      from  6aafa61b199ab9091d6c9e190129f2ead2a647c7 (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 89ae5378d1cc54be0825bcfa3ea567b1caa4a247
Author: Damien Goutte-Gattat <dgouttegattat at incenp.org>
Date:   Sun Oct 29 11:11:55 2017 +0000

    fltk: Fix compilation and distcheck errors.
    
    * fltk/Makefile.am (AM_CXXFLAGS): Add -std=c++11 flag.
    (pinentry_fltk_SOURCES): Add header files.
    (EXTRA_DIST): Add icon files.
    * .gitignore: Ignore autoconf-generated files in fltk/.
    --
    
    The FLTK pinentry requires C++11 due to the use of std::unique_ptr.
    
    Signed-off-by: Damien Goutte-Gattat <dgouttegattat at incenp.org>

diff --git a/.gitignore b/.gitignore
index e9d3966..8d709c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,8 @@ doc/Makefile
 doc/pinentry.info
 doc/stamp-vti
 doc/version.texi
+fltk/Makefile.in
+fltk/Makefile
 gtk+-2/Makefile.in
 gtk+-2/Makefile
 gnome3/Makefile.in
diff --git a/fltk/Makefile.am b/fltk/Makefile.am
index 2c9338f..54209f9 100644
--- a/fltk/Makefile.am
+++ b/fltk/Makefile.am
@@ -11,6 +11,11 @@ libcurses =
 endif
 
 AM_CPPFLAGS = $(COMMON_CFLAGS) $(FLTKCXXFLAGS) $(ncurses_include) -I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
+AM_CXXFLAGS = -std=c++11
 LDADD = ../pinentry/libpinentry.a ../secmem/libsecmem.a $(COMMON_LIBS) $(LIBCAP) $(FLTKLIBS) $(libcurses)
 
-pinentry_fltk_SOURCES = main.cxx pinwindow.cxx passwindow.cxx qualitypasswindow.cxx
+pinentry_fltk_SOURCES = main.cxx pinwindow.cxx pinwindow.h \
+			passwindow.cxx passwindow.h \
+			qualitypasswindow.cxx qualitypasswindow.h
+
+EXTRA_DIST = encrypt.xpm icon.xpm

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

Summary of changes:
 .gitignore       | 2 ++
 fltk/Makefile.am | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org