1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00

Don't link gpgv with libreadline

Also add a useful .gitignore file.
This commit is contained in:
Werner Koch 2011-02-23 14:29:59 +01:00
parent 75d62be9c5
commit d0a9b8a9fb
36 changed files with 416 additions and 37703 deletions

View file

@ -1,3 +1,7 @@
2011-02-23 Werner Koch <wk@g10code.com>
* autogen.sh: Add git setup checking.
2010-10-18 Werner Koch <wk@g10code.com>
* config.guess: Update to version 2010-09-24.
@ -90,7 +94,7 @@
2005-03-30 Werner Koch <wk@g10code.com>
* w32installer.nsi: Allow including of WINPT source. Include
libiconv source.
libiconv source.
* mk-w32-dist: Add code to detect presence of source. Calculate a
build number; add option --build-number to overide.
@ -156,7 +160,7 @@
2004-10-01 Werner Koch <wk@g10code.com>
* mk-w32-dist: Updated from stable branch.
* mk-w32-dist: Updated from stable branch.
* mk-gpg-texi: Changed to use the newer docbook2x-texi utility.
@ -337,7 +341,7 @@
* to catch variations on the basic gpg man page (gpg, gpgv). Mark
options.skel as a config file. Do not include the FAQ/faq.html
twice (in /doc/ and /share/).
2002-01-02 Stefan Bellon <sbellon@sbellon.de>
* build-riscos [__riscos__]: Set filetype of Makefile correctly.
@ -378,7 +382,7 @@
2001-08-07 Werner Koch <wk@gnupg.org>
* autogen.sh: Adjusted --build-w32 for autoconf 2.52
* autogen.sh: Adjusted --build-w32 for autoconf 2.52
2001-07-09 Werner Koch <wk@gnupg.org>
@ -390,11 +394,11 @@
2001-04-19 Werner Koch <wk@gnupg.org>
* autogen.sh: Add VPATH build support for option --build-w32.
* autogen.sh: Add VPATH build support for option --build-w32.
2001-03-12 Werner Koch <wk@gnupg.org>
* config.guess, config.sub: Replaced with the current GNU CVS ones.
* config.guess, config.sub: Replaced with the current GNU CVS ones.
2001-01-18 Werner Koch <wk@gnupg.org>

View file

@ -66,11 +66,11 @@ if test "$1" = "--build-w32"; then
if [ -z "$crossbindir" ]; then
echo "Cross compiler kit not installed" >&2
echo "Under Debian GNU/Linux, you may install it using" >&2
echo " apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2
echo " apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2
echo "Stop." >&2
exit 1
fi
if [ -f "$tsdir/config.log" ]; then
if ! head $tsdir/config.log | grep "$host" >/dev/null; then
echo "Please run a 'make distclean' first" >&2
@ -86,7 +86,7 @@ if test "$1" = "--build-w32"; then
export $j
disable_foo_tests="$disable_foo_tests --disable-`echo $i| \
sed 's,-config$,,'`-test"
if [ ! -f "${crossbindir}/$i" ]; then
if [ ! -f "${crossbindir}/$i" ]; then
echo "$i not installed for MingW32" >&2
DIE=yes
fi
@ -101,7 +101,7 @@ if test "$1" = "--build-w32"; then
fi
# This is the special case to build on a ColdFire platform under
# This is the special case to build on a ColdFire platform under
# the uClinux kernel. Tested on a MCF4249C3 board.
if test "$1" = "--build-coldfire"; then
tmp=`dirname $0`
@ -121,7 +121,7 @@ if test "$1" = "--build-coldfire"; then
exit 1
fi
build=`$tsdir/scripts/config.guess`
if [ -f "$tsdir/config.log" ]; then
if ! head $tsdir/config.log | grep m68k-elf >/dev/null; then
echo "Pease run a 'make distclean' first" >&2
@ -151,7 +151,7 @@ if test "$1" = "--build-coldfire"; then
export $j
disable_foo_tests="$disable_foo_tests --disable-`echo $i| \
sed 's,-config$,,'`-test"
if [ ! -f "${crossbindir}/$i" ]; then
if [ ! -f "${crossbindir}/$i" ]; then
echo "$i not installed for ColdFire" >&2
DIE=yes
fi
@ -176,7 +176,7 @@ if test "$1" = "--build-coldfire"; then
fi
# This is the special case to build on a ColdFire platform under
# This is the special case to build on a ColdFire platform under
# the uClinux kernel with uClinux-dist. Tested on a MCF4249C3 board.
if test "$1" = "--build-uclinux"; then
tmp=`dirname $0`
@ -189,7 +189,7 @@ if test "$1" = "--build-uclinux"; then
fi
build=`$tsdir/scripts/config.guess`
host=m68k-elf
if [ -f "$tsdir/config.log" ]; then
if ! head $tsdir/config.log | grep m68k-elf >/dev/null; then
echo "Please run a 'make distclean' first" >&2
@ -215,19 +215,19 @@ fi
# Grep the required versions from configure.ac
autoconf_vers=`sed -n '/^AC_PREREQ(/ {
autoconf_vers=`sed -n '/^AC_PREREQ(/ {
s/^.*(\(.*\))/\1/p
q
}' ${configure_ac}`
autoconf_vers_num=`echo "$autoconf_vers" | cvtver`
automake_vers=`sed -n '/^min_automake_version=/ {
automake_vers=`sed -n '/^min_automake_version=/ {
s/^.*="\(.*\)"/\1/p
q
}' ${configure_ac}`
automake_vers_num=`echo "$automake_vers" | cvtver`
gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
s/^.*(\(.*\))/\1/p
q
}' ${configure_ac}`
@ -254,21 +254,44 @@ fi
if test "$DIE" = "yes"; then
cat <<EOF
Note that you may use alternative versions of the tools by setting
Note that you may use alternative versions of the tools by setting
the corresponding environment variables; see README.CVS for details.
EOF
exit 1
fi
# Check the git setup.
if [ -d .git ]; then
if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
cat <<EOF >&2
*** 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 -av .git/hooks/pre-commit.sample .git/hooks/pre-commit
chmod -c +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 \
"awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
fi
fi
echo "Running aclocal -I m4 ${ACLOCAL_FLAGS:+$ACLOCAL_FLAGS }..."
$ACLOCAL -I m4 $ACLOCAL_FLAGS
echo "Running autoheader..."
$AUTOHEADER
echo "Running automake --gnu --add-missing..."
$AUTOMAKE --gnu --add-missing;
$AUTOMAKE --gnu --add-missing
echo "Running autoconf..."
$AUTOCONF
echo "You may now run \"./configure --enable-maintainer-mode && make\"."
echo "You may now run
./configure --enable-maintainer-mode && make
"