[git] GPA - branch, master, updated. gpa-0.9.4-18-gcb0e2c9
by Werner Koch
cvs at cvs.gnupg.org
Fri Jan 10 18:02:28 CET 2014
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 GNU Privacy Assistant".
The branch, master has been updated
via cb0e2c95aafaab607ae7f040a79e3b47db80ee0f (commit)
via e432add8990e6e01488ef67fcc644b2cddbfc60d (commit)
from ba72a6a1ff15dd0a72ceccd7335ba25d2e4ac004 (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 cb0e2c95aafaab607ae7f040a79e3b47db80ee0f
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jan 9 19:14:09 2014 +0100
Use the generic autogen.sh script.
* autogen.rc: New.
* Makefile.am (EXTRA_DIST): Add it.
* autogen.sh: Update from GnuPG.
diff --git a/Makefile.am b/Makefile.am
index 78379d7..e24d01b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ AUTOMAKE_OPTIONS = dist-bzip2
SUBDIRS = m4 src po pixmaps doc
EXTRA_DIST = \
- autogen.sh TODO to-utf8 gpa.spec \
+ autogen.sh autogen.rc TODO to-utf8 gpa.spec \
gpa.desktop gpa.png gpadefs.h.in \
po/ChangeLog-2011 pixmaps/ChangeLog-2011 ChangeLog-2011 \
m4/ChangeLog-2011 src/ChangeLog-2011 st-fonts/ChangeLog-2011
diff --git a/autogen.rc b/autogen.rc
new file mode 100644
index 0000000..df2ab16
--- /dev/null
+++ b/autogen.rc
@@ -0,0 +1,14 @@
+# autogen.sh configuration for GPA -*- sh -*-
+
+configure_opts="
+ --with-zlib=@SYSROOT@
+ --with-gpg-error-prefix=@SYSROOT@
+ --with-gpgme-prefix=@SYSROOT@
+ --with-libassuan-prefix=@SYSROOT@
+ --with-libiconv-prefix=@SYSROOT@
+ SYSROOT=\"@SYSROOT@\"
+ PKG_CONFIG=\"@SYSROOT@/bin/pkg-config\"
+ PKG_CONFIG_LIBDIR=\"@SYSROOT@/lib/pkgconfig\"
+ "
+
+final_info="./configure --enable-maintainer-mode && make"
diff --git a/autogen.sh b/autogen.sh
index 2acfed2..471193c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,21 @@
-#!/bin/bash
-# Run this to generate all the initial makefiles, etc.
+#! /bin/sh
+# autogen.sh
+# Copyright (C) 2003, 2014 g10 Code GmbH
#
-# Use --build-w32 to prepare the cross compiling build for Windoze
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# This is a generic script to create the configure script and handle cross
+# build environments. It requires the presence of a autogen.rc file to
+# configure it for the respective package. It is maintained as part of
+# GnuPG and source copied by other packages.
+#
+# Version: 2014-01-10
configure_ac="configure.ac"
@@ -11,7 +24,7 @@ cvtver () {
}
check_version () {
- if [ `("$1" --version || echo "0") | cvtver` -ge "$2" ]; then
+ if [ $(( `("$1" --version || echo "0") | cvtver` >= $2 )) = 1 ]; then
return 0
fi
echo "**Error**: "\`$1\'" not installed or too old." >&2
@@ -21,6 +34,29 @@ check_version () {
return 1
}
+fatal () {
+ echo "autogen.sh:" "$*" >&2
+ DIE=yes
+}
+
+info () {
+ if [ -z "${SILENT}" ]; then
+ echo "autogen.sh:" "$*"
+ fi
+}
+
+die_p () {
+ if [ "$DIE" = "yes" ]; then
+ echo "autogen.sh: Stop." >&2
+ exit 1
+ fi
+}
+
+replace_sysroot () {
+ configure_opts=$(echo $configure_opts | sed "s#@SYSROOT@#${w32root}#g")
+ extraoptions=$(echo $extraoptions | sed "s#@SYSROOT@#${w32root}#g")
+}
+
# Allow to override the default tool names
AUTOCONF=${AUTOCONF_PREFIX}${AUTOCONF:-autoconf}${AUTOCONF_SUFFIX}
AUTOHEADER=${AUTOCONF_PREFIX}${AUTOHEADER:-autoheader}${AUTOCONF_SUFFIX}
@@ -33,86 +69,141 @@ MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
DIE=no
FORCE=
-tmp=`dirname $0`
-tsdir=`cd "$tmp"; pwd`
-if test x"$1" == x"--force"; then
+SILENT=
+tmp=$(dirname "$0")
+tsdir=$(cd "${tmp}"; pwd)
+
+if [ -n "${AUTOGEN_SH_SILENT}" ]; then
+ SILENT=" --silent"
+fi
+if test x"$1" = x"--help"; then
+ echo "usage: ./autogen.sh [--silent] [--force] [--build-TYPE] [ARGS]"
+ exit 0
+fi
+if test x"$1" = x"--silent"; then
+ SILENT=" --silent"
+ shift
+fi
+if test x"$1" = x"--force"; then
FORCE=" --force"
shift
fi
+
# Reject unsafe characters in $HOME, $tsdir and cwd. We consider spaces
# as unsafe because it is too easy to get scripts wrong in this regard.
am_lf='
'
case `pwd` in
*[\;\\\"\#\$\&\'\`$am_lf\ \ ]*)
- echo "unsafe working directory name"; DIE=yes;;
+ fatal "unsafe working directory name" ;;
esac
case $tsdir in
*[\;\\\"\#\$\&\'\`$am_lf\ \ ]*)
- echo "unsafe source directory: \`$tsdir'"; DIE=yes;;
+ fatal "unsafe source directory: \`$tsdir'" ;;
esac
case $HOME in
*[\;\\\"\#\$\&\'\`$am_lf\ \ ]*)
- echo "unsafe home directory: \`$HOME'"; DIE=yes;;
+ fatal "unsafe home directory: \`$HOME'" ;;
esac
-if test "$DIE" = "yes"; then
- exit 1
-fi
+die_p
-# Begin list of optional variables sourced from ~/.gnupg-autogen.rc
+
+# List of variables sourced from autogen.rc. The strings '@SYSROOT@' in
+# these variables are replaced by the actual system root.
+configure_opts=
+extraoptions=
+# List of optional variables sourced from autogen.rc and ~/.gnupg-autogen.rc
w32_toolprefixes=
w32_extraoptions=
w32ce_toolprefixes=
w32ce_extraoptions=
+w64_toolprefixes=
+w64_extraoptions=
amd64_toolprefixes=
# End list of optional variables sourced from ~/.gnupg-autogen.rc
# What follows are variables which are sourced but default to
# environment variables or lacking them hardcoded values.
#w32root=
#w32ce_root=
+#w64root=
#amd64root=
-if [ -f "$HOME/.gnupg-autogen.rc" ]; then
- echo "sourcing extra definitions from $HOME/.gnupg-autogen.rc"
- . "$HOME/.gnupg-autogen.rc"
-fi
-
# Convenience option to use certain configure options for some hosts.
myhost=""
myhostsub=""
case "$1" in
--build-w32)
myhost="w32"
+ shift
+ ;;
+ --build-w32ce)
+ myhost="w32"
+ myhostsub="ce"
+ shift
+ ;;
+ --build-w64)
+ myhost="w32"
+ myhostsub="64"
+ shift
+ ;;
+ --build-amd64)
+ myhost="amd64"
+ shift
;;
--build*)
- echo "**Error**: invalid build option $1" >&2
- exit 1
+ fatal "**Error**: invalid build option $1"
+ shift
;;
*)
;;
esac
+die_p
+
+# Source our configuration
+if [ -f "${tsdir}/autogen.rc" ]; then
+ . "${tsdir}/autogen.rc"
+fi
+
+# Source optional site specific configuration
+if [ -f "$HOME/.gnupg-autogen.rc" ]; then
+ info "sourcing extra definitions from $HOME/.gnupg-autogen.rc"
+ . "$HOME/.gnupg-autogen.rc"
+fi
-# ***** W32 build script *******
-# Used to cross-compile for Windows.
+# ******************
+# W32 build script
+# ******************
if [ "$myhost" = "w32" ]; then
- shift
- if [ ! -f $tsdir/config.guess ]; then
- echo "$tsdir/config.guess not found" >&2
+ if [ ! -f "$tsdir/build-aux/config.guess" ]; then
+ fatal "$tsdir/build-aux/config.guess not found"
exit 1
fi
- build=`$tsdir/config.guess`
+ build=`$tsdir/build-aux/config.guess`
case $myhostsub in
+ ce)
+ w32root="$w32ce_root"
+ [ -z "$w32root" ] && w32root="$HOME/w32ce_root"
+ toolprefixes="$w32ce_toolprefixes arm-mingw32ce"
+ extraoptions="$extraoptions $w32ce_extraoptions"
+ ;;
+ 64)
+ w32root="$w64root"
+ [ -z "$w32root" ] && w32root="$HOME/w64root"
+ toolprefixes="$w64_toolprefixes x86_64-w64-mingw32"
+ extraoptions="$extraoptions $w64_extraoptions"
+ ;;
*)
[ -z "$w32root" ] && w32root="$HOME/w32root"
toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
- extraoptions="$w32_extraoptions"
+ extraoptions="$extraoptions $w32_extraoptions"
;;
esac
- echo "Using $w32root as standard install directory" >&2
+ info "Using $w32root as standard install directory"
+ replace_sysroot
# Locate the cross compiler
crossbindir=
@@ -124,11 +215,57 @@ if [ "$myhost" = "w32" ]; then
fi
done
if [ -z "$crossbindir" ]; then
- echo "Cross compiler kit not installed" >&2
- if [ -z "$sub" ]; then
- echo "Under Debian GNU/Linux, you may install it using" >&2
- echo " apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2
+ fatal "cross compiler kit not installed"
+ if [ -z "$myhostsub" ]; then
+ info "Under Debian GNU/Linux, you may install it using"
+ info " apt-get install mingw32 mingw32-runtime mingw32-binutils"
+ fi
+ die_p
+ fi
+
+ if [ -f "$tsdir/config.log" ]; then
+ if ! head $tsdir/config.log | grep "$host" >/dev/null; then
+ fatal "Please run a 'make distclean' first"
+ die_p
+ fi
+ fi
+
+ $tsdir/configure --enable-maintainer-mode ${SILENT} \
+ --prefix=${w32root} \
+ --host=${host} --build=${build} \
+ ${configure_opts} ${extraoptions} "$@"
+ rc=$?
+ exit $rc
+fi
+# ***** end W32 build script *******
+
+# ***** AMD64 cross build script *******
+# Used to cross-compile for AMD64 (for testing)
+if [ "$myhost" = "amd64" ]; then
+ shift
+ if [ ! -f $tsdir/build-aux/config.guess ]; then
+ echo "$tsdir/build-aux/config.guess not found" >&2
+ exit 1
+ fi
+ build=`$tsdir/build-aux/config.guess`
+
+ [ -z "$amd64root" ] && amd64root="$HOME/amd64root"
+ info "Using $amd64root as standard install directory"
+ replace_sysroot
+
+ toolprefixes="$amd64_toolprefixes x86_64-linux-gnu amd64-linux-gnu"
+
+ # Locate the cross compiler
+ crossbindir=
+ for host in $toolprefixes ; do
+ if ${host}-gcc --version >/dev/null 2>&1 ; then
+ crossbindir=/usr/${host}/bin
+ conf_CC="CC=${host}-gcc"
+ break;
fi
+ done
+ if [ -z "$crossbindir" ]; then
+ echo "Cross compiler kit not installed" >&2
echo "Stop." >&2
exit 1
fi
@@ -140,20 +277,14 @@ if [ "$myhost" = "w32" ]; then
fi
fi
- $tsdir/configure ${conf_CC} --build=${build} --host=${host} \
- --prefix=${w32root} \
- --with-zlib=${w32root} \
- --with-gpg-error-prefix=${w32root} \
- --with-gpgme-prefix=${w32root} \
- --with-libassuan-prefix=${w32root} \
- --with-libiconv-prefix=${w32root} \
- SYSROOT="$w32root" \
- PKG_CONFIG="$w32root/bin/pkg-config" \
- PKG_CONFIG_LIBDIR="$w32root/lib/pkgconfig" "$@"
+ $tsdir/configure --enable-maintainer-mode ${SILENT} \
+ --prefix=${amd64root} \
+ --host=${host} --build=${build} \
+ ${configure_opts} ${extraoptions} "$@"
rc=$?
exit $rc
fi
-# ***** end W32 build script *******
+# ***** end AMD64 cross build script *******
# Grep the required versions from configure.ac
@@ -169,12 +300,15 @@ q
}' ${configure_ac}`
automake_vers_num=`echo "$automake_vers" | cvtver`
-gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
-s/^.*(\(.*\))/\1/p
+if [ -d "${tsdir}/po" ]; then
+ gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
+s/^.*\[\(.*\)])/\1/p
q
}' ${configure_ac}`
-gettext_vers_num=`echo "$gettext_vers" | cvtver`
-
+ gettext_vers_num=`echo "$gettext_vers" | cvtver`
+else
+ gettext_vers="n/a"
+fi
if [ -z "$autoconf_vers" -o -z "$automake_vers" -o -z "$gettext_vers" ]
then
@@ -189,59 +323,71 @@ fi
if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
fi
-if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
- check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
+if [ "$gettext_vers" != "n/a" ]; then
+ if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
+ check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
+ fi
fi
-if test "$DIE" = "yes"; then
+if [ "$DIE" = "yes" ]; then
cat <<EOF
Note that you may use alternative versions of the tools by setting
-the corresponding environment variables; see README.CVS for details.
+the corresponding environment variables; see README.GIT for details.
EOF
- exit 1
+ die_p
fi
# Check the git setup.
if [ -d .git ]; then
+ CP="cp -a"
+ [ -z "${SILENT}" ] && CP="$CP -v"
if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
- cat <<EOF >&2
+ [ -z "${SILENT}" ] && cat <<EOF
*** Activating trailing whitespace git pre-commit hook. ***
For more information see this thread:
http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084html
To deactivate this pre-commit hook again move .git/hooks/pre-commit
and .git/hooks/pre-commit.sample out of the way.
EOF
- cp .git/hooks/pre-commit.sample .git/hooks/pre-commit
+ $CP .git/hooks/pre-commit.sample .git/hooks/pre-commit
chmod +x .git/hooks/pre-commit
fi
- tmp=$(git config --get filter.cleanpo.clean)
- if [ "$tmp" != "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
- then
- echo "*** Adding GIT filter.cleanpo.clean configuration." >&2
- git config --add filter.cleanpo.clean \
+
+ if [ "$gettext_vers" != "n/a" ]; then
+ tmp=$(git config --get filter.cleanpo.clean)
+ if [ "$tmp" != \
+ "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
+ then
+ info "*** Adding GIT filter.cleanpo.clean configuration."
+ git config --add filter.cleanpo.clean \
"awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
+ fi
fi
if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
- cat <<EOF >&2
+ [ -z "${SILENT}" ] && cat <<EOF
*** Activating commit log message check hook. ***
EOF
- cp build-aux/git-hooks/commit-msg .git/hooks/commit-msg
+ $CP build-aux/git-hooks/commit-msg .git/hooks/commit-msg
chmod +x .git/hooks/commit-msg
fi
fi
-echo "Running aclocal -I m4 ${ACLOCAL_FLAGS:+$ACLOCAL_FLAGS }..."
-$ACLOCAL -I m4 $ACLOCAL_FLAGS
-echo "Running autoheader..."
+aclocal_flags="-I m4"
+if [ -n "${extra_aclocal_flags}" ]; then
+ aclocal_flags="${aclocal_flags} ${extra_aclocal_flags}"
+fi
+if [ -n "${ACLOCAL_FLAGS}" ]; then
+ aclocal_flags="${aclocal_flags} ${ACLOCAL_FLAGS}"
+fi
+info "Running $ACLOCAL ${aclocal_flags} ..."
+$ACLOCAL ${aclocal_flags}
+info "Running autoheader..."
$AUTOHEADER
-echo "Running automake --gnu ..."
+info "Running automake --gnu ..."
$AUTOMAKE --gnu;
-echo "Running autoconf${FORCE} ..."
+info "Running autoconf${FORCE} ..."
$AUTOCONF${FORCE}
-
-echo "You may now run \"
- ./configure --enable-maintainer-mode && make
-"
+info "You may now run:${am_lf} ${final_info}"
commit e432add8990e6e01488ef67fcc644b2cddbfc60d
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jan 9 19:14:09 2014 +0100
Move helper scripts to build-aux/.
* config.guess, config.rpath, config.sub, depcomp
* install-sh, mdate-sh, missing: Move to build-aux/.
* configure.ac (AC_CONFIG_AUX_DIR): New.
(AM_SILENT_RULES): New.
* Makefile.am (EXTRA_DIST): Remove config.rpath.
diff --git a/Makefile.am b/Makefile.am
index 5b08a12..78379d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ AUTOMAKE_OPTIONS = dist-bzip2
SUBDIRS = m4 src po pixmaps doc
EXTRA_DIST = \
- config.rpath TODO to-utf8 autogen.sh gpa.spec \
+ autogen.sh TODO to-utf8 gpa.spec \
gpa.desktop gpa.png gpadefs.h.in \
po/ChangeLog-2011 pixmaps/ChangeLog-2011 ChangeLog-2011 \
m4/ChangeLog-2011 src/ChangeLog-2011 st-fonts/ChangeLog-2011
diff --git a/config.guess b/build-aux/config.guess
similarity index 100%
rename from config.guess
rename to build-aux/config.guess
diff --git a/config.rpath b/build-aux/config.rpath
similarity index 100%
rename from config.rpath
rename to build-aux/config.rpath
diff --git a/config.sub b/build-aux/config.sub
similarity index 100%
rename from config.sub
rename to build-aux/config.sub
diff --git a/depcomp b/build-aux/depcomp
similarity index 100%
rename from depcomp
rename to build-aux/depcomp
diff --git a/install-sh b/build-aux/install-sh
similarity index 100%
rename from install-sh
rename to build-aux/install-sh
diff --git a/mdate-sh b/build-aux/mdate-sh
similarity index 100%
rename from mdate-sh
rename to build-aux/mdate-sh
diff --git a/missing b/build-aux/missing
similarity index 100%
rename from missing
rename to build-aux/missing
diff --git a/configure.ac b/configure.ac
index 1e44068..c836ba0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ NEED_LIBASSUAN_VERSION=1.1.0
NEED_GPGME_API=1
NEED_GPGME_VERSION=1.5.0
-
+AC_CONFIG_AUX_DIR([build-aux])
AM_CONFIG_HEADER(config.h)
AC_CONFIG_SRCDIR(src/gpa.c)
AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
@@ -105,6 +105,7 @@ AH_BOTTOM([
AM_MAINTAINER_MODE
+AM_SILENT_RULES
dnl Check for libraries
AC_CHECK_LIB(m, sin)
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +-
autogen.rc | 14 ++
autogen.sh | 288 ++++++++++++++++++++++++--------
config.guess => build-aux/config.guess | 0
config.rpath => build-aux/config.rpath | 0
config.sub => build-aux/config.sub | 0
depcomp => build-aux/depcomp | 0
install-sh => build-aux/install-sh | 0
mdate-sh => build-aux/mdate-sh | 0
missing => build-aux/missing | 0
configure.ac | 3 +-
11 files changed, 234 insertions(+), 73 deletions(-)
create mode 100644 autogen.rc
rename config.guess => build-aux/config.guess (100%)
rename config.rpath => build-aux/config.rpath (100%)
rename config.sub => build-aux/config.sub (100%)
rename depcomp => build-aux/depcomp (100%)
rename install-sh => build-aux/install-sh (100%)
rename mdate-sh => build-aux/mdate-sh (100%)
rename missing => build-aux/missing (100%)
hooks/post-receive
--
The GNU Privacy Assistant
http://git.gnupg.org
More information about the Gnupg-commits
mailing list