[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.1.2-5-g8d59f42
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Jun 19 17:29:08 CEST 2018
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 "GnuPG for Windows".
The branch, master has been updated
via 8d59f423dbc5c60eef8a2d0a222c0d08782521de (commit)
via 99d9da8658602c36e5ebda1a7ac922c137cf5810 (commit)
from bc268f757e84bf0018e59d8fbd87629b61dbdf12 (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 8d59f423dbc5c60eef8a2d0a222c0d08782521de
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jun 19 17:27:31 2018 +0200
Use AC_PROG_MKDIR_P instead of AM_PROG_MKDIR_P
* m4/po.m4: Use AC_PROG_MKDIR_P.
* po/Makefile.in.in, src/Makefile.am: Use $(MKDIR_P)
--
This fixes a deprecation warning from autoconf by
doing what is said in the deprecation warning.
diff --git a/m4/po.m4 b/m4/po.m4
index 00133ef..d16320c 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
[
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
AC_REQUIRE([AM_NLS])dnl
dnl Perform the following tests also if --disable-nls has been given,
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 5022b8b..e9f889c 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -31,17 +31,8 @@ gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-# We use $(mkdir_p).
-# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
-# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# @install_sh@ does not start with $(SHELL), so we add it.
-# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
-# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
-# versions, $(mkinstalldirs) and $(install_sh) are unused.
mkinstalldirs = $(SHELL) @install_sh@ -d
install_sh = $(SHELL) @install_sh@
-MKDIR_P = @MKDIR_P@
-mkdir_p = @mkdir_p@
GMSGFMT_ = @GMSGFMT@
GMSGFMT_no = @GMSGFMT@
@@ -178,7 +169,7 @@ install: install-exec install-data
install-exec:
install-data: install-data- at USE_NLS@
if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \
for file in $(DISTFILES.common) Makevars.template; do \
$(INSTALL_DATA) $(srcdir)/$$file \
$(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -191,13 +182,13 @@ install-data: install-data- at USE_NLS@
fi
install-data-no: all
install-data-yes: all
- $(mkdir_p) $(DESTDIR)$(datadir)
+ $(MKDIR_P) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkdir_p) $(DESTDIR)$$dir; \
+ $(MKDIR_P) $(DESTDIR)$$dir; \
if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
$(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -237,19 +228,19 @@ installdirs: installdirs-exec installdirs-data
installdirs-exec:
installdirs-data: installdirs-data- at USE_NLS@
if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \
else \
: ; \
fi
installdirs-data-no:
installdirs-data-yes:
- $(mkdir_p) $(DESTDIR)$(datadir)
+ $(MKDIR_P) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkdir_p) $(DESTDIR)$$dir; \
+ $(MKDIR_P) $(DESTDIR)$$dir; \
for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
if test -n "$$lc"; then \
if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff --git a/src/Makefile.am b/src/Makefile.am
index acd359f..6ca272f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -176,7 +176,7 @@ define gpg4win_pkg_gnupg2_post_install
sed -e 's/$$$$/\r/' > $$$${pkgidir}/share/man/man1/$$$${i}.man ; \
done ; \
for i in `$(tsdir)/src/potomo --get-linguas $$$${pkgsdir}/po` ; do \
- $(mkdir_p) $$$${pkgidir}/share/locale/$$$${i}/LC_MESSAGES || true; \
+ $(MKDIR_P) $$$${pkgidir}/share/locale/$$$${i}/LC_MESSAGES || true; \
rm $$$${pkgidir}/share/locale/$$$${i}/LC_MESSAGES/gnupg2.mo 2>/dev/null \
|| true; \
$(tsdir)/src/potomo $$$${pkgsdir}/po/$$$${i}.po \
commit 99d9da8658602c36e5ebda1a7ac922c137cf5810
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jun 19 17:25:41 2018 +0200
Build gpgme with --disable-gpg(sm)-tests
* src/Makefile.am (gpg4win_pkg_gpgme_configure),
(gpg4win_pkg_gpgme_ex_configure): Add
--disable-gpg(sm)-tests
--
Even without a make check these tests introduce a
build dependency to gpg and gpgsm for the environment
setup which is done at build time.
diff --git a/src/Makefile.am b/src/Makefile.am
index e3cca6d..acd359f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -249,13 +249,17 @@ gpg4win_pkg_gpgme_configure = --silent \
`test -n "@HAVE_PKG_GLIB@" && echo "--enable-w32-glib"` \
CFLAGS=-I$(idir)/include/glib-2.0/ \
LDFLAGS=-L$(idir)/lib \
- --enable-languages=qt,cpp
+ --enable-languages=qt,cpp \
+ --disable-gpg-test \
+ --disable-gpgsm-test
gpg4win_pkg_gpgme_ex_configure = --silent \
--with-gpg-error-prefix=$(ex_idir) --enable-static \
--with-libassuan-prefix=$(ex_idir) \
LDFLAGS=-L$(ex_idir)/lib \
- --enable-languages=cpp
+ --enable-languages=cpp \
+ --disable-gpg-test \
+ --disable-gpgsm-test
gpg4win_pkg_gpa_configure = --silent \
--with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \
-----------------------------------------------------------------------
Summary of changes:
m4/po.m4 | 2 +-
po/Makefile.in.in | 21 ++++++---------------
src/Makefile.am | 10 +++++++---
3 files changed, 14 insertions(+), 19 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list