Updated the CVS build stuff
This commit is contained in:
Werner Koch
parent
215da10c1c
commit
b5c66f75ba
@ -4,7 +4,11 @@
|
||||
|
||||
* configure.ac: Bumbed LT_Revision; now at C12/A1/R1.
|
||||
(NEED_GPGSM_VERSION): Set to 1.9.3.
|
||||
|
||||
(min_automake_version): Added.
|
||||
* README.CVS: New.
|
||||
* Makefile.am (EXTRA_DIST): Added README.CVS.
|
||||
* autogen.sh: Updated.
|
||||
|
||||
2003-11-19 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* acinclude.m4: Add AM_PATH_GPG_ERROR.
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
EXTRA_DIST = README-alpha autogen.sh gpgme.spec.in
|
||||
EXTRA_DIST = README-alpha autogen.sh gpgme.spec.in README.CVS
|
||||
|
||||
if BUILD_ASSUAN
|
||||
assuan = assuan
|
||||
|
||||
8
README
8
README
@ -27,13 +27,7 @@ If configure can't find the `gpgsm' binary in your path, you can
|
||||
specify the location with the --with-gpgsm=/path/to/gpgsm argument to
|
||||
configure.
|
||||
|
||||
Before building the CVS version following the generic install
|
||||
instructions in `INSTALL', you need to set up the build scripts with
|
||||
`./autogen.sh'. To build the W32 version, use `./autogen.sh
|
||||
--build-w32'. You also need to enable maintainer mode at configure
|
||||
time with `--enable-maintainer-mode', or the documentation will not
|
||||
built (because the version.texi won't be generated unless maintainer
|
||||
mode is enabled).
|
||||
For building the CVS version please see the file README.CVS
|
||||
|
||||
Please subscribe to the gnupg-devel@gnupg.org mailing list if you want
|
||||
to do serious work.
|
||||
|
||||
51
README.CVS
Normal file
51
README.CVS
Normal file
@ -0,0 +1,51 @@
|
||||
If you are building from CVS, run the script
|
||||
|
||||
./autogen.sh
|
||||
|
||||
first, to make sure that you have all the necessary maintainer tools
|
||||
are installed and to build the actual configuration files. Then run
|
||||
|
||||
./configure --enable-maintainer-mode
|
||||
|
||||
followed by the usual make.
|
||||
|
||||
If autogen.sh complains about insufficient versions of the required
|
||||
tools, or the tools are not installed, you may use environment
|
||||
variables to override the default tool names:
|
||||
|
||||
AUTOMAKE_SUFFIX is used as a suffix for all tools from the automake
|
||||
package. For example
|
||||
AUTOMAKE_SUFFIX="-1.7" ./autogen.sh
|
||||
uses "automake-1.7" and "aclocal-1.7.
|
||||
AUTOMAKE_PREFIX is used as a prefix for all tools from the automake
|
||||
page and may be combined with AUTOMAKE_SUFFIX. e.g.:
|
||||
AUTOMAKE_PREFIX=/usr/foo/bin ./autogen.sh
|
||||
uses "automake" and "aclocal" in the /usr/foo/bin
|
||||
directory.
|
||||
AUTOCONF_SUFFIX is used as a suffix for all tools from the automake
|
||||
package
|
||||
AUTOCONF_PREFIX is used as a prefix for all tools from the automake
|
||||
package
|
||||
GETTEXT_SUFFIX is used as a suffix for all tools from the gettext
|
||||
package
|
||||
GETTEXT_PREFIX is used as a prefix for all tools from the gettext
|
||||
package
|
||||
|
||||
It is also possible to use the variable name AUTOMAKE, AUTOCONF,
|
||||
ACLOCAL, AUTOHEADER, GETTEXT and MSGMERGE to directly specify the name
|
||||
of the programs to run. It is however better to use the suffix and
|
||||
prefix forms as described above because that does not require
|
||||
knowledge about the actual tools used by autgen.sh.
|
||||
|
||||
|
||||
Please don't use autopoint, libtoolize or autoreconf unless you are
|
||||
the current maintainer and want to update the standard configuration
|
||||
files. All those files should be in the CVS and only updated manually
|
||||
if the maintainer decides that newer versions are required. The
|
||||
maintainer should also make sure that the required version of automake
|
||||
et al. are properly indicated at the top of configure.ac and take care
|
||||
to copy the files and not merely use symlinks.
|
||||
|
||||
|
||||
|
||||
|
||||
221
autogen.sh
221
autogen.sh
@ -1,149 +1,100 @@
|
||||
#!/bin/sh
|
||||
# Run this to generate all the initial makefiles, etc.
|
||||
# It is only needed for the CVS version.
|
||||
#! /bin/sh
|
||||
# Run this to generate all the initial makefiles, etc.
|
||||
#
|
||||
# Copyright (C) 2003 g10 Code GmbH
|
||||
#
|
||||
# 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.
|
||||
|
||||
PGM=GPGME
|
||||
lib_config_files=""
|
||||
autoconf_vers=2.53
|
||||
automake_vers=1.7
|
||||
aclocal_vers=1.5
|
||||
libtool_vers=1.4
|
||||
configure_ac="configure.ac"
|
||||
|
||||
cvtver () {
|
||||
awk 'NR==1 {split($NF,A,".");X=1000000*A[1]+1000*A[2]+A[3];print X;exit 0}'
|
||||
}
|
||||
|
||||
check_version () {
|
||||
if [ $(( `("$1" --version || echo "0") | cvtver` >= $2 )) == 1 ]; then
|
||||
return 0
|
||||
fi
|
||||
echo "**Error**: "\`$1\'" not installed or too old." >&2
|
||||
echo ' Version '$3' or newer is required.' >&2
|
||||
[ -n "$4" ] && echo ' Note that this is part of '\`$4\''.' >&2
|
||||
DIE="yes"
|
||||
return 1
|
||||
}
|
||||
|
||||
|
||||
# Grep the required versions from configure.ac
|
||||
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=/ {
|
||||
s/^.*="\(.*\)"/\1/p
|
||||
q
|
||||
}' ${configure_ac}`
|
||||
automake_vers_num=`echo "$automake_vers" | cvtver`
|
||||
|
||||
#gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
|
||||
#s/^.*(\(.*\))/\1/p
|
||||
#q
|
||||
#}' ${configure_ac}`
|
||||
#gettext_vers_num=`echo "$gettext_vers" | cvtver`
|
||||
|
||||
|
||||
if [ -z "$autoconf_vers" -o -z "$automake_vers" ]
|
||||
then
|
||||
echo "**Error**: version information not found in "\`${configure_ac}\'"." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Allow to override the default tool names
|
||||
AUTOCONF=${AUTOCONF_PREFIX}${AUTOCONF:-autoconf}${AUTOCONF_SUFFIX}
|
||||
AUTOHEADER=${AUTOCONF_PREFIX}${AUTOHEADER:-autoheader}${AUTOCONF_SUFFIX}
|
||||
|
||||
AUTOMAKE=${AUTOMAKE_PREFIX}${AUTOMAKE:-automake}${AUTOMAKE_SUFFIX}
|
||||
ACLOCAL=${AUTOMAKE_PREFIX}${ACLOCAL:-aclocal}${AUTOMAKE_SUFFIX}
|
||||
|
||||
#GETTEXT=${GETTEXT_PREFIX}${GETTEXT:-gettext}${GETTEXT_SUFFIX}
|
||||
#MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
|
||||
|
||||
DIE=no
|
||||
if test "$1" = "--build-w32"; then
|
||||
shift
|
||||
target=i386--mingw32
|
||||
if [ ! -f ./config.guess ]; then
|
||||
echo "./config.guess not found" >&2
|
||||
exit 1
|
||||
fi
|
||||
host=`./config.guess`
|
||||
|
||||
if ! mingw32 --version >/dev/null; then
|
||||
echo "We need at least version 0.3 of MingW32/CPD" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -f config.h ]; then
|
||||
if grep HAVE_DOSISH_SYSTEM config.h | grep undef >/dev/null; then
|
||||
echo "Pease run a 'make distclean' first" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
crossinstalldir=`mingw32 --install-dir`
|
||||
crossbindir=`mingw32 --get-bindir 2>/dev/null` \
|
||||
|| crossbindir="$crossinstalldir/bin"
|
||||
crossdatadir=`mingw32 --get-datadir 2>/dev/null` \
|
||||
|| crossdatadir="$crossinstalldir/share"
|
||||
crosslibdir=`mingw32 --get-libdir 2>/dev/null` \
|
||||
|| crosslibdir="$crossinstalldir/i386--mingw32/lib"
|
||||
crossincdir=`mingw32 --get-includedir 2>/dev/null` \
|
||||
|| crossincdir="$crossinstalldir/i386--mingw32/include"
|
||||
CC=`mingw32 --get-path gcc`
|
||||
CPP=`mingw32 --get-path cpp`
|
||||
AR=`mingw32 --get-path ar`
|
||||
RANLIB=`mingw32 --get-path ranlib`
|
||||
export CC CPP AR RANLIB
|
||||
|
||||
disable_foo_tests=""
|
||||
if [ -n "$lib_config_files" ]; then
|
||||
for i in $lib_config_files; do
|
||||
j=`echo $i | tr '[a-z-]' '[A-Z_]'`
|
||||
eval "$j=${crossbindir}/$i"
|
||||
export $j
|
||||
disable_foo_tests="$disable_foo_tests --disable-`echo $i| \
|
||||
sed 's,-config$,,'`-test"
|
||||
if [ ! -f "${crossbindir}/$i" ]; then
|
||||
echo "$i not installed for MingW32" >&2
|
||||
DIE=yes
|
||||
fi
|
||||
done
|
||||
fi
|
||||
[ $DIE = yes ] && exit 1
|
||||
|
||||
./configure --host=${host} --target=${target} ${disable_foo_tests} \
|
||||
--bindir=${crossbindir} --libdir=${crosslibdir} \
|
||||
--datadir=${crossdatadir} --includedir=${crossincdir} \
|
||||
--enable-maintainer-mode $*
|
||||
exit $?
|
||||
if check_version $AUTOCONF $autoconf_vers_num $autoconf_vers ; then
|
||||
check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if (autoconf --version) < /dev/null > /dev/null 2>&1 ; then
|
||||
if (autoconf --version | awk 'NR==1 { if( $3 >= '$autoconf_vers') \
|
||||
exit 1; exit 0; }');
|
||||
then
|
||||
echo "**Error**: "\`autoconf\'" is too old."
|
||||
echo ' (version ' $autoconf_vers ' or newer is required)'
|
||||
DIE="yes"
|
||||
fi
|
||||
else
|
||||
echo
|
||||
echo "**Error**: You must have "\`autoconf\'" installed to compile $PGM."
|
||||
echo ' (version ' $autoconf_vers ' or newer is required)'
|
||||
DIE="yes"
|
||||
fi
|
||||
|
||||
if (automake --version) < /dev/null > /dev/null 2>&1 ; then
|
||||
if (automake --version | awk 'NR==1 { if( $4 >= '$automake_vers') \
|
||||
exit 1; exit 0; }');
|
||||
then
|
||||
echo "**Error**: "\`automake\'" is too old."
|
||||
echo ' (version ' $automake_vers ' or newer is required)'
|
||||
DIE="yes"
|
||||
fi
|
||||
if (aclocal --version) < /dev/null > /dev/null 2>&1; then
|
||||
if (aclocal --version | awk 'NR==1 { if( $4 >= '$aclocal_vers' ) \
|
||||
exit 1; exit 0; }' );
|
||||
then
|
||||
echo "**Error**: "\`aclocal\'" is too old."
|
||||
echo ' (version ' $aclocal_vers ' or newer is required)'
|
||||
DIE="yes"
|
||||
fi
|
||||
else
|
||||
echo
|
||||
echo "**Error**: Missing "\`aclocal\'". The version of "\`automake\'
|
||||
echo " installed doesn't appear recent enough."
|
||||
DIE="yes"
|
||||
fi
|
||||
else
|
||||
echo
|
||||
echo "**Error**: You must have "\`automake\'" installed to compile $PGM."
|
||||
echo ' (version ' $automake_vers ' or newer is required)'
|
||||
DIE="yes"
|
||||
fi
|
||||
|
||||
|
||||
if (libtool --version) < /dev/null > /dev/null 2>&1 ; then
|
||||
if (libtool --version | awk 'NR==1 { if( $4 >= '$libtool_vers') \
|
||||
exit 1; exit 0; }');
|
||||
then
|
||||
echo "**Error**: "\`libtool\'" is too old."
|
||||
echo ' (version ' $libtool_vers ' or newer is required)'
|
||||
DIE="yes"
|
||||
fi
|
||||
else
|
||||
echo
|
||||
echo "**Error**: You must have "\`libtool\'" installed to compile $PGM."
|
||||
echo ' (version ' $libtool_vers ' or newer is required)'
|
||||
DIE="yes"
|
||||
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
|
||||
#fi
|
||||
|
||||
if test "$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.
|
||||
|
||||
EOF
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Running libtoolize... Ignore non-fatal messages."
|
||||
echo "no" | libtoolize
|
||||
|
||||
|
||||
echo "Running aclocal..."
|
||||
aclocal
|
||||
echo "Running aclocal -I m4 ..."
|
||||
$ACLOCAL -I m4
|
||||
echo "Running autoheader..."
|
||||
autoheader
|
||||
echo "Running automake --gnu -a ..."
|
||||
automake --gnu -a
|
||||
$AUTOHEADER
|
||||
echo "Running automake --gnu ..."
|
||||
$AUTOMAKE --gnu;
|
||||
echo "Running autoconf..."
|
||||
autoconf
|
||||
$AUTOCONF
|
||||
|
||||
echo "You may now run \"./configure --enable-maintainer-mode && make\"."
|
||||
|
||||
@ -20,6 +20,9 @@
|
||||
|
||||
# (Process this file with autoconf to produce a configure script.)
|
||||
|
||||
AC_PREREQ(2.57)
|
||||
min_automake_version="1.7.6"
|
||||
|
||||
# Version number: Remember to change it immediately *after* a release.
|
||||
AC_INIT(gpgme, 0.4.4, [bug-gpgme@gnupg.org])
|
||||
# LT Version numbers, remember to change them just *before* a release.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user