security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Modernize to automake 1.14. 

* Makefile.am (AUTOMAKE_OPTIONS): Move to ...
* configure.ac (AM_INIT_AUTOMAKE): here and add serial-tests.

* keyserver/Makefile.am: Replace INCLUDES by AM_CPPFLAGS.
* mpi/Makefile.am: Ditto.
* util/Makefile.am: Ditto.
* keyserver/Makefile.am: Ditto.  Adjusted other things.

* m4/intl.m4, m4/po.m4: Use autoconf's AC_PROG_MKDIR_P.
This commit is contained in:
Werner Koch 2015-01-19 18:59:13 +01:00
parent 8adb5ff260
commit 592e1aa407
8 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -22,7 +22,6 @@ ACLOCAL_AMFLAGS = -I m4
# tests are importing secret keys and that is not allowed if # tests are importing secret keys and that is not allowed if
# selinux-support is enabled. # selinux-support is enabled.
DISTCHECK_CONFIGURE_FLAGS = --enable-mailto DISTCHECK_CONFIGURE_FLAGS = --enable-mailto
AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99
GITLOG_TO_CHANGELOG=gitlog-to-changelog GITLOG_TO_CHANGELOG=gitlog-to-changelog

28
README.SVN → README.GIT
View File

@ -1,9 +1,11 @@
If you are building from Subversion, run the script If you are building from GIT, run the script
./autogen.sh ./autogen.sh
first, to make sure that you have all the necessary maintainer tools first, to make sure that you have all the necessary maintainer tools
are installed and to build the actual configuration files. Then run are installed and to build the actual configuration files. If you
have just checked out from GIT, you should add the option "--force" to
autogen.sh so that meta data is noticed by autom4te.cache. Then run
./configure --enable-maintainer-mode ./configure --enable-maintainer-mode
@ -14,9 +16,9 @@ tools, or the tools are not installed, you may use environment
variables to override the default tool names: variables to override the default tool names:
AUTOMAKE_SUFFIX is used as a suffix for all tools from the automake AUTOMAKE_SUFFIX is used as a suffix for all tools from the automake
package. For example package. For example
AUTOMAKE_SUFFIX="-1.7" ./autogen.sh AUTOMAKE_SUFFIX="-1.14" ./autogen.sh
uses "automake-1.7" and "aclocal-1.7. uses "automake-1.14" and "aclocal-1.14.
AUTOMAKE_PREFIX is used as a prefix for all tools from the automake AUTOMAKE_PREFIX is used as a prefix for all tools from the automake
page and may be combined with AUTOMAKE_SUFFIX. e.g.: page and may be combined with AUTOMAKE_SUFFIX. e.g.:
AUTOMAKE_PREFIX=/usr/foo/bin ./autogen.sh AUTOMAKE_PREFIX=/usr/foo/bin ./autogen.sh
@ -35,17 +37,13 @@ It is also possible to use the variable name AUTOMAKE, AUTOCONF,
ACLOCAL, AUTOHEADER, GETTEXT and MSGMERGE to directly specify the name ACLOCAL, AUTOHEADER, GETTEXT and MSGMERGE to directly specify the name
of the programs to run. It is however better to use the suffix and of the programs to run. It is however better to use the suffix and
prefix forms as described above because that does not require prefix forms as described above because that does not require
knowledge about the actual tools used by autgen.sh. knowledge about the actual tools used by autogen.sh.
Please don't use autopoint, libtoolize or autoreconf unless you are Please don't use autopoint, libtoolize or autoreconf unless you are
the current maintainer and want to update the standard configuration the current maintainer and want to update the standard configuration
files. All those files should be in the repository and only updated files. All those files should be in GIT and only updated manually
manually if the maintainer decides that newer versions are required. if the maintainer decides that newer versions are required. The
The maintainer should also make sure that the required version of maintainer should also make sure that the required version of automake
automake et al. are properly indicated at the top of configure.ac and et al. are properly indicated at the top of configure.ac and take care
take care to copy the files and not merely use symlinks. to copy the files and not merely use symlinks.

6
configure.ac
View File

@ -20,8 +20,8 @@
# #
# (Process this file with autoconf to produce a configure script.) # (Process this file with autoconf to produce a configure script.)
AC_PREREQ(2.59) AC_PREREQ(2.61)
min_automake_version="1.9.3" min_automake_version="1.14"
# To build a release you need to create a tag with the version number # To build a release you need to create a tag with the version number
# (git tag -s gnupg-1.n.m) and run "./autogen.sh --force". Please # (git tag -s gnupg-1.n.m) and run "./autogen.sh --force". Please
@ -51,7 +51,7 @@ development_version=mym4_isgit
AC_CONFIG_AUX_DIR(scripts) AC_CONFIG_AUX_DIR(scripts)
AC_CONFIG_SRCDIR(g10/gpg.c) AC_CONFIG_SRCDIR(g10/gpg.c)
AC_CANONICAL_HOST AC_CANONICAL_HOST
AM_INIT_AUTOMAKE([std-options]) AM_INIT_AUTOMAKE([serial-tests std-options dist-bzip2 filename-length-max=99])
AB_INIT AB_INIT
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)

