[Pkg-gnupg-commit] [libassuan] 85/437: * TODO: New. * Makefile.am: Add README.CVS and autogen.sh * README.CVS: New. * autogen.sh: Revamped. * configure.ac: Add automake version number for autgen.sh use.
Eric Dorland
eric at moszumanska.debian.org
Fri May 22 05:33:27 UTC 2015
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository libassuan.
commit 5341231525c872481e1c1a5124c4ff5fa18f417d
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 8 21:15:48 2003 +0000
* TODO: New.
* Makefile.am: Add README.CVS and autogen.sh
* README.CVS: New.
* autogen.sh: Revamped.
* configure.ac: Add automake version number for autgen.sh use.
---
ChangeLog | 8 +++
Makefile.am | 3 +-
README.CVS | 51 ++++++++++++++
TODO | 1 +
autogen.sh | 223 +++++++++++++++++++++--------------------------------------
configure.ac | 2 +
6 files changed, 144 insertions(+), 144 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e893698..d8cf35a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-08 Werner Koch <wk at gnupg.org>
+
+ * TODO: New.
+ * Makefile.am: Add README.CVS and autogen.sh
+ * README.CVS: New.
+ * autogen.sh: Revamped.
+ * configure.ac: Add automake version number for autgen.sh use.
+
2003-11-17 Werner Koch <wk at gnupg.org>
Released 0.6.1.
diff --git a/Makefile.am b/Makefile.am
index 29bb3d7..1171b99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
SUBDIRS = m4 src doc
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = config.rpath config.rpath
+EXTRA_DIST = config.rpath config.rpath autogen.sh README.CVS
+
diff --git a/README.CVS b/README.CVS
new file mode 100644
index 0000000..ae17923
--- /dev/null
+++ b/README.CVS
@@ -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.
+
+
+
+
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..d07955a
--- /dev/null
+++ b/TODO
@@ -0,0 +1 @@
+waitpid is used instead of pth_waitpid
\ No newline at end of file
diff --git a/autogen.sh b/autogen.sh
index c596bd8..4f1205c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,163 +1,100 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-# It is only needed for the CVS version.
-
-# have_version(prog, list of executables, required version)
+#! /bin/sh
+# Run this to generate all the initial makefiles, etc.
+#
+# Copyright (C) 2003 g10 Code GmbH
#
-# Returns true and sets $prog to the first executable with the
-# required minimum major.minor.
-have_version ()
-{
- found=0
-
- for prog in $2 :
- do
- ver=$($prog --version \
- | gawk '{ if (match($0, /[0-9]+\.[0-9]+/))
- {
- print substr($0, RSTART, RLENGTH); ok=1; exit 0;
- }
- }
-
- END {
- if (! ok)
- exit 1;
- }')
-
- if test $? = 0
- then
- if expr 0$ver '>=' 0$3 >/dev/null 2>&1
- then
- echo Using $prog
- found=1
- export $1="$prog"
- break
- fi
+# 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.
+
+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
- done
-
- if test 0$found = 01
- then
- true
- else
- echo "*** Error. Could not find an appropriate executable for $1 with "
- echo "at least version $3."
- false
- 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
}
-PGM=libassuan
-lib_config_files=""
-autoconf_vers=2.52
-automake_vers=1.5
-aclocal_vers=1.5
-#libtool_vers=1.3
-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
+# 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`
- 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
+automake_vers=`sed -n '/^min_automake_version=/ {
+s/^.*="\(.*\)"/\1/p
+q
+}' ${configure_ac}`
+automake_vers_num=`echo "$automake_vers" | cvtver`
- 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
+#gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
+#s/^.*(\(.*\))/\1/p
+#q
+#}' ${configure_ac}`
+#gettext_vers_num=`echo "$gettext_vers" | cvtver`
- ./configure --host=${host} --target=${target} ${disable_foo_tests} \
- --bindir=${crossbindir} --libdir=${crosslibdir} \
- --datadir=${crossdatadir} --includedir=${crossincdir} \
- --enable-maintainer-mode $*
- exit $?
-fi
-if ! have_version autoconf "$autoconf autoconf" $autoconf_vers
+if [ -z "$autoconf_vers" -o -z "$automake_vers" ]
then
- DIE="yes"
+ echo "**Error**: version information not found in "\`${configure_ac}\'"." >&2
+ exit 1
fi
-if have_version automake "$automake automake automake-1.6" $automake_vers
-then
- if ! have_version aclocal "$aclocal aclocal aclocal-1.6" $aclocal_vers
- then
- DIE='yes'
- fi
-else
- DIE='yes'
-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 (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 $AUTOCONF $autoconf_vers_num $autoconf_vers ; then
+ check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf
+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
#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 gettextize... Ignore non-fatal messages."
-echo "no" | gettextize
-
-echo "Running $aclocal"
-$aclocal -I m4
+echo "Running aclocal -I m4 ..."
+$ACLOCAL -I m4
echo "Running autoheader..."
-autoheader
-echo "Running $automake --gnu -a"
-$automake --gnu -a
-echo "Running $autoconf"
-$autoconf
+$AUTOHEADER
+echo "Running automake --gnu ..."
+$AUTOMAKE --gnu;
+echo "Running autoconf..."
+$AUTOCONF
+
+echo "You may now run \"./configure --enable-maintainer-mode && make\"."
diff --git a/configure.ac b/configure.ac
index c419849..8298991 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,8 @@
# 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.
# Add a "-cvs" prefix for non-released code.
AC_INIT(libassuan, 0.6.2-cvs, gnupg-devel at gnupg.org)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git
More information about the Pkg-gnupg-commit
mailing list