19
keyserver/Makefile.am
View File

@ -7,17 +7,17 @@
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or # the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# GnuPG is distributed in the hope that it will be useful, # GnuPG is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>. # along with this program; if not, see <http://www.gnu.org/licenses/>.
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/intl
EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_finger gpgkeys_curl EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_finger gpgkeys_curl
EXTRA_SCRIPTS = gpgkeys_mailto EXTRA_SCRIPTS = gpgkeys_mailto
@ -34,23 +34,26 @@ gpgkeys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h
other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
gpgkeys_ldap_CPPFLAGS = @LDAP_CPPFLAGS@ gpgkeys_ldap_CPPFLAGS = $(AM_CPPFLAGS) $(LDAP_CPPFLAGS)
gpgkeys_ldap_LDADD = ../util/libcompat.a @LDAPLIBS@ @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ gpgkeys_ldap_LDADD = ../util/libcompat.a @LDAPLIBS@ @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
if FAKE_CURL if FAKE_CURL
gpgkeys_curl_SOURCES += curl-shim.c curl-shim.h gpgkeys_curl_SOURCES += curl-shim.c curl-shim.h
gpgkeys_curl_CPPFLAGS = $(AM_CPPFLAGS)
gpgkeys_curl_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ gpgkeys_curl_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
gpgkeys_hkp_SOURCES += curl-shim.c curl-shim.h gpgkeys_hkp_SOURCES += curl-shim.c curl-shim.h
gpgkeys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
gpgkeys_finger_CPPFLAGS = $(AM_CPPFLAGS)
else else
gpgkeys_curl_SOURCES += ksmalloc.c gpgkeys_curl_SOURCES += ksmalloc.c
gpgkeys_curl_CPPFLAGS = @LIBCURL_CPPFLAGS@ gpgkeys_curl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCURL_CPPFLAGS)
gpgkeys_curl_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@ gpgkeys_curl_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@
gpgkeys_hkp_SOURCES += ksmalloc.c gpgkeys_hkp_SOURCES += ksmalloc.c
gpgkeys_hkp_CPPFLAGS = @LIBCURL_CPPFLAGS@ gpgkeys_hkp_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCURL_CPPFLAGS)
gpgkeys_hkp_LDADD = ../util/libcompat.a @DNSLIBS@ @LIBCURL@ @GETOPT@ gpgkeys_hkp_LDADD = ../util/libcompat.a @DNSLIBS@ @LIBCURL@ @GETOPT@
gpgkeys_finger_CPPFLAGS = @LIBCURL_CPPFLAGS@ gpgkeys_finger_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCURL_CPPFLAGS)
gpgkeys_ldap_CPPFLAGS += @LIBCURL_CPPFLAGS@ gpgkeys_ldap_CPPFLAGS += $(LIBCURL_CPPFLAGS)
endif endif

4
m4/intl.m4
View File

@ -1,4 +1,4 @@
# intl.m4 serial 17 (gettext-0.18) # intl.m4 serial 17 (gettext-0.18) - updated by wk 2015-01-19
dnl Copyright (C) 1995-2009 Free Software Foundation, Inc. dnl Copyright (C) 1995-2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@ -25,7 +25,7 @@ dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
AC_DEFUN([AM_INTL_SUBDIR], AC_DEFUN([AM_INTL_SUBDIR],
[ [
AC_REQUIRE([AC_PROG_INSTALL])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([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([gt_GLIBC2])dnl AC_REQUIRE([gt_GLIBC2])dnl

4
m4/po.m4
View File

@ -1,4 +1,4 @@
# po.m4 serial 17 (gettext-0.18) # po.m4 serial 17 (gettext-0.18) updated by wk 2015-01-19
dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
[ [
AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AC_PROG_INSTALL])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 AC_REQUIRE([AM_NLS])dnl
dnl Release version of the gettext macros. This is used to ensure that dnl Release version of the gettext macros. This is used to ensure that

6
mpi/Makefile.am
View File

@ -6,18 +6,18 @@
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or # the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# GnuPG is distributed in the hope that it will be useful, # GnuPG is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>. # along with this program; if not, see <http://www.gnu.org/licenses/>.
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
INCLUDES = -I.. -I$(top_srcdir)/include AM_CPPFLAGS = -I.. -I$(top_srcdir)/include
AM_CFLAGS = $(MPI_OPT_FLAGS) AM_CFLAGS = $(MPI_OPT_FLAGS)
AM_CCASFLAGS = $(NOEXECSTACK_FLAGS) $(MPI_SFLAGS) AM_CCASFLAGS = $(NOEXECSTACK_FLAGS) $(MPI_SFLAGS)

6
util/Makefile.am
View File

@ -7,17 +7,17 @@
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or # the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# GnuPG is distributed in the hope that it will be useful, # GnuPG is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>. # along with this program; if not, see <http://www.gnu.org/licenses/>.
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl AM_CPPFLAGS= -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
noinst_LIBRARIES = libutil.a libcompat.a noinst_LIBRARIES = libutil.a libcompat.a