--- gpgme1.0-1.0.1.orig/debian/patches/10_relibtoolize.dpatch +++ gpgme1.0-1.0.1/debian/patches/10_relibtoolize.dpatch @@ -0,0 +1,3956 @@ +#! /bin/sh -e +## 10_relibtoolize.dpatch by Jose Carlos Garcia Sogo +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad gpgme-1.0.0/aclocal.m4 /tmp/dpep.0oFp0q/gpgme-1.0.0/aclocal.m4 +--- gpgme-1.0.0/aclocal.m4 2004-09-30 04:44:07.000000000 +0200 ++++ /tmp/dpep.0oFp0q/gpgme-1.0.0/aclocal.m4 2004-09-30 19:01:23.000000000 +0200 +@@ -980,7 +980,7 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + + # serial 47 AC_PROG_LIBTOOL +-# Debian $Rev: 203 $ ++# Debian $Rev: 214 $ + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -2414,6 +2414,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + knetbsd*-gnu) + version_type=linux + need_lib_prefix=no +@@ -3144,7 +3156,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd* | knetbsd*-gnu) ++netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +@@ -4138,7 +4150,7 @@ + ;; + esac + ;; +- netbsd* | knetbsd*-gnu) ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -5628,7 +5640,7 @@ + ;; + esac + ;; +- netbsd* | knetbsd*-gnu) ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -6071,7 +6083,7 @@ + fi + ;; + +- netbsd* | knetbsd*-gnu) ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -6489,7 +6501,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd* | knetbsd*-gnu) ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -6881,412 +6893,6 @@ + AC_MSG_RESULT([$SED]) + ]) + +-dnl ## +-dnl ## GNU Pth - The GNU Portable Threads +-dnl ## Copyright (c) 1999-2002 Ralf S. Engelschall +-dnl ## +-dnl ## This file is part of GNU Pth, a non-preemptive thread scheduling +-dnl ## library which can be found at http://www.gnu.org/software/pth/. +-dnl ## +-dnl ## This library is free software; you can redistribute it and/or +-dnl ## modify it under the terms of the GNU Lesser General Public +-dnl ## License as published by the Free Software Foundation; either +-dnl ## version 2.1 of the License, or (at your option) any later version. +-dnl ## +-dnl ## This library is distributed in the hope that it will be useful, +-dnl ## but WITHOUT ANY WARRANTY; without even the implied warranty of +-dnl ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-dnl ## Lesser General Public License for more details. +-dnl ## +-dnl ## You should have received a copy of the GNU Lesser General Public +-dnl ## License along with this library; if not, write to the Free Software +-dnl ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +-dnl ## USA, or contact Ralf S. Engelschall . +-dnl ## +-dnl ## pth.m4: Autoconf macro for locating GNU Pth from within +-dnl ## configure.in of third-party software packages +-dnl ## +- +-dnl ## +-dnl ## Synopsis: +-dnl ## AC_CHECK_PTH([MIN-VERSION [, # minimum Pth version, e.g. 1.2.0 +-dnl ## DEFAULT-WITH-PTH [, # default value for --with-pth option +-dnl ## DEFAULT-WITH-PTH-TEST [,# default value for --with-pth-test option +-dnl ## EXTEND-VARS [, # whether CFLAGS/LDFLAGS/etc are extended +-dnl ## ACTION-IF-FOUND [, # action to perform if Pth was found +-dnl ## ACTION-IF-NOT-FOUND # action to perform if Pth was not found +-dnl ## ]]]]]]) +-dnl ## Examples: +-dnl ## AC_CHECK_PTH(1.2.0) +-dnl ## AC_CHECK_PTH(1.2.0,,,no,CFLAGS="$CFLAGS -DHAVE_PTH $PTH_CFLAGS") +-dnl ## AC_CHECK_PTH(1.2.0,yes,yes,yes,CFLAGS="$CFLAGS -DHAVE_PTH") +-dnl ## +-dnl +-dnl # auxilliary macros +-AC_DEFUN(_AC_PTH_ERROR, [dnl +-AC_MSG_RESULT([*FAILED*]) +-dnl define(_ac_pth_line,dnl +-dnl "+------------------------------------------------------------------------+") +-dnl echo " _ac_pth_line" 1>&2 +-cat <>/ /' 1>&2 +-$1 +-EOT +-dnl echo " _ac_pth_line" 1>&2 +-dnl undefine(_ac_pth_line) +-exit 1 +-]) +-AC_DEFUN(_AC_PTH_VERBOSE, [dnl +-if test ".$verbose" = .yes; then +- AC_MSG_RESULT([ $1]) +-fi +-]) +-dnl # the user macro +-AC_DEFUN(AC_CHECK_PTH, [dnl +-dnl +-dnl # prerequisites +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_CPP])dnl +-dnl +-PTH_CPPFLAGS='' +-PTH_CFLAGS='' +-PTH_LDFLAGS='' +-PTH_LIBS='' +-AC_SUBST(PTH_CPPFLAGS) +-AC_SUBST(PTH_CFLAGS) +-AC_SUBST(PTH_LDFLAGS) +-AC_SUBST(PTH_LIBS) +-dnl # command line options +-AC_MSG_CHECKING(for GNU Pth) +-_AC_PTH_VERBOSE([]) +-AC_ARG_WITH(pth,dnl +-[ --with-pth[=ARG] Build with GNU Pth Library (default=]ifelse([$2],,yes,$2)[)],dnl +-,dnl +-with_pth="ifelse([$2],,yes,$2)" +-)dnl +-AC_ARG_WITH(pth-test,dnl +-[ --with-pth-test Perform GNU Pth Sanity Test (default=]ifelse([$3],,yes,$3)[)],dnl +-,dnl +-with_pth_test="ifelse([$3],,yes,$3)" +-)dnl +-_AC_PTH_VERBOSE([+ Command Line Options:]) +-_AC_PTH_VERBOSE([ o --with-pth=$with_pth]) +-_AC_PTH_VERBOSE([ o --with-pth-test=$with_pth_test]) +-dnl +-dnl # configuration +-if test ".$with_pth" != .no; then +- _pth_subdir=no +- _pth_subdir_opts='' +- case "$with_pth" in +- subdir:* ) +- _pth_subdir=yes +- changequote(, )dnl +- _pth_subdir_opts=`echo $with_pth | sed -e 's/^subdir:[^ ]*[ ]*//'` +- with_pth=`echo $with_pth | sed -e 's/^subdir:\([^ ]*\).*$/\1/'` +- changequote([, ])dnl +- ;; +- esac +- _pth_version="" +- _pth_location="" +- _pth_type="" +- _pth_cppflags="" +- _pth_cflags="" +- _pth_ldflags="" +- _pth_libs="" +- if test ".$with_pth" = .yes; then +- # via config script in $PATH +- changequote(, )dnl +- _pth_version=`(pth-config --version) 2>/dev/null |\ +- sed -e 's/^.*\([0-9]\.[0-9]*[ab.][0-9]*\).*$/\1/'` +- changequote([, ])dnl +- if test ".$_pth_version" != .; then +- _pth_location=`pth-config --prefix` +- _pth_type='installed' +- _pth_cppflags=`pth-config --cflags` +- _pth_cflags=`pth-config --cflags` +- _pth_ldflags=`pth-config --ldflags` +- _pth_libs=`pth-config --libs` +- fi +- elif test -d "$with_pth"; then +- with_pth=`echo $with_pth | sed -e 's;/*$;;'` +- _pth_found=no +- # via locally included source tree +- if test ".$_pth_subdir" = .yes; then +- _pth_location="$with_pth" +- _pth_type='local' +- _pth_cppflags="-I$with_pth" +- _pth_cflags="-I$with_pth" +- if test -f "$with_pth/ltconfig"; then +- _pth_ldflags="-L$with_pth/.libs" +- else +- _pth_ldflags="-L$with_pth" +- fi +- _pth_libs="-lpth" +- changequote(, )dnl +- _pth_version=`grep '^const char PTH_Hello' $with_pth/pth_vers.c |\ +- sed -e 's;^.*Version[ ]*\([0-9]*\.[0-9]*[.ab][0-9]*\)[ ].*$;\1;'` +- changequote([, ])dnl +- _pth_found=yes +- ac_configure_args="$ac_configure_args --enable-subdir $_pth_subdir_opts" +- with_pth_test=no +- fi +- # via config script under a specified directory +- # (a standard installation, but not a source tree) +- if test ".$_pth_found" = .no; then +- for _dir in $with_pth/bin $with_pth; do +- if test -f "$_dir/pth-config"; then +- test -f "$_dir/pth-config.in" && continue # pth-config in source tree! +- changequote(, )dnl +- _pth_version=`($_dir/pth-config --version) 2>/dev/null |\ +- sed -e 's/^.*\([0-9]\.[0-9]*[ab.][0-9]*\).*$/\1/'` +- changequote([, ])dnl +- if test ".$_pth_version" != .; then +- _pth_location=`$_dir/pth-config --prefix` +- _pth_type="installed" +- _pth_cppflags=`$_dir/pth-config --cflags` +- _pth_cflags=`$_dir/pth-config --cflags` +- _pth_ldflags=`$_dir/pth-config --ldflags` +- _pth_libs=`$_dir/pth-config --libs` +- _pth_found=yes +- break +- fi +- fi +- done +- fi +- # in any subarea under a specified directory +- # (either a special installation or a Pth source tree) +- if test ".$_pth_found" = .no; then +- changequote(, )dnl +- _pth_found=0 +- for _file in x `find $with_pth -name "pth.h" -type f -print`; do +- test .$_file = .x && continue +- _dir=`echo $_file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'` +- _pth_version=`($_dir/pth-config --version) 2>/dev/null |\ +- sed -e 's/^.*\([0-9]\.[0-9]*[ab.][0-9]*\).*$/\1/'` +- if test ".$_pth_version" = .; then +- _pth_version=`grep '^#define PTH_VERSION_STR' $_file |\ +- sed -e 's;^#define[ ]*PTH_VERSION_STR[ ]*"\([0-9]*\.[0-9]*[.ab][0-9]*\)[ ].*$;\1;'` +- fi +- _pth_cppflags="-I$_dir" +- _pth_cflags="-I$_dir" +- _pth_found=`expr $_pth_found + 1` +- done +- for _file in x `find $with_pth -name "libpth.[aso]" -type f -print`; do +- test .$_file = .x && continue +- _dir=`echo $_file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'` +- _pth_ldflags="-L$_dir" +- _pth_libs="-lpth" +- _pth_found=`expr $_pth_found + 1` +- done +- changequote([, ])dnl +- if test ".$_pth_found" = .2; then +- _pth_location="$with_pth" +- _pth_type="uninstalled" +- else +- _pth_version='' +- fi +- fi +- fi +- _AC_PTH_VERBOSE([+ Determined Location:]) +- _AC_PTH_VERBOSE([ o path: $_pth_location]) +- _AC_PTH_VERBOSE([ o type: $_pth_type]) +- if test ".$_pth_version" = .; then +- with_pth=no +- else +-dnl if test ".$with_pth" != .yes; then +-dnl _AC_PTH_ERROR([dnl +-dnl Unable to locate GNU Pth under $with_pth. +-dnl Please specify the correct path to either a GNU Pth installation tree +-dnl (use --with-pth=DIR if you used --prefix=DIR for installing GNU Pth in +-dnl the past) or to a GNU Pth source tree (use --with-pth=DIR if DIR is a +-dnl path to a pth-X.Y.Z/ directory; but make sure the package is already +-dnl built, i.e., the "configure; make" step was already performed there).]) +-dnl else +-dnl _AC_PTH_ERROR([dnl +-dnl Unable to locate GNU Pth in any system-wide location (see \$PATH). +-dnl Please specify the correct path to either a GNU Pth installation tree +-dnl (use --with-pth=DIR if you used --prefix=DIR for installing GNU Pth in +-dnl the past) or to a GNU Pth source tree (use --with-pth=DIR if DIR is a +-dnl path to a pth-X.Y.Z/ directory; but make sure the package is already +-dnl built, i.e., the "configure; make" step was already performed there).]) +-dnl fi +-dnl fi +- dnl # +- dnl # Check whether the found version is sufficiently new +- dnl # +- _req_version="ifelse([$1],,1.0.0,$1)" +- for _var in _pth_version _req_version; do +- eval "_val=\"\$${_var}\"" +- _major=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\1/'` +- _minor=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\2/'` +- _rtype=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\3/'` +- _micro=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\4/'` +- case $_rtype in +- "a" ) _rtype=0 ;; +- "b" ) _rtype=1 ;; +- "." ) _rtype=2 ;; +- esac +- _hex=`echo dummy | awk '{ printf("%d%02d%1d%02d", major, minor, rtype, micro); }' \ +- "major=$_major" "minor=$_minor" "rtype=$_rtype" "micro=$_micro"` +- eval "${_var}_hex=\"\$_hex\"" +- done +- _AC_PTH_VERBOSE([+ Determined Versions:]) +- _AC_PTH_VERBOSE([ o existing: $_pth_version -> 0x$_pth_version_hex]) +- _AC_PTH_VERBOSE([ o required: $_req_version -> 0x$_req_version_hex]) +- _ok=0 +- if test ".$_pth_version_hex" != .; then +- if test ".$_req_version_hex" != .; then +- if test $_pth_version_hex -ge $_req_version_hex; then +- _ok=1 +- fi +- fi +- fi +- if test ".$_ok" = .0; then +- _AC_PTH_ERROR([dnl +- Found Pth version $_pth_version, but required at least version $_req_version. +- Upgrade Pth under $_pth_location to $_req_version or higher first, please.]) +- fi +- dnl # +- dnl # Perform Pth Sanity Compile Check +- dnl # +- if test ".$with_pth_test" = .yes; then +- _ac_save_CPPFLAGS="$CPPFLAGS" +- _ac_save_CFLAGS="$CFLAGS" +- _ac_save_LDFLAGS="$LDFLAGS" +- _ac_save_LIBS="$LIBS" +- CPPFLAGS="$CPPFLAGS $_pth_cppflags" +- CFLAGS="$CFLAGS $_pth_cflags" +- LDFLAGS="$LDFLAGS $_pth_ldflags" +- LIBS="$LIBS $_pth_libs" +- _AC_PTH_VERBOSE([+ Test Build Environment:]) +- _AC_PTH_VERBOSE([ o CPPFLAGS=\"$CPPFLAGS\"]) +- _AC_PTH_VERBOSE([ o CFLAGS=\"$CFLAGS\"]) +- _AC_PTH_VERBOSE([ o LDFLAGS=\"$LDFLAGS\"]) +- _AC_PTH_VERBOSE([ o LIBS=\"$LIBS\"]) +- cross_compile=no +- define(_code1, [dnl +- #include +- #include +- ]) +- define(_code2, [dnl +- int main(int argc, char *argv[]) +- { +- FILE *fp; +- if (!(fp = fopen("conftestval", "w"))) +- exit(1); +- fprintf(fp, "hmm"); +- fclose(fp); +- pth_init(); +- pth_kill(); +- if (!(fp = fopen("conftestval", "w"))) +- exit(1); +- fprintf(fp, "yes"); +- fclose(fp); +- exit(0); +- } +- ]) +- _AC_PTH_VERBOSE([+ Performing Sanity Checks:]) +- _AC_PTH_VERBOSE([ o pre-processor test]) +- AC_TRY_CPP(_code1, _ok=yes, _ok=no) +- if test ".$_ok" != .yes; then +- _AC_PTH_ERROR([dnl +- Found GNU Pth $_pth_version under $_pth_location, but +- was unable to perform a sanity pre-processor check. This means +- the GNU Pth header pth.h was not found. +- We used the following build environment: +- >> CPP="$CPP" +- >> CPPFLAGS="$CPPFLAGS" +- See config.log for possibly more details.]) +- fi +- _AC_PTH_VERBOSE([ o link check]) +- AC_TRY_LINK(_code1, _code2, _ok=yes, _ok=no) +- if test ".$_ok" != .yes; then +- _AC_PTH_ERROR([dnl +- Found GNU Pth $_pth_version under $_pth_location, but +- was unable to perform a sanity linker check. This means +- the GNU Pth library libpth.a was not found. +- We used the following build environment: +- >> CC="$CC" +- >> CFLAGS="$CFLAGS" +- >> LDFLAGS="$LDFLAGS" +- >> LIBS="$LIBS" +- See config.log for possibly more details.]) +- fi +- _AC_PTH_VERBOSE([ o run-time check]) +- AC_TRY_RUN(_code1 _code2, _ok=`cat conftestval`, _ok=no, _ok=no) +- if test ".$_ok" != .yes; then +- if test ".$_ok" = .no; then +- _AC_PTH_ERROR([dnl +- Found GNU Pth $_pth_version under $_pth_location, but +- was unable to perform a sanity execution check. This usually +- means that the GNU Pth shared library libpth.so is present +- but \$LD_LIBRARY_PATH is incomplete to execute a Pth test. +- In this case either disable this test via --without-pth-test, +- or extend \$LD_LIBRARY_PATH, or build GNU Pth as a static +- library only via its --disable-shared Autoconf option. +- We used the following build environment: +- >> CC="$CC" +- >> CFLAGS="$CFLAGS" +- >> LDFLAGS="$LDFLAGS" +- >> LIBS="$LIBS" +- See config.log for possibly more details.]) +- else +- _AC_PTH_ERROR([dnl +- Found GNU Pth $_pth_version under $_pth_location, but +- was unable to perform a sanity run-time check. This usually +- means that the GNU Pth library failed to work and possibly +- caused a core dump in the test program. In this case it +- is strongly recommended that you re-install GNU Pth and this +- time make sure that it really passes its "make test" procedure. +- We used the following build environment: +- >> CC="$CC" +- >> CFLAGS="$CFLAGS" +- >> LDFLAGS="$LDFLAGS" +- >> LIBS="$LIBS" +- See config.log for possibly more details.]) +- fi +- fi +- _extendvars="ifelse([$4],,yes,$4)" +- if test ".$_extendvars" != .yes; then +- CPPFLAGS="$_ac_save_CPPFLAGS" +- CFLAGS="$_ac_save_CFLAGS" +- LDFLAGS="$_ac_save_LDFLAGS" +- LIBS="$_ac_save_LIBS" +- fi +- else +- _extendvars="ifelse([$4],,yes,$4)" +- if test ".$_extendvars" = .yes; then +- if test ".$_pth_subdir" = .yes; then +- CPPFLAGS="$CPPFLAGS $_pth_cppflags" +- CFLAGS="$CFLAGS $_pth_cflags" +- LDFLAGS="$LDFLAGS $_pth_ldflags" +- LIBS="$LIBS $_pth_libs" +- fi +- fi +- fi +- PTH_CPPFLAGS="$_pth_cppflags" +- PTH_CFLAGS="$_pth_cflags" +- PTH_LDFLAGS="$_pth_ldflags" +- PTH_LIBS="$_pth_libs" +- AC_SUBST(PTH_CPPFLAGS) +- AC_SUBST(PTH_CFLAGS) +- AC_SUBST(PTH_LDFLAGS) +- AC_SUBST(PTH_LIBS) +- _AC_PTH_VERBOSE([+ Final Results:]) +- _AC_PTH_VERBOSE([ o PTH_CPPFLAGS=\"$PTH_CPPFLAGS\"]) +- _AC_PTH_VERBOSE([ o PTH_CFLAGS=\"$PTH_CFLAGS\"]) +- _AC_PTH_VERBOSE([ o PTH_LDFLAGS=\"$PTH_LDFLAGS\"]) +- _AC_PTH_VERBOSE([ o PTH_LIBS=\"$PTH_LIBS\"]) +-fi +-fi +-if test ".$with_pth" != .no; then +- AC_MSG_RESULT([version $_pth_version, $_pth_type under $_pth_location]) +- ifelse([$5], , :, [$5]) +-else +- AC_MSG_RESULT([no]) +- ifelse([$6], , :, [$6]) +-fi +-]) +- + # glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) + dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. + dnl This file is free software, distributed under the terms of the GNU +@@ -7320,22 +6926,13 @@ + ] + ) + +-# gpg-error.m4 - autoconf macro to detect libgpg-error. +-# Copyright (C) 2002, 2003, 2004 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 file 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. ++dnl Autoconf macros for libgpg-error + + dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, + dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) + dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS + dnl +-AC_DEFUN([AM_PATH_GPG_ERROR], ++AC_DEFUN(AM_PATH_GPG_ERROR, + [ AC_ARG_WITH(gpg-error-prefix, + AC_HELP_STRING([--with-gpg-error-prefix=PFX], + [prefix where GPG Error is installed (optional)]), +diff -urNad gpgme-1.0.0/compile /tmp/dpep.0oFp0q/gpgme-1.0.0/compile +--- gpgme-1.0.0/compile 2004-09-30 19:00:01.000000000 +0200 ++++ /tmp/dpep.0oFp0q/gpgme-1.0.0/compile 2004-09-30 19:00:02.000000000 +0200 +@@ -28,6 +28,14 @@ + # compile PROGRAM [ARGS]... + # `-o FOO.o' is removed from the args passed to the actual compile. + ++# Usage statement added by Billy Biggs . ++if [ -z $1 ]; then ++ echo "Wrapper for compilers which do not understand '-c -o'." ++ echo "usage: compile PROGRAM [ARGS]..." ++ echo "'-o FOO.o' is removed from the args passed to the actual compile." ++ exit 1 ++fi ++ + prog=$1 + shift + +diff -urNad gpgme-1.0.0/config.guess /tmp/dpep.0oFp0q/gpgme-1.0.0/config.guess +--- gpgme-1.0.0/config.guess 2004-04-19 16:11:50.000000000 +0200 ++++ /tmp/dpep.0oFp0q/gpgme-1.0.0/config.guess 2004-09-30 19:01:16.000000000 +0200 +@@ -1,9 +1,9 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + +-timestamp='2004-01-05' ++timestamp='2004-08-13' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -53,7 +53,7 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO +@@ -197,15 +197,21 @@ + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit 0 ;; ++ amd64:OpenBSD:*:*) ++ echo x86_64-unknown-openbsd${UNAME_RELEASE} ++ exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} ++ cats:OpenBSD:*:*) ++ echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; ++ luna88k:OpenBSD:*:*) ++ echo m88k-unknown-openbsd${UNAME_RELEASE} ++ exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; +@@ -221,28 +227,33 @@ + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; +- pegasos:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; + sgi:OpenBSD:*:*) +- echo mipseb-unknown-openbsd${UNAME_RELEASE} ++ echo mips64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; ++ *:ekkoBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} ++ exit 0 ;; ++ macppc:MirBSD:*:*) ++ echo powerppc-unknown-mirbsd${UNAME_RELEASE} ++ exit 0 ;; ++ *:MirBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit 0 ;; + alpha:OSF1:*:*) +- if test $UNAME_RELEASE = "V4.0"; then ++ case $UNAME_RELEASE in ++ *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +- fi ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU +@@ -280,14 +291,12 @@ + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac ++ # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; +- Alpha*:OpenVMS:*:*) +- echo alpha-hp-vms ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? +@@ -405,6 +414,9 @@ + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit 0 ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit 0 ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; +@@ -740,7 +752,7 @@ + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + *:UNICOS/mp:*:*) +- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +@@ -763,21 +775,7 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; + *:FreeBSD:*:*) +- # Determine whether the default compiler uses glibc. +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #if __GLIBC__ >= 2 +- LIBC=gnu +- #else +- LIBC= +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using +- # FreeBSD's kernel, but not the complete OS. +- case ${LIBC} in gnu) kernel_only='k' ;; esac +- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} ++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin +@@ -829,6 +827,9 @@ + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit 0 ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; +@@ -1069,9 +1070,9 @@ + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; +- M68*:*:R3V[567]*:*) ++ M68*:*:R3V[5678]*:*) + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` +@@ -1169,9 +1170,10 @@ + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Darwin:*:*) +- case `uname -p` in ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in + *86) UNAME_PROCESSOR=i686 ;; +- powerpc) UNAME_PROCESSOR=powerpc ;; ++ unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit 0 ;; +@@ -1230,9 +1232,16 @@ + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit 0 ;; +- *:DRAGONFLY:*:*) +- echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} ++ *:DragonFly:*:*) ++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ A*) echo alpha-dec-vms && exit 0 ;; ++ I*) echo ia64-dec-vms && exit 0 ;; ++ V*) echo vax-dec-vms && exit 0 ;; ++ esac + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 +diff -urNad gpgme-1.0.0/config.sub /tmp/dpep.0oFp0q/gpgme-1.0.0/config.sub +--- gpgme-1.0.0/config.sub 2004-04-19 16:11:50.000000000 +0200 ++++ /tmp/dpep.0oFp0q/gpgme-1.0.0/config.sub 2004-09-30 19:01:16.000000000 +0200 +@@ -1,9 +1,9 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + +-timestamp='2004-01-05' ++timestamp='2004-06-24' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -70,7 +70,7 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO +@@ -145,7 +145,7 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis) ++ -apple | -axis | -knuth | -cray) + os= + basic_machine=$1 + ;; +@@ -237,7 +237,7 @@ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ +- | m32r | m68000 | m68k | m88k | mcore \ ++ | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -262,7 +262,7 @@ + | pyramid \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ ++ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ +@@ -300,7 +300,7 @@ + | avr-* \ + | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ +- | clipper-* | cydra-* \ ++ | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ +@@ -308,7 +308,7 @@ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ +- | m32r-* \ ++ | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ +@@ -326,8 +326,9 @@ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ ++ | mmix-* \ + | msp430-* \ +- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ ++ | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ +@@ -336,7 +337,7 @@ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ +- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ +@@ -363,6 +364,9 @@ + basic_machine=a29k-amd + os=-udi + ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout +@@ -442,12 +446,24 @@ + basic_machine=j90-cray + os=-unicos + ;; ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp ++ ;; ++ cr16c) ++ basic_machine=cr16c-unknown ++ os=-elf ++ ;; + crds | unos) + basic_machine=m68k-crds + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; ++ crx) ++ basic_machine=crx-unknown ++ os=-elf ++ ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; +@@ -648,10 +664,6 @@ + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; +- mmix*) +- basic_machine=mmix-knuth +- os=-mmixware +- ;; + monitor) + basic_machine=m68k-rom68k + os=-coff +@@ -732,10 +744,6 @@ + np1) + basic_machine=np1-gould + ;; +- nv1) +- basic_machine=nv1-cray +- os=-unicosmp +- ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -1048,6 +1056,9 @@ + romp) + basic_machine=romp-ibm + ;; ++ mmix) ++ basic_machine=mmix-knuth ++ ;; + rs6000) + basic_machine=rs6000-ibm + ;; +@@ -1070,7 +1081,7 @@ + sh64) + basic_machine=sh64-unknown + ;; +- sparc | sparcv9 | sparcv9b) ++ sparc | sparcv8 | sparcv9 | sparcv9b) + basic_machine=sparc-sun + ;; + cydra) +@@ -1143,8 +1154,9 @@ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ +- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ ++ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ++ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ +@@ -1362,6 +1374,9 @@ + *-ibm) + os=-aix + ;; ++ *-knuth) ++ os=-mmixware ++ ;; + *-wec) + os=-proelf + ;; +diff -urNad gpgme-1.0.0/configure /tmp/dpep.0oFp0q/gpgme-1.0.0/configure +--- gpgme-1.0.0/configure 2004-09-30 04:44:16.000000000 +0200 ++++ /tmp/dpep.0oFp0q/gpgme-1.0.0/configure 2004-09-30 19:01:31.000000000 +0200 +@@ -466,7 +466,7 @@ + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LIBGPGME_LT_CURRENT LIBGPGME_LT_AGE LIBGPGME_LT_REVISION EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL HAVE_LD_VERSION_SCRIPT_TRUE HAVE_LD_VERSION_SCRIPT_FALSE PTH_CPPFLAGS PTH_CFLAGS PTH_LDFLAGS PTH_LIBS HAVE_DOSISH_SYSTEM_TRUE HAVE_DOSISH_SYSTEM_FALSE HAVE_PTH_TRUE HAVE_PTH_FALSE HAVE_PTHREAD_TRUE HAVE_PTHREAD_FALSE LIBOBJS GLIBC21 GPG_ERROR_CONFIG GPG_ERROR_CFLAGS GPG_ERROR_LIBS GPG RUN_GPG_TESTS_TRUE RUN_GPG_TESTS_FALSE GPG_PATH GPGSM HAVE_GPGSM_TRUE HAVE_GPGSM_FALSE RUN_GPGSM_TESTS_TRUE RUN_GPGSM_TESTS_FALSE BUILD_ASSUAN_TRUE BUILD_ASSUAN_FALSE BUILD_COMPLUS_TRUE BUILD_COMPLUS_FALSE GPGME_CONFIG_API_VERSION GPGME_CONFIG_LIBS GPGME_CONFIG_CFLAGS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LIBGPGME_LT_CURRENT LIBGPGME_LT_AGE LIBGPGME_LT_REVISION EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL HAVE_LD_VERSION_SCRIPT_TRUE HAVE_LD_VERSION_SCRIPT_FALSE HAVE_DOSISH_SYSTEM_TRUE HAVE_DOSISH_SYSTEM_FALSE HAVE_PTH_TRUE HAVE_PTH_FALSE HAVE_PTHREAD_TRUE HAVE_PTHREAD_FALSE LIBOBJS GLIBC21 GPG_ERROR_CONFIG GPG_ERROR_CFLAGS GPG_ERROR_LIBS GPG RUN_GPG_TESTS_TRUE RUN_GPG_TESTS_FALSE GPG_PATH GPGSM HAVE_GPGSM_TRUE HAVE_GPGSM_FALSE RUN_GPGSM_TESTS_TRUE RUN_GPGSM_TESTS_FALSE BUILD_ASSUAN_TRUE BUILD_ASSUAN_FALSE BUILD_COMPLUS_TRUE BUILD_COMPLUS_FALSE GPGME_CONFIG_API_VERSION GPGME_CONFIG_LIBS GPGME_CONFIG_CFLAGS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -1049,8 +1049,6 @@ + both] + --with-tags[=TAGS] + include additional configurations [automatic] +- --with-pth=ARG Build with GNU Pth Library (default=yes) +- --with-pth-test Perform GNU Pth Sanity Test (default=yes) + --with-gpg-error-prefix=PFX + prefix where GPG Error is installed (optional) + --with-gpg=PATH use GnuPG binary at PATH +@@ -3583,7 +3581,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd* | knetbsd*-gnu) ++netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -3700,7 +3698,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 3703 "configure"' > conftest.$ac_ext ++ echo '#line 3701 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -5257,7 +5255,7 @@ + + + # Provide some information about the compiler. +-echo "$as_me:5260:" \ ++echo "$as_me:5258:" \ + "checking for Fortran 77 compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` + { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +@@ -6289,11 +6287,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6292: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6290: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6296: \$? = $ac_status" >&5 ++ echo "$as_me:6294: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -6522,11 +6520,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6525: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6523: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6529: \$? = $ac_status" >&5 ++ echo "$as_me:6527: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -6582,11 +6580,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6585: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6583: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:6589: \$? = $ac_status" >&5 ++ echo "$as_me:6587: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -6759,7 +6757,7 @@ + fi + ;; + +- netbsd* | knetbsd*-gnu) ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -7277,7 +7275,7 @@ + link_all_deplibs=yes + ;; + +- netbsd* | knetbsd*-gnu) ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -7926,6 +7924,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + knetbsd*-gnu) + version_type=linux + need_lib_prefix=no +@@ -8758,7 +8768,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext </dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -10922,7 +10932,7 @@ + ;; + esac + ;; +- netbsd* | knetbsd*-gnu) ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -11033,11 +11043,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11036: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11046: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:11040: \$? = $ac_status" >&5 ++ echo "$as_me:11050: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -11093,11 +11103,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11096: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11106: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:11100: \$? = $ac_status" >&5 ++ echo "$as_me:11110: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -11618,6 +11628,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + knetbsd*-gnu) + version_type=linux + need_lib_prefix=no +@@ -12450,7 +12472,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:13400: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:13382: \$? = $ac_status" >&5 ++ echo "$as_me:13404: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -13435,11 +13457,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13438: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13460: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13442: \$? = $ac_status" >&5 ++ echo "$as_me:13464: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -13612,7 +13634,7 @@ + fi + ;; + +- netbsd* | knetbsd*-gnu) ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -14110,7 +14132,7 @@ + link_all_deplibs_F77=yes + ;; + +- netbsd* | knetbsd*-gnu) ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -14759,6 +14781,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + knetbsd*-gnu) + version_type=linux + need_lib_prefix=no +@@ -15468,11 +15502,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15471: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15505: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15475: \$? = $ac_status" >&5 ++ echo "$as_me:15509: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -15701,11 +15735,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15704: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15738: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15708: \$? = $ac_status" >&5 ++ echo "$as_me:15742: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -15761,11 +15795,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15764: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15798: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15768: \$? = $ac_status" >&5 ++ echo "$as_me:15802: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -15938,7 +15972,7 @@ + fi + ;; + +- netbsd* | knetbsd*-gnu) ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -16456,7 +16490,7 @@ + link_all_deplibs_GCJ=yes + ;; + +- netbsd* | knetbsd*-gnu) ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -17105,6 +17139,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + knetbsd*-gnu) + version_type=linux + need_lib_prefix=no +@@ -17937,7 +17983,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5 +-echo $ECHO_N "checking for GNU Pth... $ECHO_C" >&6 +-if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: " >&5 +-echo "${ECHO_T} " >&6 +-fi +- +- +-# Check whether --with-pth or --without-pth was given. +-if test "${with_pth+set}" = set; then +- withval="$with_pth" +- +-else +- with_pth="yes" +- +-fi; +-# Check whether --with-pth-test or --without-pth-test was given. +-if test "${with_pth_test+set}" = set; then +- withval="$with_pth_test" +- +-else +- with_pth_test="yes" +- +-fi; if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: + Command Line Options:" >&5 +-echo "${ECHO_T} + Command Line Options:" >&6 +-fi +- +-if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o --with-pth=$with_pth" >&5 +-echo "${ECHO_T} o --with-pth=$with_pth" >&6 +-fi +- +-if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o --with-pth-test=$with_pth_test" >&5 +-echo "${ECHO_T} o --with-pth-test=$with_pth_test" >&6 +-fi +- +-if test ".$with_pth" != .no; then +- _pth_subdir=no +- _pth_subdir_opts='' +- case "$with_pth" in +- subdir:* ) +- _pth_subdir=yes +- _pth_subdir_opts=`echo $with_pth | sed -e 's/^subdir:[^ ]*[ ]*//'` +- with_pth=`echo $with_pth | sed -e 's/^subdir:\([^ ]*\).*$/\1/'` +- ;; +- esac +- _pth_version="" +- _pth_location="" +- _pth_type="" +- _pth_cppflags="" +- _pth_cflags="" +- _pth_ldflags="" +- _pth_libs="" +- if test ".$with_pth" = .yes; then +- # via config script in $PATH +- _pth_version=`(pth-config --version) 2>/dev/null |\ +- sed -e 's/^.*\([0-9]\.[0-9]*[ab.][0-9]*\).*$/\1/'` +- if test ".$_pth_version" != .; then +- _pth_location=`pth-config --prefix` +- _pth_type='installed' +- _pth_cppflags=`pth-config --cflags` +- _pth_cflags=`pth-config --cflags` +- _pth_ldflags=`pth-config --ldflags` +- _pth_libs=`pth-config --libs` +- fi +- elif test -d "$with_pth"; then +- with_pth=`echo $with_pth | sed -e 's;/*$;;'` +- _pth_found=no +- # via locally included source tree +- if test ".$_pth_subdir" = .yes; then +- _pth_location="$with_pth" +- _pth_type='local' +- _pth_cppflags="-I$with_pth" +- _pth_cflags="-I$with_pth" +- if test -f "$with_pth/ltconfig"; then +- _pth_ldflags="-L$with_pth/.libs" +- else +- _pth_ldflags="-L$with_pth" +- fi +- _pth_libs="-lpth" +- _pth_version=`grep '^const char PTH_Hello' $with_pth/pth_vers.c |\ +- sed -e 's;^.*Version[ ]*\([0-9]*\.[0-9]*[.ab][0-9]*\)[ ].*$;\1;'` +- _pth_found=yes +- ac_configure_args="$ac_configure_args --enable-subdir $_pth_subdir_opts" +- with_pth_test=no +- fi +- # via config script under a specified directory +- # (a standard installation, but not a source tree) +- if test ".$_pth_found" = .no; then +- for _dir in $with_pth/bin $with_pth; do +- if test -f "$_dir/pth-config"; then +- test -f "$_dir/pth-config.in" && continue # pth-config in source tree! +- _pth_version=`($_dir/pth-config --version) 2>/dev/null |\ +- sed -e 's/^.*\([0-9]\.[0-9]*[ab.][0-9]*\).*$/\1/'` +- if test ".$_pth_version" != .; then +- _pth_location=`$_dir/pth-config --prefix` +- _pth_type="installed" +- _pth_cppflags=`$_dir/pth-config --cflags` +- _pth_cflags=`$_dir/pth-config --cflags` +- _pth_ldflags=`$_dir/pth-config --ldflags` +- _pth_libs=`$_dir/pth-config --libs` +- _pth_found=yes +- break +- fi +- fi +- done +- fi +- # in any subarea under a specified directory +- # (either a special installation or a Pth source tree) +- if test ".$_pth_found" = .no; then +- _pth_found=0 +- for _file in x `find $with_pth -name "pth.h" -type f -print`; do +- test .$_file = .x && continue +- _dir=`echo $_file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'` +- _pth_version=`($_dir/pth-config --version) 2>/dev/null |\ +- sed -e 's/^.*\([0-9]\.[0-9]*[ab.][0-9]*\).*$/\1/'` +- if test ".$_pth_version" = .; then +- _pth_version=`grep '^#define PTH_VERSION_STR' $_file |\ +- sed -e 's;^#define[ ]*PTH_VERSION_STR[ ]*"\([0-9]*\.[0-9]*[.ab][0-9]*\)[ ].*$;\1;'` +- fi +- _pth_cppflags="-I$_dir" +- _pth_cflags="-I$_dir" +- _pth_found=`expr $_pth_found + 1` +- done +- for _file in x `find $with_pth -name "libpth.[aso]" -type f -print`; do +- test .$_file = .x && continue +- _dir=`echo $_file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'` +- _pth_ldflags="-L$_dir" +- _pth_libs="-lpth" +- _pth_found=`expr $_pth_found + 1` +- done +- if test ".$_pth_found" = .2; then +- _pth_location="$with_pth" +- _pth_type="uninstalled" +- else +- _pth_version='' +- fi +- fi +- fi +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: + Determined Location:" >&5 +-echo "${ECHO_T} + Determined Location:" >&6 +-fi +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o path: $_pth_location" >&5 +-echo "${ECHO_T} o path: $_pth_location" >&6 +-fi +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o type: $_pth_type" >&5 +-echo "${ECHO_T} o type: $_pth_type" >&6 +-fi +- +- if test ".$_pth_version" = .; then +- with_pth=no +- else +- _req_version="1.2.0" +- for _var in _pth_version _req_version; do +- eval "_val=\"\$${_var}\"" +- _major=`echo $_val | sed 's/\([0-9]*\)\.\([0-9]*\)\([ab.]\)\([0-9]*\)/\1/'` +- _minor=`echo $_val | sed 's/\([0-9]*\)\.\([0-9]*\)\([ab.]\)\([0-9]*\)/\2/'` +- _rtype=`echo $_val | sed 's/\([0-9]*\)\.\([0-9]*\)\([ab.]\)\([0-9]*\)/\3/'` +- _micro=`echo $_val | sed 's/\([0-9]*\)\.\([0-9]*\)\([ab.]\)\([0-9]*\)/\4/'` +- case $_rtype in +- "a" ) _rtype=0 ;; +- "b" ) _rtype=1 ;; +- "." ) _rtype=2 ;; +- esac +- _hex=`echo dummy | awk '{ printf("%d%02d%1d%02d", major, minor, rtype, micro); }' \ +- "major=$_major" "minor=$_minor" "rtype=$_rtype" "micro=$_micro"` +- eval "${_var}_hex=\"\$_hex\"" +- done +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: + Determined Versions:" >&5 +-echo "${ECHO_T} + Determined Versions:" >&6 +-fi +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o existing: $_pth_version -> 0x$_pth_version_hex" >&5 +-echo "${ECHO_T} o existing: $_pth_version -> 0x$_pth_version_hex" >&6 +-fi +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o required: $_req_version -> 0x$_req_version_hex" >&5 +-echo "${ECHO_T} o required: $_req_version -> 0x$_req_version_hex" >&6 +-fi +- +- _ok=0 +- if test ".$_pth_version_hex" != .; then +- if test ".$_req_version_hex" != .; then +- if test $_pth_version_hex -ge $_req_version_hex; then +- _ok=1 +- fi +- fi +- fi +- if test ".$_ok" = .0; then +- echo "$as_me:$LINENO: result: *FAILED*" >&5 +-echo "${ECHO_T}*FAILED*" >&6 +-cat <>/ /' 1>&2 +- Found Pth version $_pth_version, but required at least version $_req_version. +- Upgrade Pth under $_pth_location to $_req_version or higher first, please. +-EOT +-exit 1 +- +- fi +- if test ".$with_pth_test" = .yes; then +- _ac_save_CPPFLAGS="$CPPFLAGS" +- _ac_save_CFLAGS="$CFLAGS" +- _ac_save_LDFLAGS="$LDFLAGS" +- _ac_save_LIBS="$LIBS" +- CPPFLAGS="$CPPFLAGS $_pth_cppflags" +- CFLAGS="$CFLAGS $_pth_cflags" +- LDFLAGS="$LDFLAGS $_pth_ldflags" +- LIBS="$LIBS $_pth_libs" +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: + Test Build Environment:" >&5 +-echo "${ECHO_T} + Test Build Environment:" >&6 +-fi +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o CPPFLAGS=\"$CPPFLAGS\"" >&5 +-echo "${ECHO_T} o CPPFLAGS=\"$CPPFLAGS\"" >&6 +-fi +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o CFLAGS=\"$CFLAGS\"" >&5 +-echo "${ECHO_T} o CFLAGS=\"$CFLAGS\"" >&6 +-fi +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o LDFLAGS=\"$LDFLAGS\"" >&5 +-echo "${ECHO_T} o LDFLAGS=\"$LDFLAGS\"" >&6 +-fi +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o LIBS=\"$LIBS\"" >&5 +-echo "${ECHO_T} o LIBS=\"$LIBS\"" >&6 +-fi +- +- cross_compile=no +- +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: + Performing Sanity Checks:" >&5 +-echo "${ECHO_T} + Performing Sanity Checks:" >&6 +-fi +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o pre-processor test" >&5 +-echo "${ECHO_T} o pre-processor test" >&6 +-fi +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- #include +- #include +- +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- _ok=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- _ok=no +-fi +-rm -f conftest.err conftest.$ac_ext +- if test ".$_ok" != .yes; then +- echo "$as_me:$LINENO: result: *FAILED*" >&5 +-echo "${ECHO_T}*FAILED*" >&6 +-cat <>/ /' 1>&2 +- Found GNU Pth $_pth_version under $_pth_location, but +- was unable to perform a sanity pre-processor check. This means +- the GNU Pth header pth.h was not found. +- We used the following build environment: +- >> CPP="$CPP" +- >> CPPFLAGS="$CPPFLAGS" +- See config.log for possibly more details. +-EOT +-exit 1 +- +- fi +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o link check" >&5 +-echo "${ECHO_T} o link check" >&6 +-fi +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- #include +- #include +- +-int +-main () +-{ +- int main(int argc, char *argv) +- { +- FILE *fp; +- if (!(fp = fopen("conftestval", "w"))) +- exit(1); +- fprintf(fp, "hmm"); +- fclose(fp); +- pth_init(); +- pth_kill(); +- if (!(fp = fopen("conftestval", "w"))) +- exit(1); +- fprintf(fp, "yes"); +- fclose(fp); +- exit(0); +- } +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- _ok=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-_ok=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- if test ".$_ok" != .yes; then +- echo "$as_me:$LINENO: result: *FAILED*" >&5 +-echo "${ECHO_T}*FAILED*" >&6 +-cat <>/ /' 1>&2 +- Found GNU Pth $_pth_version under $_pth_location, but +- was unable to perform a sanity linker check. This means +- the GNU Pth library libpth.a was not found. +- We used the following build environment: +- >> CC="$CC" +- >> CFLAGS="$CFLAGS" +- >> LDFLAGS="$LDFLAGS" +- >> LIBS="$LIBS" +- See config.log for possibly more details. +-EOT +-exit 1 +- +- fi +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o run-time check" >&5 +-echo "${ECHO_T} o run-time check" >&6 +-fi +- +- if test "$cross_compiling" = yes; then +- _ok=no +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- #include +- #include +- int main(int argc, char *argv) +- { +- FILE *fp; +- if (!(fp = fopen("conftestval", "w"))) +- exit(1); +- fprintf(fp, "hmm"); +- fclose(fp); +- pth_init(); +- pth_kill(); +- if (!(fp = fopen("conftestval", "w"))) +- exit(1); +- fprintf(fp, "yes"); +- fclose(fp); +- exit(0); +- } +- +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- _ok=`cat conftestval` +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-_ok=no +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +- if test ".$_ok" != .yes; then +- if test ".$_ok" = .no; then +- echo "$as_me:$LINENO: result: *FAILED*" >&5 +-echo "${ECHO_T}*FAILED*" >&6 +-cat <>/ /' 1>&2 +- Found GNU Pth $_pth_version under $_pth_location, but +- was unable to perform a sanity execution check. This usually +- means that the GNU Pth shared library libpth.so is present +- but \$LD_LIBRARY_PATH is incomplete to execute a Pth test. +- In this case either disable this test via --without-pth-test, +- or extend \$LD_LIBRARY_PATH, or build GNU Pth as a static +- library only via its --disable-shared Autoconf option. +- We used the following build environment: +- >> CC="$CC" +- >> CFLAGS="$CFLAGS" +- >> LDFLAGS="$LDFLAGS" +- >> LIBS="$LIBS" +- See config.log for possibly more details. +-EOT +-exit 1 +- +- else +- echo "$as_me:$LINENO: result: *FAILED*" >&5 +-echo "${ECHO_T}*FAILED*" >&6 +-cat <>/ /' 1>&2 +- Found GNU Pth $_pth_version under $_pth_location, but +- was unable to perform a sanity run-time check. This usually +- means that the GNU Pth library failed to work and possibly +- caused a core dump in the test program. In this case it +- is strongly recommended that you re-install GNU Pth and this +- time make sure that it really passes its "make test" procedure. +- We used the following build environment: +- >> CC="$CC" +- >> CFLAGS="$CFLAGS" +- >> LDFLAGS="$LDFLAGS" +- >> LIBS="$LIBS" +- See config.log for possibly more details. +-EOT +-exit 1 +- +- fi +- fi +- _extendvars="no" +- if test ".$_extendvars" != .yes; then +- CPPFLAGS="$_ac_save_CPPFLAGS" +- CFLAGS="$_ac_save_CFLAGS" +- LDFLAGS="$_ac_save_LDFLAGS" +- LIBS="$_ac_save_LIBS" +- fi +- else +- _extendvars="no" +- if test ".$_extendvars" = .yes; then +- if test ".$_pth_subdir" = .yes; then +- CPPFLAGS="$CPPFLAGS $_pth_cppflags" +- CFLAGS="$CFLAGS $_pth_cflags" +- LDFLAGS="$LDFLAGS $_pth_ldflags" +- LIBS="$LIBS $_pth_libs" +- fi +- fi +- fi +- PTH_CPPFLAGS="$_pth_cppflags" +- PTH_CFLAGS="$_pth_cflags" +- PTH_LDFLAGS="$_pth_ldflags" +- PTH_LIBS="$_pth_libs" +- +- +- +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: + Final Results:" >&5 +-echo "${ECHO_T} + Final Results:" >&6 +-fi +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o PTH_CPPFLAGS=\"$PTH_CPPFLAGS\"" >&5 +-echo "${ECHO_T} o PTH_CPPFLAGS=\"$PTH_CPPFLAGS\"" >&6 +-fi +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o PTH_CFLAGS=\"$PTH_CFLAGS\"" >&5 +-echo "${ECHO_T} o PTH_CFLAGS=\"$PTH_CFLAGS\"" >&6 +-fi +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o PTH_LDFLAGS=\"$PTH_LDFLAGS\"" >&5 +-echo "${ECHO_T} o PTH_LDFLAGS=\"$PTH_LDFLAGS\"" >&6 +-fi +- +- if test ".$verbose" = .yes; then +- echo "$as_me:$LINENO: result: o PTH_LIBS=\"$PTH_LIBS\"" >&5 +-echo "${ECHO_T} o PTH_LIBS=\"$PTH_LIBS\"" >&6 +-fi +- +-fi +-fi +-if test ".$with_pth" != .no; then +- echo "$as_me:$LINENO: result: version $_pth_version, $_pth_type under $_pth_location" >&5 +-echo "${ECHO_T}version $_pth_version, $_pth_type under $_pth_location" >&6 +- have_pth=yes +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +- : +-fi +- ++ AC_CHECK_PTH(1.2.0,,,no,have_pth=yes) + if test "$have_pth" = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -23529,10 +23018,6 @@ + s,@LIBTOOL@,$LIBTOOL,;t t + s,@HAVE_LD_VERSION_SCRIPT_TRUE@,$HAVE_LD_VERSION_SCRIPT_TRUE,;t t + s,@HAVE_LD_VERSION_SCRIPT_FALSE@,$HAVE_LD_VERSION_SCRIPT_FALSE,;t t +-s,@PTH_CPPFLAGS@,$PTH_CPPFLAGS,;t t +-s,@PTH_CFLAGS@,$PTH_CFLAGS,;t t +-s,@PTH_LDFLAGS@,$PTH_LDFLAGS,;t t +-s,@PTH_LIBS@,$PTH_LIBS,;t t + s,@HAVE_DOSISH_SYSTEM_TRUE@,$HAVE_DOSISH_SYSTEM_TRUE,;t t + s,@HAVE_DOSISH_SYSTEM_FALSE@,$HAVE_DOSISH_SYSTEM_FALSE,;t t + s,@HAVE_PTH_TRUE@,$HAVE_PTH_TRUE,;t t +diff -urNad gpgme-1.0.0/depcomp /tmp/dpep.0oFp0q/gpgme-1.0.0/depcomp +--- gpgme-1.0.0/depcomp 2004-09-30 19:00:01.000000000 +0200 ++++ /tmp/dpep.0oFp0q/gpgme-1.0.0/depcomp 2004-09-30 19:00:02.000000000 +0200 +@@ -1,7 +1,7 @@ + #! /bin/sh + + # depcomp - compile a program generating dependencies as side-effects +-# Copyright 1999, 2000 Free Software Foundation, Inc. ++# Copyright 1999, 2000, 2003 Free Software Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -172,19 +172,25 @@ + + aix) + # The C for AIX Compiler uses -M and outputs the dependencies +- # in a .u file. This file always lives in the current directory. +- # Also, the AIX compiler puts `$object:' at the start of each line; +- # $object doesn't have directory information. +- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` ++ # in a .u file. In older versions, this file always lives in the ++ # current directory. Also, the AIX compiler puts `$object:' at the ++ # start of each line; $object doesn't have directory information. ++ # Version 6 uses the directory in both cases. ++ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` + tmpdepfile="$stripped.u" +- outname="$stripped.o" + if test "$libtool" = yes; then + "$@" -Wc,-M + else + "$@" -M + fi +- + stat=$? ++ ++ if test -f "$tmpdepfile"; then : ++ else ++ stripped=`echo "$stripped" | sed 's,^.*/,,'` ++ tmpdepfile="$stripped.u" ++ fi ++ + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" +@@ -192,6 +198,7 @@ + fi + + if test -f "$tmpdepfile"; then ++ outname="$stripped.o" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. +@@ -278,8 +285,8 @@ + fi + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" +- # That's a space and a tab in the []. +- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" ++ # That's a tab and a space in the []. ++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi +@@ -292,7 +299,7 @@ + + dashmstdout) + # Important note: in order to support this mode, a compiler *must* +- # always write the proprocessed file to stdout, regardless of -o. ++ # always write the preprocessed file to stdout, regardless of -o. + "$@" || exit $? + + # Remove the call to Libtool. +@@ -388,7 +395,7 @@ + + cpp) + # Important note: in order to support this mode, a compiler *must* +- # always write the proprocessed file to stdout. ++ # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. +@@ -430,7 +437,7 @@ + + msvisualcpp) + # Important note: in order to support this mode, a compiler *must* +- # always write the proprocessed file to stdout, regardless of -o, ++ # always write the preprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + "$@" || exit $? + IFS=" " +diff -urNad gpgme-1.0.0/doc/texinfo.tex /tmp/dpep.0oFp0q/gpgme-1.0.0/doc/texinfo.tex +--- gpgme-1.0.0/doc/texinfo.tex 2004-09-30 19:00:01.000000000 +0200 ++++ /tmp/dpep.0oFp0q/gpgme-1.0.0/doc/texinfo.tex 2004-09-30 19:00:02.000000000 +0200 +@@ -3,7 +3,7 @@ + % Load plain if necessary, i.e., if running under initex. + \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi + % +-\def\texinfoversion{2003-05-04.08} ++\def\texinfoversion{2003-10-06.08} + % + % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, + % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +@@ -89,6 +89,7 @@ + \let\ptexhat=^ + \let\ptexi=\i + \let\ptexindent=\indent ++\let\ptexnoindent=\noindent + \let\ptexlbrace=\{ + \let\ptexless=< + \let\ptexplus=+ +@@ -258,7 +259,7 @@ + % the page break happens to be in the middle of an example. + \shipout\vbox{% + % Do this early so pdf references go to the beginning of the page. +- \ifpdfmakepagedest \pdfmkdest{\the\pageno} \fi ++ \ifpdfmakepagedest \pdfmkdest{\the\pageno}\fi + % + \ifcropmarks \vbox to \outervsize\bgroup + \hsize = \outerhsize +@@ -887,13 +888,13 @@ + + % @firstparagraphindent WORD + % If WORD is `none', then suppress indentation of the first paragraph +-% after a section heading. If WORD is `insert', then do indentat such ++% after a section heading. If WORD is `insert', then do indent at such + % paragraphs. + % + % The paragraph indentation is suppressed or not by calling +-% \suppressfirstparagraphindent, which the sectioning commands do. We +-% switch the definition of this back and forth according to WORD. By +-% default, we suppress indentation. ++% \suppressfirstparagraphindent, which the sectioning commands do. ++% We switch the definition of this back and forth according to WORD. ++% By default, we suppress indentation. + % + \def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent} + \newdimen\currentparindent +@@ -921,15 +922,24 @@ + % + \gdef\dosuppressfirstparagraphindent{% + \gdef\indent{% +- \global\let\indent=\ptexindent +- \global\everypar = {}% ++ \restorefirstparagraphindent ++ \indent ++ }% ++ \gdef\noindent{% ++ \restorefirstparagraphindent ++ \noindent + }% + \global\everypar = {% +- \kern-\parindent +- \global\let\indent=\ptexindent +- \global\everypar = {}% ++ \kern -\parindent ++ \restorefirstparagraphindent + }% +-}% ++} ++ ++\gdef\restorefirstparagraphindent{% ++ \global \let \indent = \ptexindent ++ \global \let \noindent = \ptexnoindent ++ \global \everypar = {}% ++} + + + % @asis just yields its argument. Used with @table, for example. +@@ -1065,6 +1075,7 @@ + \pdftrue + \pdfoutput = 1 + \input pdfcolor ++ \pdfcatalog{/PageMode /UseOutlines}% + \def\dopdfimage#1#2#3{% + \def\imagewidth{#2}% + \def\imageheight{#3}% +@@ -1094,9 +1105,26 @@ + \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0% + \else \csname#1\endcsname \fi} + \def\advancenumber#1{\tempnum=\expnumber{#1}\relax +- \advance\tempnum by1 ++ \advance\tempnum by 1 + \expandafter\xdef\csname#1\endcsname{\the\tempnum}} +- \def\pdfmakeoutlines{{% ++ % ++ % #1 is the section text. #2 is the pdf expression for the number ++ % of subentries (or empty, for subsubsections). #3 is the node ++ % text, which might be empty if this toc entry had no ++ % corresponding node. #4 is the page number. ++ % ++ \def\dopdfoutline#1#2#3#4{% ++ % Generate a link to the node text if that exists; else, use the ++ % page number. We could generate a destination for the section ++ % text in the case where a section has no node, but it doesn't ++ % seem worthwhile, since most documents are normally structured. ++ \def\pdfoutlinedest{#3}% ++ \ifx\pdfoutlinedest\empty \def\pdfoutlinedest{#4}\fi ++ % ++ \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{#1}% ++ } ++ % ++ \def\pdfmakeoutlines{% + \openin 1 \jobname.toc + \ifeof 1\else\begingroup + \closein 1 +@@ -1104,38 +1132,49 @@ + \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace + \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace + % +- \def\chapentry ##1##2##3{} +- \def\secentry ##1##2##3##4{\advancenumber{chap##2}} +- \def\subsecentry ##1##2##3##4##5{\advancenumber{sec##2.##3}} +- \def\subsubsecentry ##1##2##3##4##5##6{\advancenumber{subsec##2.##3.##4}} +- \let\appendixentry = \chapentry +- \let\unnumbchapentry = \chapentry +- \let\unnumbsecentry = \secentry +- \let\unnumbsubsecentry = \subsecentry +- \let\unnumbsubsubsecentry = \subsubsecentry ++ % Read toc silently, to get counts of subentries for \pdfoutline. ++ \def\numchapentry##1##2##3##4{\def\thischapnum{##2}}% ++ \def\numsecentry##1##2##3##4{% ++ \def\thissecnum{##2}% ++ \advancenumber{chap\thischapnum}}% ++ \def\numsubsecentry##1##2##3##4{% ++ \def\thissubsecnum{##2}% ++ \advancenumber{sec\thissecnum}}% ++ \def\numsubsubsecentry##1##2##3##4{\advancenumber{subsec\thissubsecnum}}% ++ % ++ % use \def rather than \let here because we redefine \chapentry et ++ % al. a second time, below. ++ \def\appentry{\numchapentry}% ++ \def\appsecentry{\numsecentry}% ++ \def\appsubsecentry{\numsubsecentry}% ++ \def\appsubsubsecentry{\numsubsubsecentry}% ++ \def\unnchapentry{\numchapentry}% ++ \def\unnsecentry{\numsecentry}% ++ \def\unnsubsecentry{\numsubsecentry}% ++ \def\unnsubsubsecentry{\numsubsubsecentry}% + \input \jobname.toc +- \def\chapentry ##1##2##3{% +- \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}} +- \def\secentry ##1##2##3##4{% +- \pdfoutline goto name{\pdfmkpgn{##4}}count-\expnumber{sec##2.##3}{##1}} +- \def\subsecentry ##1##2##3##4##5{% +- \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}} +- \def\subsubsecentry ##1##2##3##4##5##6{% +- \pdfoutline goto name{\pdfmkpgn{##6}}{##1}} +- \let\appendixentry = \chapentry +- \let\unnumbchapentry = \chapentry +- \let\unnumbsecentry = \secentry +- \let\unnumbsubsecentry = \subsecentry +- \let\unnumbsubsubsecentry = \subsubsecentry + % +- % Make special characters normal for writing to the pdf file. ++ % Read toc second time, this time actually producing the outlines. ++ % The `-' means take the \expnumber as the absolute number of ++ % subentries, which we calculated on our first read of the .toc above. ++ % ++ % We use the node names as the destinations. ++ \def\numchapentry##1##2##3##4{% ++ \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}% ++ \def\numsecentry##1##2##3##4{% ++ \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}% ++ \def\numsubsecentry##1##2##3##4{% ++ \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}% ++ \def\numsubsubsecentry##1##2##3##4{% count is always zero ++ \dopdfoutline{##1}{}{##3}{##4}}% + % ++ % Make special characters normal for writing to the pdf file. + \indexnofonts +- \let\tt=\relax + \turnoffactive + \input \jobname.toc + \endgroup\fi +- }} ++ } ++ % + \def\makelinks #1,{% + \def\params{#1}\def\E{END}% + \ifx\params\E +@@ -2524,20 +2563,6 @@ + % Prevent errors for section commands. + % Used in @ignore and in failing conditionals. + \def\ignoresections{% +- \let\chapter=\relax +- \let\unnumbered=\relax +- \let\top=\relax +- \let\unnumberedsec=\relax +- \let\unnumberedsection=\relax +- \let\unnumberedsubsec=\relax +- \let\unnumberedsubsection=\relax +- \let\unnumberedsubsubsec=\relax +- \let\unnumberedsubsubsection=\relax +- \let\section=\relax +- \let\subsec=\relax +- \let\subsubsec=\relax +- \let\subsection=\relax +- \let\subsubsection=\relax + \let\appendix=\relax + \let\appendixsec=\relax + \let\appendixsection=\relax +@@ -2545,110 +2570,26 @@ + \let\appendixsubsection=\relax + \let\appendixsubsubsec=\relax + \let\appendixsubsubsection=\relax ++ %\let\begin=\relax ++ %\let\bye=\relax ++ \let\centerchap=\relax ++ \let\chapter=\relax + \let\contents=\relax ++ \let\section=\relax + \let\smallbook=\relax ++ \let\subsec=\relax ++ \let\subsection=\relax ++ \let\subsubsec=\relax ++ \let\subsubsection=\relax + \let\titlepage=\relax +-} +- +-% Used in nested conditionals, where we have to parse the Texinfo source +-% and so want to turn off most commands, in case they are used +-% incorrectly. +-% +-% We use \empty instead of \relax for the @def... commands, so that \end +-% doesn't throw an error. For instance: +-% @ignore +-% @deffn ... +-% @end deffn +-% @end ignore +-% +-% The @end deffn is going to get expanded, because we're trying to allow +-% nested conditionals. But we don't want to expand the actual @deffn, +-% since it might be syntactically correct and intended to be ignored. +-% Since \end checks for \relax, using \empty does not cause an error. +-% +-\def\ignoremorecommands{% +- \let\defcodeindex = \relax +- \let\defcv = \empty +- \let\defcvx = \empty +- \let\Edefcv = \empty +- \let\deffn = \empty +- \let\deffnx = \empty +- \let\Edeffn = \empty +- \let\defindex = \relax +- \let\defivar = \empty +- \let\defivarx = \empty +- \let\Edefivar = \empty +- \let\defmac = \empty +- \let\defmacx = \empty +- \let\Edefmac = \empty +- \let\defmethod = \empty +- \let\defmethodx = \empty +- \let\Edefmethod = \empty +- \let\defop = \empty +- \let\defopx = \empty +- \let\Edefop = \empty +- \let\defopt = \empty +- \let\defoptx = \empty +- \let\Edefopt = \empty +- \let\defspec = \empty +- \let\defspecx = \empty +- \let\Edefspec = \empty +- \let\deftp = \empty +- \let\deftpx = \empty +- \let\Edeftp = \empty +- \let\deftypefn = \empty +- \let\deftypefnx = \empty +- \let\Edeftypefn = \empty +- \let\deftypefun = \empty +- \let\deftypefunx = \empty +- \let\Edeftypefun = \empty +- \let\deftypeivar = \empty +- \let\deftypeivarx = \empty +- \let\Edeftypeivar = \empty +- \let\deftypemethod = \empty +- \let\deftypemethodx = \empty +- \let\Edeftypemethod = \empty +- \let\deftypeop = \empty +- \let\deftypeopx = \empty +- \let\Edeftypeop = \empty +- \let\deftypevar = \empty +- \let\deftypevarx = \empty +- \let\Edeftypevar = \empty +- \let\deftypevr = \empty +- \let\deftypevrx = \empty +- \let\Edeftypevr = \empty +- \let\defun = \empty +- \let\defunx = \empty +- \let\Edefun = \empty +- \let\defvar = \empty +- \let\defvarx = \empty +- \let\Edefvar = \empty +- \let\defvr = \empty +- \let\defvrx = \empty +- \let\Edefvr = \empty +- \let\clear = \relax +- \let\down = \relax +- \let\evenfooting = \relax +- \let\evenheading = \relax +- \let\everyfooting = \relax +- \let\everyheading = \relax +- \let\headings = \relax +- \let\include = \relax +- \let\item = \relax +- \let\lowersections = \relax +- \let\oddfooting = \relax +- \let\oddheading = \relax +- \let\printindex = \relax +- \let\pxref = \relax +- \let\raisesections = \relax +- \let\ref = \relax +- \let\set = \relax +- \let\setchapternewpage = \relax +- \let\setchapterstyle = \relax +- \let\settitle = \relax +- \let\up = \relax +- \let\verbatiminclude = \relax +- \let\xref = \relax ++ \let\top=\relax ++ \let\unnumbered=\relax ++ \let\unnumberedsec=\relax ++ \let\unnumberedsection=\relax ++ \let\unnumberedsubsec=\relax ++ \let\unnumberedsubsection=\relax ++ \let\unnumberedsubsubsec=\relax ++ \let\unnumberedsubsubsection=\relax + } + + % Ignore @ignore, @ifhtml, @ifinfo, and the like. +@@ -2670,140 +2611,77 @@ + % which this file should belong to. Ignore this in TeX. + \let\dircategory = \comment + +-% Ignore text until a line `@end #1'. ++% Ignore text until a line `@end #1', keeping track of nested conditionals. + % ++% A count to remember the depth of nesting. ++\newcount\doignorecount ++ + \def\doignore#1{\begingroup + % Don't complain about control sequences we have declared \outer. + \ignoresections + % +- % Define a command to swallow text until we reach `@end #1'. +- % This @ is a catcode 12 token (that is the normal catcode of @ in +- % this texinfo.tex file). We change the catcode of @ below to match. +- \long\def\doignoretext##1@end #1{\enddoignore}% +- % + % Make sure that spaces turn into tokens that match what \doignoretext wants. + \catcode\spaceChar = 10 + % +- % Ignore braces, too, so mismatched braces don't cause trouble. ++ % Ignore braces, so mismatched braces don't cause trouble. + \catcode`\{ = 9 + \catcode`\} = 9 + % +- % We must not have @c interpreted as a control sequence. +- \catcode`\@ = 12 ++ % Count number of #1's that we've seen. ++ \doignorecount = 0 + % +- \def\ignoreword{#1}% +- \ifx\ignoreword\documentdescriptionword +- % The c kludge breaks documentdescription, since +- % `documentdescription' contains a `c'. Means not everything will +- % be ignored inside @documentdescription, but oh well... +- \else +- % Make the letter c a comment character so that the rest of the line +- % will be ignored. This way, the document can have (for example) +- % @c @end ifinfo +- % and the @end ifinfo will be properly ignored. +- % (We've just changed @ to catcode 12.) +- \catcode`\c = 14 +- \fi ++ % Swallow text until we reach the matching `@end #1'. ++ \expandafter \dodoignore \csname#1\endcsname {#1}% ++} ++ ++{ \catcode`@=11 % We want to use \ST@P which cannot appear in texinfo source. ++ \obeylines % + % +- % And now expand the command defined above. +- \doignoretext ++ \gdef\dodoignore#1#2{% ++ % #1 contains, e.g., \ifinfo, a.k.a. @ifinfo. ++ % #2 contains the string `ifinfo'. ++ % ++ % Define a command to find the next `@end #2', which must be on a line ++ % by itself. ++ \long\def\doignoretext##1^^M\end #2{\doignoretextyyy##1^^M#1\ST@P}% ++ % And this command to find another #1 command, at the beginning of a ++ % line. (Otherwise, we would consider a line `@c @ifset', for ++ % example, to count as an @ifset for nesting.) ++ \long\def\doignoretextyyy##1^^M#1##2\ST@P{\doignoreyyy{##2}\ST@P}% ++ % ++ % And now expand that command. ++ \obeylines % ++ \doignoretext ^^M% ++ }% + } + +-% What we do to finish off ignored text. +-% +-\def\enddoignore{\endgroup\ignorespaces}% ++\def\doignoreyyy#1{% ++ \def\temp{#1}% ++ \ifx\temp\empty % Nothing found. ++ \let\next\doignoretextzzz ++ \else % Found a nested condition, ... ++ \advance\doignorecount by 1 ++ \let\next\doignoretextyyy % ..., look for another. ++ % If we're here, #1 ends with ^^M\ifinfo (for example). ++ \fi ++ \next #1% the token \ST@P is present just after this macro. ++} + +-\newif\ifwarnedobs\warnedobsfalse +-\def\obstexwarn{% +- \ifwarnedobs\relax\else +- % We need to warn folks that they may have trouble with TeX 3.0. +- % This uses \immediate\write16 rather than \message to get newlines. +- \immediate\write16{} +- \immediate\write16{WARNING: for users of Unix TeX 3.0!} +- \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).} +- \immediate\write16{If you are running another version of TeX, relax.} +- \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.} +- \immediate\write16{ Then upgrade your TeX installation if you can.} +- \immediate\write16{ (See ftp://ftp.gnu.org/non-gnu/TeX.README.)} +- \immediate\write16{If you are stuck with version 3.0, run the} +- \immediate\write16{ script ``tex3patch'' from the Texinfo distribution} +- \immediate\write16{ to use a workaround.} +- \immediate\write16{} +- \global\warnedobstrue +- \fi ++% We have to swallow the remaining "\ST@P". ++% ++\def\doignoretextzzz#1{% ++ \ifnum\doignorecount = 0 % We have just found the outermost @end. ++ \let\next\enddoignore ++ \else % Still inside a nested condition. ++ \advance\doignorecount by -1 ++ \let\next\doignoretext % Look for the next @end. ++ \fi ++ \next + } + +-% **In TeX 3.0, setting text in \nullfont hangs tex. For a +-% workaround (which requires the file ``dummy.tfm'' to be installed), +-% uncomment the following line: +-%%%%%\font\nullfont=dummy\let\obstexwarn=\relax ++% Finish off ignored text. ++\def\enddoignore{\endgroup\ignorespaces} + +-% Ignore text, except that we keep track of conditional commands for +-% purposes of nesting, up to an `@end #1' command. +-% +-\def\nestedignore#1{% +- \obstexwarn +- % We must actually expand the ignored text to look for the @end +- % command, so that nested ignore constructs work. Thus, we put the +- % text into a \vbox and then do nothing with the result. To minimize +- % the chance of memory overflow, we follow the approach outlined on +- % page 401 of the TeXbook. +- % +- \setbox0 = \vbox\bgroup +- % Don't complain about control sequences we have declared \outer. +- \ignoresections +- % +- % Define `@end #1' to end the box, which will in turn undefine the +- % @end command again. +- \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}% +- % +- % We are going to be parsing Texinfo commands. Most cause no +- % trouble when they are used incorrectly, but some commands do +- % complicated argument parsing or otherwise get confused, so we +- % undefine them. +- % +- % We can't do anything about stray @-signs, unfortunately; +- % they'll produce `undefined control sequence' errors. +- \ignoremorecommands +- % +- % Set the current font to be \nullfont, a TeX primitive, and define +- % all the font commands to also use \nullfont. We don't use +- % dummy.tfm, as suggested in the TeXbook, because some sites +- % might not have that installed. Therefore, math mode will still +- % produce output, but that should be an extremely small amount of +- % stuff compared to the main input. +- % +- \nullfont +- \let\tenrm=\nullfont \let\tenit=\nullfont \let\tensl=\nullfont +- \let\tenbf=\nullfont \let\tentt=\nullfont \let\smallcaps=\nullfont +- \let\tensf=\nullfont +- % Similarly for index fonts. +- \let\smallrm=\nullfont \let\smallit=\nullfont \let\smallsl=\nullfont +- \let\smallbf=\nullfont \let\smalltt=\nullfont \let\smallsc=\nullfont +- \let\smallsf=\nullfont +- % Similarly for smallexample fonts. +- \let\smallerrm=\nullfont \let\smallerit=\nullfont \let\smallersl=\nullfont +- \let\smallerbf=\nullfont \let\smallertt=\nullfont \let\smallersc=\nullfont +- \let\smallersf=\nullfont +- % +- % Don't complain when characters are missing from the fonts. +- \tracinglostchars = 0 +- % +- % Don't bother to do space factor calculations. +- \frenchspacing +- % +- % Don't report underfull hboxes. +- \hbadness = 10000 +- % +- % Do minimal line-breaking. +- \pretolerance = 10000 +- % +- % Do not execute instructions in @tex. +- \def\tex{\doignore{tex}}% +- % Do not execute macro definitions. +- % `c' is a comment character, so the word `macro' will get cut off. +- \def\macro{\doignore{ma}}% +-} + + % @set VAR sets the variable VAR to an empty value. + % @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE. +@@ -2881,7 +2759,7 @@ + \next + } + \def\ifsetsucceed{\conditionalsucceed{ifset}} +-\def\ifsetfail{\nestedignore{ifset}} ++\def\ifsetfail{\doignore{ifset}} + \defineunmatchedend{ifset} + + % @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been +@@ -2897,7 +2775,7 @@ + \next + } + \def\ifclearsucceed{\conditionalsucceed{ifclear}} +-\def\ifclearfail{\nestedignore{ifclear}} ++\def\ifclearfail{\doignore{ifclear}} + \defineunmatchedend{ifclear} + + % @iftex, @ifnothtml, @ifnotinfo, @ifnotplaintext always succeed; we +@@ -3146,6 +3024,7 @@ + \definedummyword{uref}% + \definedummyword{url}% + \definedummyword{var}% ++ \definedummyword{verb}% + \definedummyword{w}% + % + % Assorted special characters. +@@ -3258,18 +3137,16 @@ + \let\uref=\asis + \let\url=\asis + \let\var=\asis ++ \let\verb=\asis + \let\w=\asis + } + + \let\indexbackslash=0 %overridden during \printindex. + \let\SETmarginindex=\relax % put index entries in margin (undocumented)? + +-% For \ifx comparisons. +-\def\emptymacro{\empty} +- + % Most index entries go through here, but \dosubind is the general case. + % +-\def\doind#1#2{\dosubind{#1}{#2}\empty} ++\def\doind#1#2{\dosubind{#1}{#2}{}} + + % Workhorse for all \fooindexes. + % #1 is name of index, #2 is stuff to put there, #3 is subentry -- +@@ -3277,79 +3154,111 @@ + % is with defuns, which call us directly. + % + \def\dosubind#1#2#3{% ++ \iflinks ++ {% ++ % Store the main index entry text (including the third arg). ++ \toks0 = {#2}% ++ % If third arg is present, precede it with space. ++ \def\thirdarg{#3}% ++ \ifx\thirdarg\empty \else ++ \toks0 = \expandafter{\the\toks0 \space #3}% ++ \fi ++ % ++ \edef\writeto{\csname#1indfile\endcsname}% ++ % ++ \ifvmode ++ \dosubindsanitize ++ \else ++ \dosubindwrite ++ \fi ++ }% ++ \fi ++} ++ ++% Write the entry to the index file: ++% ++\def\dosubindwrite{% + % Put the index entry in the margin if desired. + \ifx\SETmarginindex\relax\else +- \insert\margin{\hbox{\vrule height8pt depth3pt width0pt #2}}% ++ \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}% + \fi +- {% +- \count255=\lastpenalty +- {% +- \indexdummies % Must do this here, since \bf, etc expand at this stage +- \escapechar=`\\ +- {% +- \let\folio = 0% We will expand all macros now EXCEPT \folio. +- \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now +- % so it will be output as is; and it will print as backslash. +- % +- % The main index entry text. +- \toks0 = {#2}% +- % +- % If third arg is present, precede it with space in sort key. +- \def\thirdarg{#3}% +- \ifx\thirdarg\emptymacro \else +- % If the third (subentry) arg is present, add it to the index +- % line to write. +- \toks0 = \expandafter{\the\toks0 \space #3}% +- \fi +- % +- % Process the index entry with all font commands turned off, to +- % get the string to sort by. +- {\indexnofonts +- \edef\temp{\the\toks0}% need full expansion +- \xdef\indexsorttmp{\temp}% +- }% +- % +- % Set up the complete index entry, with both the sort key and +- % the original text, including any font commands. We write +- % three arguments to \entry to the .?? file (four in the +- % subentry case), texindex reduces to two when writing the .??s +- % sorted result. +- \edef\temp{% +- \write\csname#1indfile\endcsname{% +- \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}% +- }% +- % +- % If a skip is the last thing on the list now, preserve it +- % by backing up by \lastskip, doing the \write, then inserting +- % the skip again. Otherwise, the whatsit generated by the +- % \write will make \lastskip zero. The result is that sequences +- % like this: +- % @end defun +- % @tindex whatever +- % @defun ... +- % will have extra space inserted, because the \medbreak in the +- % start of the @defun won't see the skip inserted by the @end of +- % the previous defun. +- % +- % But don't do any of this if we're not in vertical mode. We +- % don't want to do a \vskip and prematurely end a paragraph. +- % +- % Avoid page breaks due to these extra skips, too. +- % +- \iflinks +- \ifvmode +- \skip0 = \lastskip +- \ifdim\lastskip = 0pt \else \nobreak\vskip-\skip0 \fi +- \fi +- % +- \temp % do the write +- % +- \ifvmode \ifdim\skip0 = 0pt \else \nobreak\vskip\skip0 \fi \fi +- \fi +- }% +- }% +- \penalty\count255 ++ % ++ % Remember, we are within a group. ++ \indexdummies % Must do this here, since \bf, etc expand at this stage ++ \escapechar=`\\ ++ \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now ++ % so it will be output as is; and it will print as backslash. ++ % ++ % Process the index entry with all font commands turned off, to ++ % get the string to sort by. ++ {\indexnofonts ++ \edef\temp{\the\toks0}% need full expansion ++ \xdef\indexsorttmp{\temp}% ++ }% ++ % ++ % Set up the complete index entry, with both the sort key and ++ % the original text, including any font commands. We write ++ % three arguments to \entry to the .?? file (four in the ++ % subentry case), texindex reduces to two when writing the .??s ++ % sorted result. ++ \edef\temp{% ++ \write\writeto{% ++ \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}% + }% ++ \temp ++} ++ ++% Take care of unwanted page breaks: ++% ++% If a skip is the last thing on the list now, preserve it ++% by backing up by \lastskip, doing the \write, then inserting ++% the skip again. Otherwise, the whatsit generated by the ++% \write will make \lastskip zero. The result is that sequences ++% like this: ++% @end defun ++% @tindex whatever ++% @defun ... ++% will have extra space inserted, because the \medbreak in the ++% start of the @defun won't see the skip inserted by the @end of ++% the previous defun. ++% ++% But don't do any of this if we're not in vertical mode. We ++% don't want to do a \vskip and prematurely end a paragraph. ++% ++% Avoid page breaks due to these extra skips, too. ++% ++\def\dosubindsanitize{% ++ % \lastskip and \lastpenalty cannot both be nonzero simultaneously. ++ \skip0 = \lastskip ++ \count255 = \lastpenalty ++ % ++ % If \lastskip is nonzero, that means the last item was a ++ % skip. And since a skip is discardable, that means this ++ % -\skip0 glue we're inserting is preceded by a ++ % non-discardable item, therefore it is not a potential ++ % breakpoint, therefore no \nobreak needed. ++ \ifdim\lastskip = 0pt \else \vskip-\skip0 \fi ++ % ++ \dosubindwrite ++ % ++ \ifdim\skip0 = 0pt ++ % if \lastskip was zero, perhaps the last item was a ++ % penalty, and perhaps it was >=10000, e.g., a \nobreak. ++ % In that case, we want to re-insert the penalty; since we ++ % just inserted a non-discardable item, any following glue ++ % (such as a \parskip) would be a breakpoint. For example: ++ % @deffn deffn-whatever ++ % @vindex index-whatever ++ % Description. ++ % would allow a break between the index-whatever whatsit ++ % and the "Description." paragraph. ++ \ifnum\count255>9999 \nobreak \fi ++ \else ++ % On the other hand, if we had a nonzero \lastskip, ++ % this make-up glue would be preceded by a non-discardable item ++ % (the whatsit from the \write), so we must insert a \nobreak. ++ \nobreak\vskip\skip0 ++ \fi + } + + % The index entry written in the file actually looks like +@@ -3695,6 +3604,12 @@ + \message{sectioning,} + % Chapters, sections, etc. + ++% \unnumberedno is an oxymoron, of course. But we count the unnumbered ++% sections so that we can refer to them unambiguously in the pdf ++% outlines by their "section number". We avoid collisions with chapter ++% numbers by starting them at 10000. (If a document ever has 10000 ++% chapters, we're in trouble anyway, I'm sure.) ++\newcount\unnumberedno \unnumberedno = 10000 + \newcount\chapno + \newcount\secno \secno=0 + \newcount\subsecno \subsecno=0 +@@ -3702,9 +3617,12 @@ + + % This counter is funny since it counts through charcodes of letters A, B, ... + \newcount\appendixno \appendixno = `\@ ++% + % \def\appendixletter{\char\the\appendixno} +-% We do the following for the sake of pdftex, which needs the actual ++% We do the following ugly conditional instead of the above simple ++% construct for the sake of pdftex, which needs the actual + % letter in the expansion, not just typeset. ++% + \def\appendixletter{% + \ifnum\appendixno=`A A% + \else\ifnum\appendixno=`B B% +@@ -3742,11 +3660,12 @@ + + % Each @chapter defines this as the name of the chapter. + % page headings and footings can use it. @section does likewise. ++% However, they are not reliable, because we don't use marks. + \def\thischapter{} + \def\thissection{} + + \newcount\absseclevel % used to calculate proper heading level +-\newcount\secbase\secbase=0 % @raise/lowersections modify this count ++\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count + + % @raisesections: treat @section as chapter, @subsection as section, etc. + \def\raisesections{\global\advance\secbase by -1} +@@ -3761,100 +3680,72 @@ + % #2 is text for heading + \def\numhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1 + \ifcase\absseclevel +- \chapterzzz{#2} +-\or +- \seczzz{#2} +-\or +- \numberedsubseczzz{#2} +-\or +- \numberedsubsubseczzz{#2} +-\else +- \ifnum \absseclevel<0 +- \chapterzzz{#2} ++ \chapterzzz{#2}% ++ \or \seczzz{#2}% ++ \or \numberedsubseczzz{#2}% ++ \or \numberedsubsubseczzz{#2}% + \else +- \numberedsubsubseczzz{#2} ++ \ifnum \absseclevel<0 \chapterzzz{#2}% ++ \else \numberedsubsubseczzz{#2}% ++ \fi + \fi +-\fi +-\suppressfirstparagraphindent ++ \suppressfirstparagraphindent + } + + % like \numhead, but chooses appendix heading levels + \def\apphead#1#2{\absseclevel=\secbase\advance\absseclevel by #1 + \ifcase\absseclevel +- \appendixzzz{#2} +-\or +- \appendixsectionzzz{#2} +-\or +- \appendixsubseczzz{#2} +-\or +- \appendixsubsubseczzz{#2} +-\else +- \ifnum \absseclevel<0 +- \appendixzzz{#2} ++ \appendixzzz{#2}% ++ \or \appendixsectionzzz{#2}% ++ \or \appendixsubseczzz{#2}% ++ \or \appendixsubsubseczzz{#2}% + \else +- \appendixsubsubseczzz{#2} ++ \ifnum \absseclevel<0 \appendixzzz{#2}% ++ \else \appendixsubsubseczzz{#2}% ++ \fi + \fi +-\fi +-\suppressfirstparagraphindent ++ \suppressfirstparagraphindent + } + + % like \numhead, but chooses numberless heading levels + \def\unnmhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1 +-\ifcase\absseclevel +- \unnumberedzzz{#2} +-\or +- \unnumberedseczzz{#2} +-\or +- \unnumberedsubseczzz{#2} +-\or +- \unnumberedsubsubseczzz{#2} +-\else +- \ifnum \absseclevel<0 +- \unnumberedzzz{#2} ++ \ifcase\absseclevel ++ \unnumberedzzz{#2}% ++ \or \unnumberedseczzz{#2}% ++ \or \unnumberedsubseczzz{#2}% ++ \or \unnumberedsubsubseczzz{#2}% + \else +- \unnumberedsubsubseczzz{#2} ++ \ifnum \absseclevel<0 \unnumberedzzz{#2}% ++ \else \unnumberedsubsubseczzz{#2}% ++ \fi + \fi +-\fi +-\suppressfirstparagraphindent ++ \suppressfirstparagraphindent + } + + % @chapter, @appendix, @unnumbered. +-\def\thischaptername{No Chapter Title} ++% + \outer\def\chapter{\parsearg\chapteryyy} +-\def\chapteryyy #1{\numhead0{#1}} % normally numhead0 calls chapterzzz +-\def\chapterzzz #1{% +- \secno=0 \subsecno=0 \subsubsecno=0 +- \global\advance \chapno by 1 \message{\putwordChapter\space \the\chapno}% +- \chapmacro {#1}{\the\chapno}% +- \gdef\thissection{#1}% +- \gdef\thischaptername{#1}% +- % We don't substitute the actual chapter name into \thischapter +- % because we don't want its macros evaluated now. +- \xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}% +- \writetocentry{chap}{#1}{{\the\chapno}} +- \donoderef ++\def\chapteryyy#1{\numhead0{#1}} % normally numhead0 calls chapterzzz ++\def\chapterzzz#1{% ++ \secno=0 \subsecno=0 \subsubsecno=0 \advance\chapno by 1 ++ \message{\putwordChapter\space \the\chapno}% ++ % ++ % Write the actual heading. ++ \chapmacro{#1}{Ynumbered}{\the\chapno}% ++ % ++ % So @section and the like are numbered underneath this chapter. + \global\let\section = \numberedsec + \global\let\subsection = \numberedsubsec + \global\let\subsubsection = \numberedsubsubsec + } + +-% we use \chapno to avoid indenting back +-\def\appendixbox#1{% +- \setbox0 = \hbox{\putwordAppendix{} \the\chapno}% +- \hbox to \wd0{#1\hss}} +- + \outer\def\appendix{\parsearg\appendixyyy} +-\def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz +-\def\appendixzzz #1{% +- \secno=0 \subsecno=0 \subsubsecno=0 +- \global\advance \appendixno by 1 +- \message{\putwordAppendix\space \appendixletter}% +- \chapmacro {#1}{\appendixbox{\putwordAppendix{} \appendixletter}}% +- \gdef\thissection{#1}% +- \gdef\thischaptername{#1}% +- \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}% +- \writetocentry{appendix}{#1}{{\appendixletter}} +- \appendixnoderef ++\def\appendixyyy#1{\apphead0{#1}} % normally apphead0 calls appendixzzz ++\def\appendixzzz#1{% ++ \secno=0 \subsecno=0 \subsubsecno=0 \advance\appendixno by 1 ++ \def\appendixnum{\putwordAppendix\space \appendixletter}% ++ \message{\appendixnum}% ++ \chapmacro{#1}{Yappendix}{\appendixletter}% + \global\let\section = \appendixsec + \global\let\subsection = \appendixsubsec + \global\let\subsubsection = \appendixsubsubsec +@@ -3862,15 +3753,15 @@ + + % @centerchap is like @unnumbered, but the heading is centered. + \outer\def\centerchap{\parsearg\centerchapyyy} +-\def\centerchapyyy #1{{\let\unnumbchapmacro=\centerchapmacro \unnumberedyyy{#1}}} ++\def\centerchapyyy#1{{\unnumberedyyy{#1}}} + + % @top is like @unnumbered. + \outer\def\top{\parsearg\unnumberedyyy} + + \outer\def\unnumbered{\parsearg\unnumberedyyy} +-\def\unnumberedyyy #1{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz +-\def\unnumberedzzz #1{% +- \secno=0 \subsecno=0 \subsubsecno=0 ++\def\unnumberedyyy#1{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz ++\def\unnumberedzzz#1{% ++ \secno=0 \subsecno=0 \subsubsecno=0 \advance\unnumberedno by 1 + % + % This used to be simply \message{#1}, but TeX fully expands the + % argument to \message. Therefore, if #1 contained @-commands, TeX +@@ -3885,10 +3776,8 @@ + % the toc entries.) + \toks0 = {#1}\message{(\the\toks0)}% + % +- \unnumbchapmacro {#1}% +- \gdef\thischapter{#1}\gdef\thissection{#1}% +- \writetocentry{unnumbchap}{#1}{{\the\chapno}} +- \unnumbnoderef ++ \chapmacro{#1}{Ynothing}{\the\unnumberedno}% ++ % + \global\let\section = \unnumberedsec + \global\let\subsection = \unnumberedsubsec + \global\let\subsubsection = \unnumberedsubsubsec +@@ -3896,99 +3785,78 @@ + + % Sections. + \outer\def\numberedsec{\parsearg\secyyy} +-\def\secyyy #1{\numhead1{#1}} % normally calls seczzz +-\def\seczzz #1{% +- \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 % +- \gdef\thissection{#1}\secheading {#1}{\the\chapno}{\the\secno}% +- \writetocentry{sec}{#1}{{\the\chapno}{\the\secno}} +- \donoderef +- \nobreak ++\def\secyyy#1{\numhead1{#1}} % normally calls seczzz ++\def\seczzz#1{% ++ \subsecno=0 \subsubsecno=0 \advance\secno by 1 ++ \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}% + } + + \outer\def\appendixsection{\parsearg\appendixsecyyy} + \outer\def\appendixsec{\parsearg\appendixsecyyy} +-\def\appendixsecyyy #1{\apphead1{#1}} % normally calls appendixsectionzzz +-\def\appendixsectionzzz #1{% +- \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 % +- \gdef\thissection{#1}\secheading {#1}{\appendixletter}{\the\secno}% +- \writetocentry{sec}{#1}{{\appendixletter}{\the\secno}} +- \appendixnoderef +- \nobreak ++\def\appendixsecyyy#1{\apphead1{#1}} % normally calls appendixsectionzzz ++\def\appendixsectionzzz#1{% ++ \subsecno=0 \subsubsecno=0 \advance\secno by 1 ++ \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}% + } + + \outer\def\unnumberedsec{\parsearg\unnumberedsecyyy} +-\def\unnumberedsecyyy #1{\unnmhead1{#1}} % normally calls unnumberedseczzz +-\def\unnumberedseczzz #1{% +- \plainsecheading {#1}\gdef\thissection{#1}% +- \writetocentry{unnumbsec}{#1}{{\the\chapno}{\the\secno}} +- \unnumbnoderef +- \nobreak ++\def\unnumberedsecyyy#1{\unnmhead1{#1}} % normally calls unnumberedseczzz ++\def\unnumberedseczzz#1{% ++ \subsecno=0 \subsubsecno=0 \advance\secno by 1 ++ \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}% + } + + % Subsections. + \outer\def\numberedsubsec{\parsearg\numberedsubsecyyy} +-\def\numberedsubsecyyy #1{\numhead2{#1}} % normally calls numberedsubseczzz +-\def\numberedsubseczzz #1{% +- \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 % +- \subsecheading {#1}{\the\chapno}{\the\secno}{\the\subsecno}% +- \writetocentry{subsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}} +- \donoderef +- \nobreak ++\def\numberedsubsecyyy#1{\numhead2{#1}} % normally calls numberedsubseczzz ++\def\numberedsubseczzz#1{% ++ \subsubsecno=0 \advance\subsecno by 1 ++ \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}% + } + + \outer\def\appendixsubsec{\parsearg\appendixsubsecyyy} +-\def\appendixsubsecyyy #1{\apphead2{#1}} % normally calls appendixsubseczzz +-\def\appendixsubseczzz #1{% +- \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 % +- \subsecheading {#1}{\appendixletter}{\the\secno}{\the\subsecno}% +- \writetocentry{subsec}{#1}{{\appendixletter}{\the\secno}{\the\subsecno}} +- \appendixnoderef +- \nobreak ++\def\appendixsubsecyyy#1{\apphead2{#1}} % normally calls appendixsubseczzz ++\def\appendixsubseczzz#1{% ++ \subsubsecno=0 \advance\subsecno by 1 ++ \sectionheading{#1}{subsec}{Yappendix}% ++ {\appendixletter.\the\secno.\the\subsecno}% + } + + \outer\def\unnumberedsubsec{\parsearg\unnumberedsubsecyyy} +-\def\unnumberedsubsecyyy #1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz +-\def\unnumberedsubseczzz #1{% +- \plainsubsecheading {#1}\gdef\thissection{#1}% +- \writetocentry{unnumbsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}} +- \unnumbnoderef +- \nobreak ++\def\unnumberedsubsecyyy#1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz ++\def\unnumberedsubseczzz#1{% ++ \subsubsecno=0 \advance\subsecno by 1 ++ \sectionheading{#1}{subsec}{Ynothing}% ++ {\the\unnumberedno.\the\secno.\the\subsecno}% + } + + % Subsubsections. + \outer\def\numberedsubsubsec{\parsearg\numberedsubsubsecyyy} +-\def\numberedsubsubsecyyy #1{\numhead3{#1}} % normally numberedsubsubseczzz +-\def\numberedsubsubseczzz #1{% +- \gdef\thissection{#1}\global\advance \subsubsecno by 1 % +- \subsubsecheading {#1} +- {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}% +- \writetocentry{subsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}} +- \donoderef +- \nobreak ++\def\numberedsubsubsecyyy#1{\numhead3{#1}} % normally numberedsubsubseczzz ++\def\numberedsubsubseczzz#1{% ++ \advance\subsubsecno by 1 ++ \sectionheading{#1}{subsubsec}{Ynumbered}% ++ {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}% + } + + \outer\def\appendixsubsubsec{\parsearg\appendixsubsubsecyyy} +-\def\appendixsubsubsecyyy #1{\apphead3{#1}} % normally appendixsubsubseczzz +-\def\appendixsubsubseczzz #1{% +- \gdef\thissection{#1}\global\advance \subsubsecno by 1 % +- \subsubsecheading {#1} +- {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}% +- \writetocentry{subsubsec}{#1}{{\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}} +- \appendixnoderef +- \nobreak ++\def\appendixsubsubsecyyy#1{\apphead3{#1}} % normally appendixsubsubseczzz ++\def\appendixsubsubseczzz#1{% ++ \advance\subsubsecno by 1 ++ \sectionheading{#1}{subsubsec}{Yappendix}% ++ {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}% + } + + \outer\def\unnumberedsubsubsec{\parsearg\unnumberedsubsubsecyyy} +-\def\unnumberedsubsubsecyyy #1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz +-\def\unnumberedsubsubseczzz #1{% +- \plainsubsubsecheading {#1}\gdef\thissection{#1}% +- \writetocentry{unnumbsubsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}} +- \unnumbnoderef +- \nobreak ++\def\unnumberedsubsubsecyyy#1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz ++\def\unnumberedsubsubseczzz#1{% ++ \advance\subsubsecno by 1 ++ \sectionheading{#1}{subsubsec}{Ynothing}% ++ {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}% + } + + % These are variants which are not "outer", so they can appear in @ifinfo. +-% Actually, they should now be obsolete; ordinary section commands should work. ++% Actually, they are now be obsolete; ordinary section commands should work. + \def\infotop{\parsearg\unnumberedzzz} + \def\infounnumbered{\parsearg\unnumberedzzz} + \def\infounnumberedsec{\parsearg\unnumberedseczzz} +@@ -4008,9 +3876,9 @@ + % These macros control what the section commands do, according + % to what kind of chapter we are in (ordinary, appendix, or unnumbered). + % Define them by default for a numbered chapter. +-\global\let\section = \numberedsec +-\global\let\subsection = \numberedsubsec +-\global\let\subsubsection = \numberedsubsubsec ++\let\section = \numberedsec ++\let\subsection = \numberedsubsec ++\let\subsubsection = \numberedsubsubsec + + % Define @majorheading, @heading and @subheading + +@@ -4023,23 +3891,30 @@ + % if justification is not attempted. Hence \raggedright. + + +-\def\majorheading{\parsearg\majorheadingzzz} +-\def\majorheadingzzz #1{% ++\def\majorheading{% + {\advance\chapheadingskip by 10pt \chapbreak }% +- {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 +- \parindent=0pt\raggedright +- \rm #1\hfill}}\bigskip \par\penalty 200} ++ \parsearg\chapheadingzzz ++} + +-\def\chapheading{\parsearg\chapheadingzzz} +-\def\chapheadingzzz #1{\chapbreak % ++\def\chapheading{\chapbreak \parsearg\chapheadingzzz} ++\def\chapheadingzzz#1{% + {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 + \parindent=0pt\raggedright +- \rm #1\hfill}}\bigskip \par\penalty 200} ++ \rm #1\hfill}}% ++ \bigskip \par\penalty 200\relax ++ \suppressfirstparagraphindent ++} + + % @heading, @subheading, @subsubheading. +-\def\heading{\parsearg\plainsecheading} +-\def\subheading{\parsearg\plainsubsecheading} +-\def\subsubheading{\parsearg\plainsubsubsecheading} ++\def\heading{\parsearg\doheading} ++\def\subheading{\parsearg\dosubheading} ++\def\subsubheading{\parsearg\dosubsubheading} ++\def\doheading#1{\sectionheading{#1}{sec}{Yomitfromtoc}{} ++ \suppressfirstparagraphindent} ++\def\dosubheading#1{\sectionheading{#1}{subsec}{Yomitfromtoc}{} ++ \suppressfirstparagraphindent} ++\def\dosubsubheading#1{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{} ++ \suppressfirstparagraphindent} + + % These macros generate a chapter, section, etc. heading only + % (including whitespace, linebreaking, etc. around it), +@@ -4072,7 +3947,7 @@ + \global\let\pagealignmacro=\chappager + \global\def\HEADINGSon{\HEADINGSsingle}} + +-\def\CHAPPAGodd{ ++\def\CHAPPAGodd{% + \global\let\contentsalignmacro = \chapoddpage + \global\let\pchapsepmacro=\chapoddpage + \global\let\pagealignmacro=\chapoddpage +@@ -4080,30 +3955,80 @@ + + \CHAPPAGon + +-\def\CHAPFplain{ ++\def\CHAPFplain{% + \global\let\chapmacro=\chfplain +-\global\let\unnumbchapmacro=\unnchfplain + \global\let\centerchapmacro=\centerchfplain} + +-% Plain chapter opening. +-% #1 is the text, #2 the chapter number or empty if unnumbered. +-\def\chfplain#1#2{% ++% Normal chapter opening. ++% ++% #1 is the text, #2 is the section type (Ynumbered, Ynothing, ++% Yappendix, Yomitfromtoc), #3 the chapter number. ++% ++% To test against our argument. ++\def\Ynothingkeyword{Ynothing} ++\def\Yomitfromtockeyword{Yomitfromtoc} ++\def\Yappendixkeyword{Yappendix} ++% ++\def\chfplain#1#2#3{% + \pchapsepmacro + {% + \chapfonts \rm +- \def\chapnum{#2}% +- \setbox0 = \hbox{#2\ifx\chapnum\empty\else\enspace\fi}% ++ % ++ % Have to define \thissection before calling \donoderef, because the ++ % xref code eventually uses it, as \Ytitle. On the other hand, it ++ % has to be called after \pchapsepmacro, or the headline will change ++ % too soon. ++ \gdef\thissection{#1}% ++ \gdef\thischaptername{#1}% ++ % ++ % Only insert the separating space if we have a chapter/appendix ++ % number, and don't print the unnumbered ``number''. ++ \def\temptype{#2}% ++ \ifx\temptype\Ynothingkeyword ++ \setbox0 = \hbox{}% ++ \def\toctype{unnchap}% ++ \def\thischapter{#1}% ++ \else\ifx\temptype\Yomitfromtockeyword ++ \setbox0 = \hbox{}% contents like unnumbered, but no toc entry ++ \def\toctype{omit}% ++ \xdef\thischapter{}% ++ \else\ifx\temptype\Yappendixkeyword ++ \setbox0 = \hbox{\putwordAppendix{} #3\enspace}% ++ \def\toctype{app}% ++ % We don't substitute the actual chapter name into \thischapter ++ % because we don't want its macros evaluated now. And we don't ++ % use \thissection because that changes with each section. ++ % ++ \xdef\thischapter{\putwordAppendix{} \appendixletter: ++ \noexpand\thischaptername}% ++ \else ++ \setbox0 = \hbox{#3\enspace}% ++ \def\toctype{numchap}% ++ \xdef\thischapter{\putwordChapter{} \the\chapno: ++ \noexpand\thischaptername}% ++ \fi\fi\fi ++ % ++ % Write the toc entry for this chapter. Must come before the ++ % \donoderef, because we include the current node name in the toc ++ % entry, and \donoderef resets it to empty. ++ \writetocentry{\toctype}{#1}{#3}% ++ % ++ % For pdftex, we have to write out the node definition (aka, make ++ % the pdfdest) after any page break, but before the actual text has ++ % been typeset. If the destination for the pdf outline is after the ++ % text, then jumping from the outline may wind up with the text not ++ % being visible, for instance under high magnification. ++ \donoderef{#2}% ++ % ++ % Typeset the actual heading. + \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright +- \hangindent = \wd0 \centerparametersmaybe ++ \hangindent=\wd0 \centerparametersmaybe + \unhbox0 #1\par}% + }% + \nobreak\bigskip % no page break after a chapter title + \nobreak + } + +-% Plain opening for unnumbered. +-\def\unnchfplain#1{\chfplain{#1}{}} +- + % @centerchap -- centered and unnumbered. + \let\centerparametersmaybe = \relax + \def\centerchfplain#1{{% +@@ -4112,11 +4037,14 @@ + \leftskip = \rightskip + \parfillskip = 0pt + }% +- \chfplain{#1}{}% ++ \chfplain{#1}{Ynothing}{}% + }} + + \CHAPFplain % The default + ++% I don't think this chapter style is supported any more, so I'm not ++% updating it with the new noderef stuff. We'll see. --karl, 11aug03. ++% + \def\unnchfopen #1{% + \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 + \parindent=0pt\raggedright +@@ -4134,61 +4062,95 @@ + \hfill {\rm #1}\hfill}}\bigskip \par\nobreak + } + +-\def\CHAPFopen{ ++\def\CHAPFopen{% + \global\let\chapmacro=\chfopen +-\global\let\unnumbchapmacro=\unnchfopen + \global\let\centerchapmacro=\centerchfopen} + + +-% Section titles. ++% Section titles. These macros combine the section number parts and ++% call the generic \sectionheading to do the printing. ++% + \newskip\secheadingskip +-\def\secheadingbreak{\dobreak \secheadingskip {-1000}} +-\def\secheading#1#2#3{\sectionheading{sec}{#2.#3}{#1}} +-\def\plainsecheading#1{\sectionheading{sec}{}{#1}} ++\def\secheadingbreak{\dobreak \secheadingskip{-1000}} + + % Subsection titles. +-\newskip \subsecheadingskip +-\def\subsecheadingbreak{\dobreak \subsecheadingskip {-500}} +-\def\subsecheading#1#2#3#4{\sectionheading{subsec}{#2.#3.#4}{#1}} +-\def\plainsubsecheading#1{\sectionheading{subsec}{}{#1}} ++\newskip\subsecheadingskip ++\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}} + + % Subsubsection titles. +-\let\subsubsecheadingskip = \subsecheadingskip +-\let\subsubsecheadingbreak = \subsecheadingbreak +-\def\subsubsecheading#1#2#3#4#5{\sectionheading{subsubsec}{#2.#3.#4.#5}{#1}} +-\def\plainsubsubsecheading#1{\sectionheading{subsubsec}{}{#1}} ++\def\subsubsecheadingskip{\subsecheadingskip} ++\def\subsubsecheadingbreak{\subsecheadingbreak} + + +-% Print any size section title. +-% +-% #1 is the section type (sec/subsec/subsubsec), #2 is the section +-% number (maybe empty), #3 the text. +-\def\sectionheading#1#2#3{% +- {% +- \expandafter\advance\csname #1headingskip\endcsname by \parskip +- \csname #1headingbreak\endcsname +- }% ++% Print any size, any type, section title. ++% ++% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is ++% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the ++% section number. ++% ++\def\sectionheading#1#2#3#4{% + {% + % Switch to the right set of fonts. +- \csname #1fonts\endcsname \rm ++ \csname #2fonts\endcsname \rm + % +- % Only insert the separating space if we have a section number. +- \def\secnum{#2}% +- \setbox0 = \hbox{#2\ifx\secnum\empty\else\enspace\fi}% ++ % Insert space above the heading. ++ \csname #2headingbreak\endcsname ++ % ++ % Only insert the space after the number if we have a section number. ++ \def\sectionlevel{#2}% ++ \def\temptype{#3}% ++ % ++ \ifx\temptype\Ynothingkeyword ++ \setbox0 = \hbox{}% ++ \def\toctype{unn}% ++ \gdef\thissection{#1}% ++ \else\ifx\temptype\Yomitfromtockeyword ++ % for @headings -- no section number, don't include in toc, ++ % and don't redefine \thissection. ++ \setbox0 = \hbox{}% ++ \def\toctype{omit}% ++ \let\sectionlevel=\empty ++ \else\ifx\temptype\Yappendixkeyword ++ \setbox0 = \hbox{#4\enspace}% ++ \def\toctype{app}% ++ \gdef\thissection{#1}% ++ \else ++ \setbox0 = \hbox{#4\enspace}% ++ \def\toctype{num}% ++ \gdef\thissection{#1}% ++ \fi\fi\fi ++ % ++ % Write the toc entry (before \donoderef). See comments in \chfplain. ++ \writetocentry{\toctype\sectionlevel}{#1}{#4}% ++ % ++ % Write the node reference (= pdf destination for pdftex). ++ % Again, see comments in \chfplain. ++ \donoderef{#3}% + % ++ % Output the actual section heading. + \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright +- \hangindent = \wd0 % zero if no section number +- \unhbox0 #3}% ++ \hangindent=\wd0 % zero if no section number ++ \unhbox0 #1}% + }% +- % Add extra space after the heading -- either a line space or a +- % paragraph space, whichever is more. (Some people like to set +- % \parskip to large values for some reason.) Don't allow stretch, though. ++ % Add extra space after the heading -- half of whatever came above it. ++ % Don't allow stretch, though. ++ \kern .5 \csname #2headingskip\endcsname ++ % ++ % Do not let the kern be a potential breakpoint, as it would be if it ++ % was followed by glue. + \nobreak +- \ifdim\parskip>\normalbaselineskip +- \kern\parskip +- \else +- \kern\normalbaselineskip +- \fi ++ % ++ % We'll almost certainly start a paragraph next, so don't let that ++ % glue accumulate. (Not a breakpoint because it's preceded by a ++ % discardable item.) ++ \vskip-\parskip ++ % ++ % This \nobreak is purely so the last item on the list is a \penalty ++ % of 10000. This is so other code, for instance \parsebodycommon, can ++ % check for and avoid allowing breakpoints. Otherwise, it would ++ % insert a valid breakpoint between: ++ % @section sec-whatever ++ % @deffn def-whatever + \nobreak + } + +@@ -4198,41 +4160,53 @@ + \newwrite\tocfile + + % Write an entry to the toc file, opening it if necessary. +-% Called from @chapter, etc. We supply {\folio} at the end of the +-% argument, which will end up as the last argument to the \...entry macro. +-% +-% Usage: \writetocentry{chap}{The Name of The Game}{{\the\chapno}} ++% Called from @chapter, etc. ++% ++% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno} ++% We append the current node name (if any) and page number as additional ++% arguments for the \{chap,sec,...}entry macros which will eventually ++% read this. The node name is used in the pdf outlines as the ++% destination to jump to. ++% + % We open the .toc file for writing here instead of at @setfilename (or + % any other fixed time) so that @contents can be anywhere in the document. ++% But if #1 is `omit', then we don't do anything. This is used for the ++% table of contents chapter openings themselves. + % + \newif\iftocfileopened ++\def\omitkeyword{omit}% ++% + \def\writetocentry#1#2#3{% +- \iftocfileopened\else +- \immediate\openout\tocfile = \jobname.toc +- \global\tocfileopenedtrue +- \fi +- % +- \iflinks +- \toks0 = {#2}% +- \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}#3{\folio}}}% +- \temp ++ \edef\writetoctype{#1}% ++ \ifx\writetoctype\omitkeyword \else ++ \iftocfileopened\else ++ \immediate\openout\tocfile = \jobname.toc ++ \global\tocfileopenedtrue ++ \fi ++ % ++ \iflinks ++ \toks0 = {#2}% ++ \toks2 = \expandafter{\lastnode}% ++ \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}{#3}% ++ {\the\toks2}{\noexpand\folio}}}% ++ \temp ++ \fi + \fi + % +- % Tell \shipout to create a page destination if we're doing pdf, which +- % will be the target of the links in the table of contents. We can't +- % just do it on every page because the title pages are numbered 1 and +- % 2 (the page numbers aren't printed), and so are the first two pages +- % of the document. Thus, we'd have two destinations named `1', and +- % two named `2'. +- \ifpdf \pdfmakepagedesttrue \fi ++ % Tell \shipout to create a pdf destination on each page, if we're ++ % writing pdf. These are used in the table of contents. We can't ++ % just write one on every page because the title pages are numbered ++ % 1 and 2 (the page numbers aren't printed), and so are the first ++ % two pages of the document. Thus, we'd have two destinations named ++ % `1', and two named `2'. ++ \ifpdf \global\pdfmakepagedesttrue \fi + } + + \newskip\contentsrightmargin \contentsrightmargin=1in + \newcount\savepageno + \newcount\lastnegativepageno \lastnegativepageno = -1 + +-% Finish up the main text and prepare to read what we've written +-% to \tocfile. ++% Prepare to read what we've written to \tocfile. + % + \def\startcontents#1{% + % If @setchapternewpage on, and @headings double, the contents should +@@ -4244,7 +4218,9 @@ + % + % Don't need to put `Contents' or `Short Contents' in the headline. + % It is abundantly clear what they are. +- \unnumbchapmacro{#1}\def\thischapter{}% ++ \def\thischapter{}% ++ \chapmacro{#1}{Yomitfromtoc}{}% ++ % + \savepageno = \pageno + \begingroup % Set up to handle contents files properly. + \catcode`\\=0 \catcode`\{=1 \catcode`\}=2 \catcode`\@=11 +@@ -4279,9 +4255,9 @@ + \def\summarycontents{% + \startcontents{\putwordShortTOC}% + % +- \let\chapentry = \shortchapentry +- \let\appendixentry = \shortappendixentry +- \let\unnumbchapentry = \shortunnumberedentry ++ \let\numchapentry = \shortchapentry ++ \let\appentry = \shortchapentry ++ \let\unnchapentry = \shortunnchapentry + % We want a true roman here for the page numbers. + \secfonts + \let\rm=\shortcontrm \let\bf=\shortcontbf +@@ -4289,12 +4265,15 @@ + \rm + \hyphenpenalty = 10000 + \advance\baselineskip by 1pt % Open it up a little. +- \def\secentry ##1##2##3##4{} +- \def\subsecentry ##1##2##3##4##5{} +- \def\subsubsecentry ##1##2##3##4##5##6{} +- \let\unnumbsecentry = \secentry +- \let\unnumbsubsecentry = \subsecentry +- \let\unnumbsubsubsecentry = \subsubsecentry ++ \def\numsecentry##1##2##3##4{} ++ \let\appsecentry = \numsecentry ++ \let\unnsecentry = \numsecentry ++ \let\numsubsecentry = \numsecentry ++ \let\appsubsecentry = \numsecentry ++ \let\unnsubsecentry = \numsecentry ++ \let\numsubsubsecentry = \numsecentry ++ \let\appsubsubsecentry = \numsecentry ++ \let\unnsubsubsecentry = \numsecentry + \openin 1 \jobname.toc + \ifeof 1 \else + \closein 1 +@@ -4308,9 +4287,23 @@ + } + \let\shortcontents = \summarycontents + +-\ifpdf +- \pdfcatalog{/PageMode /UseOutlines}% +-\fi ++% Typeset the label for a chapter or appendix for the short contents. ++% The arg is, e.g., `A' for an appendix, or `3' for a chapter. ++% ++\def\shortchaplabel#1{% ++ % This space should be enough, since a single number is .5em, and the ++ % widest letter (M) is 1em, at least in the Computer Modern fonts. ++ % But use \hss just in case. ++ % (This space doesn't include the extra space that gets added after ++ % the label; that gets put in by \shortchapentry above.) ++ % ++ % We'd like to right-justify chapter numbers, but that looks strange ++ % with appendix letters. And right-justifying numbers and ++ % left-justifying letters looks strange when there is less than 10 ++ % chapters. Have to read the whole toc once to know how many chapters ++ % there are before deciding ... ++ \hbox to 1em{#1\hss}% ++} + + % These macros generate individual entries in the table of contents. + % The first argument is the chapter or section name. +@@ -4318,58 +4311,45 @@ + % The arguments in between are the chapter number, section number, ... + + % Chapters, in the main contents. +-\def\chapentry#1#2#3{\dochapentry{#2\labelspace#1}{#3}} ++\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}} + % + % Chapters, in the short toc. + % See comments in \dochapentry re vbox and related settings. +-\def\shortchapentry#1#2#3{% +- \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#3\egroup}% ++\def\shortchapentry#1#2#3#4{% ++ \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}% + } + + % Appendices, in the main contents. +-\def\appendixentry#1#2#3{% +- \dochapentry{\appendixbox{\putwordAppendix{} #2}\labelspace#1}{#3}} +-% +-% Appendices, in the short toc. +-\let\shortappendixentry = \shortchapentry +- +-% Typeset the label for a chapter or appendix for the short contents. +-% The arg is, e.g., `Appendix A' for an appendix, or `3' for a chapter. +-% We could simplify the code here by writing out an \appendixentry +-% command in the toc file for appendices, instead of using \chapentry +-% for both, but it doesn't seem worth it. +-% +-\newdimen\shortappendixwidth ++% Need the word Appendix, and a fixed-size box. ++% ++\def\appendixbox#1{% ++ % We use M since it's probably the widest letter. ++ \setbox0 = \hbox{\putwordAppendix{} M}% ++ \hbox to \wd0{\putwordAppendix{} #1\hss}} + % +-\def\shortchaplabel#1{% +- % This space should be enough, since a single number is .5em, and the +- % widest letter (M) is 1em, at least in the Computer Modern fonts. +- % But use \hss just in case. +- % (This space doesn't include the extra space that gets added after +- % the label; that gets put in by \shortchapentry above.) +- \dimen0 = 1em +- \hbox to \dimen0{#1\hss}% +-} ++\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}} + + % Unnumbered chapters. +-\def\unnumbchapentry#1#2#3{\dochapentry{#1}{#3}} +-\def\shortunnumberedentry#1#2#3{\tocentry{#1}{\doshortpageno\bgroup#3\egroup}} ++\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}} ++\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}} + + % Sections. +-\def\secentry#1#2#3#4{\dosecentry{#2.#3\labelspace#1}{#4}} +-\def\unnumbsecentry#1#2#3#4{\dosecentry{#1}{#4}} ++\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}} ++\let\appsecentry=\numsecentry ++\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}} + + % Subsections. +-\def\subsecentry#1#2#3#4#5{\dosubsecentry{#2.#3.#4\labelspace#1}{#5}} +-\def\unnumbsubsecentry#1#2#3#4#5{\dosubsecentry{#1}{#5}} ++\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}} ++\let\appsubsecentry=\numsubsecentry ++\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}} + + % And subsubsections. +-\def\subsubsecentry#1#2#3#4#5#6{% +- \dosubsubsecentry{#2.#3.#4.#5\labelspace#1}{#6}} +-\def\unnumbsubsubsecentry#1#2#3#4#5#6{\dosubsubsecentry{#1}{#6}} ++\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}} ++\let\appsubsubsecentry=\numsubsubsecentry ++\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}} + + % This parameter controls the indentation of the various levels. +-\newdimen\tocindent \tocindent = 3pc ++\newdimen\tocindent \tocindent = 2pc + + % Now for the actual typesetting. In all these, #1 is the text and #2 is the + % page number. +@@ -4420,8 +4400,8 @@ + + \def\chapentryfonts{\secfonts \rm} + \def\secentryfonts{\textfonts} +-\let\subsecentryfonts = \textfonts +-\let\subsubsecentryfonts = \textfonts ++\def\subsecentryfonts{\textfonts} ++\def\subsubsecentryfonts{\textfonts} + + + \message{environments,} +@@ -4488,6 +4468,7 @@ + \let\!=\ptexexclam + \let\i=\ptexi + \let\indent=\ptexindent ++ \let\noindent=\ptexnoindent + \let\{=\ptexlbrace + \let\+=\tabalign + \let\}=\ptexrbrace +@@ -4975,9 +4956,6 @@ + \message{defuns,} + % @defun etc. + +-% Allow user to change definition object font (\df) internally +-\def\setdeffont#1 {\csname DEF#1\endcsname} +- + \newskip\defbodyindent \defbodyindent=.4in + \newskip\defargsindent \defargsindent=50pt + \newskip\deflastargmargin \deflastargmargin=18pt +@@ -5093,13 +5071,18 @@ + \begingroup\inENV + % If there are two @def commands in a row, we'll have a \nobreak, + % which is there to keep the function description together with its +- % header. But if there's nothing but headers, we want to allow a +- % break after all. Check for penalty 10002 (inserted by ++ % header. But if there's nothing but headers, we need to allow a ++ % break somewhere. Check for penalty 10002 (inserted by + % \defargscommonending) instead of 10000, since the sectioning + % commands insert a \penalty10000, and we don't want to allow a break + % between a section heading and a defun. +- \ifnum\lastpenalty=10002 \penalty0 \fi +- \medbreak ++ \ifnum\lastpenalty=10002 \penalty2000 \fi ++ % ++ % Similarly, after a section heading, do not allow a break. ++ % But do insert the glue. ++ \ifnum\lastpenalty<10000 \medbreak ++ \else \medskip % preceded by discardable penalty, so not a breakpoint ++ \fi + % + % Define the \E... end token that this defining construct specifies + % so that it will exit this group. +@@ -5115,7 +5098,7 @@ + \def\defxbodycommon{% + % As with \parsebodycommon above, allow line break if we have multiple + % x headers in a row. It's not a great place, though. +- \ifnum\lastpenalty=10000 \penalty1000 \fi ++ \ifnum\lastpenalty=10002 \penalty2000 \fi + % + \begingroup\obeylines + } +@@ -5263,7 +5246,7 @@ + \advance\rightskip by 0pt plus 1fil + \endgraf + \nobreak\vskip -\parskip +- \penalty 10002 % signal to \parsebodycommon. ++ \penalty 10002 % signal to \parsebodycommon and \defxbodycommon. + } + + % This expands the args and terminates the paragraph they comprise. +@@ -5843,7 +5826,6 @@ + + + \message{cross references,} +-% @xref etc. + + \newwrite\auxfile + +@@ -5855,39 +5837,28 @@ + \def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, + node \samp{\ignorespaces#1{}}} + +-% @node's job is to define \lastnode. ++% @node's only job in TeX is to define \lastnode, which is used in ++% cross-references. + \def\node{\ENVcheck\parsearg\nodezzz} + \def\nodezzz#1{\nodexxx #1,\finishnodeparse} + \def\nodexxx#1,#2\finishnodeparse{\gdef\lastnode{#1}} + \let\nwnode=\node +-\let\lastnode=\relax ++\let\lastnode=\empty + +-% The sectioning commands (@chapter, etc.) call these. +-\def\donoderef{% +- \ifx\lastnode\relax\else +- \expandafter\expandafter\expandafter\setref{\lastnode}% +- {Ysectionnumberandtype}% +- \global\let\lastnode=\relax +- \fi +-} +-\def\unnumbnoderef{% +- \ifx\lastnode\relax\else +- \expandafter\expandafter\expandafter\setref{\lastnode}{Ynothing}% +- \global\let\lastnode=\relax +- \fi +-} +-\def\appendixnoderef{% +- \ifx\lastnode\relax\else +- \expandafter\expandafter\expandafter\setref{\lastnode}% +- {Yappendixletterandtype}% +- \global\let\lastnode=\relax ++% Write a cross-reference definition for the current node. #1 is the ++% type (Ynumbered, Yappendix, Ynothing). ++% ++\def\donoderef#1{% ++ \ifx\lastnode\empty\else ++ \expandafter\expandafter\expandafter\setref{\lastnode}{#1}% ++ \global\let\lastnode=\empty + \fi + } + +- + % @anchor{NAME} -- define xref target at arbitrary point. + % + \newcount\savesfregister ++% + \gdef\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi} + \gdef\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi} + \gdef\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces} +@@ -5896,10 +5867,10 @@ + % anchor), namely NAME-title (the corresponding @chapter/etc. name), + % NAME-pg (the page number), and NAME-snt (section number and type). + % Called from \foonoderef. +-% +-% We have to set \indexdummies so commands such as @code in a section +-% title aren't expanded. It would be nicer not to expand the titles in +-% the first place, but there's so many layers that that is hard to do. ++% ++% We have to set dummies so commands such as @code in a section title ++% aren't expanded. It would be nicer not to expand the titles in the ++% first place, but that is hard to do. + % + % Likewise, use \turnoffactive so that punctuation chars such as underscore + % and backslash work in node names. +@@ -5908,10 +5879,12 @@ + \atdummies + \pdfmkdest{#1}% + % +- \turnoffactive +- \dosetq{#1-title}{Ytitle}% +- \dosetq{#1-pg}{Ypagenumber}% +- \dosetq{#1-snt}{#2}% ++ \iflinks ++ \turnoffactive ++ \dosetq{#1-title}{Ytitle}% ++ \dosetq{#1-pg}{Ypagenumber}% ++ \dosetq{#1-snt}{#2}% ++ \fi + }} + + % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is +@@ -5966,7 +5939,7 @@ + goto file{\the\filename.pdf} name{#1}% + \else + \startlink attr{/Border [0 0 0]}% +- goto name{#1}% ++ goto name{\pdfmkpgn{#1}}% + \fi + }% + \linkcolor +@@ -6008,10 +5981,8 @@ + % \dosetq is called from \setref to do the actual \write (\iflinks). + % + \def\dosetq#1#2{% +- {\let\folio=0% +- \edef\next{\write\auxfile{\internalsetq{#1}{#2}}}% +- \iflinks \next \fi +- }% ++ \edef\next{\write\auxfile{\internalsetq{#1}{#2}}}% ++ \next + } + + % \internalsetq{foo}{page} expands into +@@ -6020,10 +5991,11 @@ + + % Things to be expanded by \internalsetq. + % +-\def\Ypagenumber{\folio} ++\def\Ypagenumber{\noexpand\folio} + \def\Ytitle{\thissection} + \def\Ynothing{} +-\def\Ysectionnumberandtype{% ++\def\Yomitfromtoc{} ++\def\Ynumbered{% + \ifnum\secno=0 + \putwordChapter@tie \the\chapno + \else \ifnum\subsecno=0 +@@ -6034,8 +6006,7 @@ + \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno + \fi\fi\fi + } +- +-\def\Yappendixletterandtype{% ++\def\Yappendix{% + \ifnum\secno=0 + \putwordAppendix@tie @char\the\appendixno{}% + \else \ifnum\subsecno=0 +@@ -6177,7 +6148,6 @@ + \closein 1 + \input \jobname.aux + \global\havexrefstrue +- \global\warnedobstrue + \fi + % Open the new aux file. TeX will close it automatically at exit. + \openout\auxfile=\jobname.aux +@@ -6205,6 +6175,7 @@ + % Auto-number footnotes. Otherwise like plain. + \gdef\footnote{% + \let\indent=\ptexindent ++ \let\noindent=\ptexnoindent + \global\advance\footnoteno by \@ne + \edef\thisfootno{$^{\the\footnoteno}$}% + % +diff -urNad gpgme-1.0.0/ltmain.sh /tmp/dpep.0oFp0q/gpgme-1.0.0/ltmain.sh +--- gpgme-1.0.0/ltmain.sh 2004-09-30 19:00:01.000000000 +0200 ++++ /tmp/dpep.0oFp0q/gpgme-1.0.0/ltmain.sh 2004-09-30 19:01:16.000000000 +0200 +@@ -43,8 +43,8 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION=1.5.4 +-TIMESTAMP=" (1.1220.2.90 2004/04/03 14:10:19) Debian$Rev: 203 $" ++VERSION=1.5.6 ++TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 215 $" + + + # Check that we have a working $echo. +@@ -2933,6 +2933,11 @@ + age="$number_minor" + revision="$number_minor" + ;; ++ *) ++ $echo "$modename: unknown library version type \`$version_type'" 1>&2 ++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 ++ exit $EXIT_FAILURE ++ ;; + esac + ;; + no) +diff -urNad gpgme-1.0.0/Makefile.in /tmp/dpep.0oFp0q/gpgme-1.0.0/Makefile.in +--- gpgme-1.0.0/Makefile.in 2004-09-30 19:00:01.000000000 +0200 ++++ /tmp/dpep.0oFp0q/gpgme-1.0.0/Makefile.in 2004-09-30 19:00:02.000000000 +0200 +@@ -454,11 +454,11 @@ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) + dist-gzip: distdir +- $(AMTAR) chf - $(distdir) --posix | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + + dist dist-all: distdir +- $(AMTAR) chf - $(distdir) --posix | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + + # This target untars the dist file and tries a VPATH configuration. Then +diff -urNad gpgme-1.0.0/missing /tmp/dpep.0oFp0q/gpgme-1.0.0/missing +--- gpgme-1.0.0/missing 2004-09-30 19:00:01.000000000 +0200 ++++ /tmp/dpep.0oFp0q/gpgme-1.0.0/missing 2004-09-30 19:00:02.000000000 +0200 +@@ -1,6 +1,6 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. +-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + # Originally by Fran,cois Pinard , 1996. + + # This program is free software; you can redistribute it and/or modify +@@ -165,7 +165,7 @@ + WARNING: \`$1' is needed, and you do not seem to have it handy on your + system. You might have modified some files without having the + proper tools for further handling them. +- You can get \`$1Help2man' as part of \`Autoconf' from any GNU ++ You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` +@@ -326,7 +326,7 @@ + WARNING: \`$1' is needed, and you do not seem to have it handy on your + system. You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, +- it often tells you about the needed prerequirements for installing ++ it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 --- gpgme1.0-1.0.1.orig/debian/patches/00list +++ gpgme1.0-1.0.1/debian/patches/00list @@ -0,0 +1 @@ +#10_relibtoolize --- gpgme1.0-1.0.1.orig/debian/changelog +++ gpgme1.0-1.0.1/debian/changelog @@ -0,0 +1,291 @@ +gpgme1.0 (1.0.1-2) unstable; urgency=low + + * debian/rules: + + Bumped shlibs to 1.0.1, as this package exposes new symbols that could + be started to be used by programs, making them incompatible with older + libraries. + + * Yay! I forgot to close the "new release" bug. (Closes: #274357) + + -- Jose Carlos Garcia Sogo Tue, 16 Nov 2004 21:36:40 +0100 + +gpgme1.0 (1.0.1-1) unstable; urgency=low + + * New upstream release. + * debian/rules: + + Set a default path for gpgsm. This will enable it if present at run + time. + * debian/docs: + + There is no README-alpha file now. + + -- Jose Carlos Garcia Sogo Sat, 23 Oct 2004 11:16:09 +0200 + +gpgme1.0 (1.0.0-1) unstable; urgency=low + + * New upstream release. + * debian/control, debian/rules: + + Changed source package name to gpgme1.0, as we still need to keep in the + archive the old 0.3.x versions. + * debian/README.Debian: removed. + * debian/patches: + + 10_relibtoolize: updated (and disabled) + + -- Jose Carlos Garcia Sogo Thu, 30 Sep 2004 19:03:03 +0200 + +gpgme0.4 (0.9.0-1) unstable; urgency=low + + * New upstream version. + - Version has been bumped to 0.9.0, but for now tha package will be called + gpgme0.4 as habitual for this branch. + * debian/control: removed not needed texinfo build-dependency. + + -- Jose Carlos Garcia Sogo Sat, 19 Jun 2004 14:31:02 +0200 + +gpgme0.4 (0.4.7-1) unstable; urgency=low + + * New upstream version. + * debian/rules && debian/control: using dpatch now + * debian/patches: + + 10_relibtoolize.dpatch: new (For #242950) + * debian/rules: + + Added missing --enable-static to configure call. + + -- Jose Carlos Garcia Sogo Sun, 23 May 2004 22:33:41 +0200 + +gpgme0.4 (0.4.6-1) unstable; urgency=low + + * New upstream version. + * debian/rules: + - Stick shlibs to version 0.4.5 as nothing has changed in + this new version, only bugs fixed. + + -- Jose Carlos Garcia Sogo Sun, 18 Apr 2004 15:50:46 +0200 + +gpgme0.4 (0.4.5-1) unstable; urgency=low + + * New upstream version. + * Build Depends on libgpg-error (>= 0.7-1) + * This version is compiled with LFS support. This is a ABI break, but + following the comments in NEWS file, version won't be modified, so please, + test your packages. + + -- Jose Carlos Garcia Sogo Tue, 16 Mar 2004 23:58:26 +0100 + +gpgme0.4 (0.4.3-1) unstable; urgency=low + + * ACK of previous NMUs. + * The last NMU should have closed #220887, as the last version was packaged. + (Closes: #220887) + * Standars-Version bumped to 3.6.1. No changes needed. + + -- Jose Carlos Garcia Sogo Sun, 21 Dec 2003 12:59:38 +0100 + +gpgme0.4 (0.4.3-0.1) unstable; urgency=low + + * NMU with permission of maintainer + * new upstream version + - build-dep against libgpg-error-dev (>= 0.5) + - don't longer install doc/gpgme-*.info + * remote dh_undocumented call + + -- Bastian Blank Mon, 17 Nov 2003 20:21:47 +0100 + +gpgme0.4 (0.4.1-1.2) unstable; urgency=low + + * NMU + * brown-paoer bag release, perhaps I should start by checking the packages I + upload. + * Don't ship /usr/share/info/dir*, see #213524 (Closes: #218083). + + -- Andreas Metzler Wed, 29 Oct 2003 12:58:48 +0100 + +gpgme0.4 (0.4.1-1.1) unstable; urgency=low + + * NMU + * gpgme.h in libgpgme11-dev includes a header from libgpg-error-dev. Change + dependencies to reflect this. (Closes: #203989) + + -- Andreas Metzler Mon, 20 Oct 2003 16:21:10 +0200 + +gpgme0.4 (0.4.1-1) unstable; urgency=low + + * New upstream release. + - API changes, soname bumped to 11. + - New dependency on libgpg-error0. + * Standars-Version bumped to 3.5.10. No changes needed. + + -- Jose Carlos Garcia Sogo Mon, 23 Jun 2003 16:00:46 +0200 + +gpgme0.4 (0.4.0-1) unstable; urgency=low + + * New upstream version (0.4.x branch). + * Chaged source to gpgme0.4. + * Bump libgpgme soname to 10. + * Changed libgpgme-dev to libgpgme10-dev to go on supportig 0.3.x branch. + * Bump Standars-Version to 3.5.8 + + -- Jose Carlos Garcia Sogo Sun, 12 Jan 2003 10:59:19 +0100 + +gpgme (0.3.14-1) unstable; urgency=low + + * Another upstream release: fixes a segv. + * GPGME-Plug stuff is now in "cryptplug" package. Look at ITP #171097 + I'll close 144068 and 163246 bugs with cryptplug upload. + + -- Jose Carlos Garcia Sogo Wed, 4 Dec 2002 21:09:16 +0100 + +gpgme (0.3.13-1) unstable; urgency=low + + * New upstream released. + * (PACKAGE NOT UPLOADED) + + -- Jose Carlos Garcia Sogo Thu, 21 Nov 2002 19:12:49 +0100 + +gpgme (0.3.12-1) unstable; urgency=low + + * New upstream release. + + -- Jose Carlos Garcia Sogo Thu, 17 Oct 2002 18:11:05 +0200 + +gpgme (0.3.11-2) unstable; urgency=low + + * Updated config.[guess,sub] files. (Closes: #164527) + + -- Jose Carlos Garcia Sogo Sun, 13 Oct 2002 12:27:57 +0200 + +gpgme (0.3.11-1) unstable; urgency=low + + * New upstream release. + * Standars-Version to 3.5.7 + * Depends on GnuPG >= 1.2.0 + * gpgme-config manpage written. (Closes: #99179) + + -- Jose Carlos Garcia Sogo Sat, 12 Oct 2002 18:48:29 +0200 + +gpgme (0.3.10-1) unstable; urgency=low + + * New upstream version. + + -- Jose Carlos Garcia Sogo Mon, 2 Sep 2002 21:17:54 +0200 + +gpgme (0.3.8-1) unstable; urgency=low + + * New upstream release (another one ;) + + -- Jose Carlos Garcia Sogo Wed, 3 Jul 2002 00:35:53 +0200 + +gpgme (0.3.7-1) unstable; urgency=low + + * New upstream release. + + -- Jose Carlos Garcia Sogo Tue, 11 Jun 2002 12:41:59 +0200 + +gpgme (0.3.6-1) unstable; urgency=low + + * New upstream release. (Closes: #141990, #144761) + + -- Jose Carlos Garcia Sogo Sat, 4 May 2002 13:23:40 +0200 + +gpgme (0.3.5-1) unstable; urgency=low + + * New upstream release. + * Added a dot in doc/gpgme.info* files to solve the problem with + install-info complainig about bad entries. (Closes: #139631) + + -- Jose Carlos Garcia Sogo Mon, 1 Apr 2002 20:15:00 +0200 + +gpgme (0.3.4-2) unstable; urgency=low + + * Moved to main. + + -- Jose Carlos Garcia Sogo Sun, 24 Mar 2002 20:13:24 +0100 + +gpgme (0.3.4-1) unstable; urgency=low + + * New upstream release. + * Registered info files using dh_installinfo. (Closes: #137023) + + -- Jose Carlos Garcia Sogo Sat, 9 Mar 2002 11:13:48 +0100 + +gpgme (0.3.3-1) unstable; urgency=low + + * New upstream release. + + -- Jose Carlos Garcia Sogo Wed, 13 Feb 2002 15:10:27 +0100 + +gpgme (0.3.2-1) unstable; urgency=low + + * New upstream version. + * Now we have really documentation, so I'm removing from the package the + tests/ dir. + * Install info documentation. + + -- Jose Carlos Garcia Sogo Sun, 10 Feb 2002 17:24:04 +0100 + +gpgme (0.3.0-3) unstable; urgency=medium + + * Changed debian/copyright file to reflect that this software is under + the GNU GPL v2 or later. (Closes: #131230) + + -- Jose Carlos Garcia Sogo Mon, 28 Jan 2002 12:18:52 +0100 + +gpgme (0.3.0-2) unstable; urgency=low + + * I forgot to change the dependency in libgpgme-dev from libgpgme0 + to libgpgme5. That happens to me for doing things fast. + Thanks to Gustavo Norhona for pointing it. + + -- Jose Carlos Garcia Sogo Wed, 19 Dec 2001 23:32:02 +0100 + +gpgme (0.3.0-1) unstable; urgency=low + + * New upstream release. + * Bumped soname's lib package to 5. + * Fixed a typo in libgpgme and libgpgme-dev packages description. + (Closes: #124970,#124971) + * Removed the build-dependency on gnupg. Now we can specify the + path for gpg bin with --with-gpg option. + + -- Jose Carlos Garcia Sogo Wed, 19 Dec 2001 16:59:50 +0100 + +gpgme (0.2.3-2) unstable; urgency=low + + * Applied a patch to from Marcus Brinkman to make gpgme compile + in alpha. This patch has been applied in CVS version. + * Applied another patch to solve a bad initialization. (Closes: #119573) + + -- Jose Carlos Garcia Sogo Wed, 14 Nov 2001 16:36:45 +0100 + +gpgme (0.2.3-1) unstable; urgency=medium + + * New upstream release. + * Applied a little patch to keylist.c file to solve a little problem. + The patch is yet applied in upstream CVS. + + -- Jose Carlos Garcia Sogo Tue, 18 Sep 2001 13:17:19 +0200 + +gpgme (0.2.2-2) unstable; urgency=low + + * Added 'tests' dir from upstream to libgpgme-dev package, as it works + like some kind of documentation for this package. (Closes: #111164) + + * Changed the maintainer field to show the Debian email address. + + -- Jose Carlos Garcia Sogo Thu, 6 Sep 2001 20:03:05 +0200 + +gpgme (0.2.2-1) unstable; urgency=low + + * New upstream release. + * Updated config.{guess,sub} files. (closes: #98159) + + -- Jose Carlos Garcia Sogo Tue, 12 Jun 2001 16:34:05 +0200 + +gpgme (0.2.1-1) unstable; urgency=low + + * Initial Release (closes: #84233) + + -- Jose Carlos Garcia Sogo Mon, 30 Apr 2001 19:34:26 +0200 + +Local variables: +mode: debian-changelog +End: --- gpgme1.0-1.0.1.orig/debian/control +++ gpgme1.0-1.0.1/debian/control @@ -0,0 +1,26 @@ +Source: gpgme1.0 +Priority: optional +Section: libdevel +Maintainer: Jose Carlos Garcia Sogo +Build-Depends: debhelper (>> 4.1.40), libgpg-error-dev (>= 0.7-1), dpatch (>= 1.11) +Standards-Version: 3.6.1 + +Package: libgpgme11-dev +Section: libdevel +Architecture: any +Depends: libgpgme11 (= ${Source-Version}), libc6-dev, libgpg-error-dev +Conflicts: libgpgme-dev, libgpgme10-dev +Description: GPGME - GnuPG Made Easy + GPGME is a wrapper library which provides a C API to access some of the + GnuPG functions, such as encrypt, decrypt, sign, verify, ... + . + This package contains the headers and other files needed to compile + against this library. + +Package: libgpgme11 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, gnupg (>= 1.2.2) +Description: GPGME - GnuPG Made Easy + GPGME is a wrapper library which provides a C API to access some of the + GnuPG functions, such as encrypt, decrypt, sign, verify, ... --- gpgme1.0-1.0.1.orig/debian/rules +++ gpgme1.0-1.0.1/debian/rules @@ -0,0 +1,106 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatability version to use. +export DH_COMPAT=3 + +# C compiler information +CC = gcc +CFLAGS = -Wall -g + +INSTALL = install + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL += -s +endif + +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_HOST_GNU_TYPE) +else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + + +version=`ls gpgme/.libs/lib*.so.* | \ + awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +major=`ls gpgme/.libs/lib*.so.* | \ + awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +include /usr/share/dpatch/dpatch.make +PACKAGE=gpgme1.0 + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + + ./configure $(confflags) \ + --enable-static \ + --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + --with-gpg=/usr/bin/gpg \ + --with-gpgsm=/usr/bin/gpgsm + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + $(MAKE) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + -$(MAKE) distclean + + rm -f tests/gpg/*.gpg + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/ + +binary-indep: build + +binary-arch: build install + dh_testdir + dh_testroot + dh_movefiles + + dh_installdocs + dh_installman + dh_installinfo + dh_installchangelogs gpgme/ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs -V 'libgpgme11 (>= 1.0.1)' + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- gpgme1.0-1.0.1.orig/debian/copyright +++ gpgme1.0-1.0.1/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Jose Carlos Garcia Sogo on +Mon, 30 Apr 2001 12:03:08 +0200. + +It was downloaded from ftp://ftp.gnupg.org/GnuPG/gpgme + +Upstream Authors: + Werner Koch + g10 Code GmbH + FSF + + +Copyright: 2003 g10 Code GmbH + +Copyright statement: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +On Debian systems, the complete text of the GNU General Public License +can be found in /usr/share/common-licenses/GPL. --- gpgme1.0-1.0.1.orig/debian/docs +++ gpgme1.0-1.0.1/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- gpgme1.0-1.0.1.orig/debian/gpgme-config.1 +++ gpgme1.0-1.0.1/debian/gpgme-config.1 @@ -0,0 +1,37 @@ +.TH GPGME 1 "12 October 2002" +.SH NAME +gpgme-config - script to get information about the installed version of GPGME +.SH SYNOPSIS +.B gpgme-config [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags] +.SH DESCRIPTION +.PP +\fIgpgme-config\fP is a tool that is used to configure to determine +the compiler and linker flags that should be used to compile +and link programs that use \fIGPGME\fP. It is also used internally +to the .m4 macros for GNU autoconf that are included with \fIGPGME\fP. +. +.SH OPTIONS +.l +\fIgpgme-config\fP accepts the following options: +.TP 8 +.B \-\-version +Print the currently installed version of \fIGPGME\fP on the standard output. +.TP 8 +.B \-\-libs +Print the linker flags that are necessary to link a \fIGPGME\fP program. +.TP 8 +.B \-\-cflags +Print the compiler flags that are necessary to compile a \fIGPGME\fP program. +.TP 8 +.B \-\-prefix=PREFIX +If specified, use PREFIX instead of the installation prefix that \fIGPGME\fP +was built with when computing the output for the \-\-cflags and +\-\-libs options. This option is also used for the exec prefix +if \-\-exec\-prefix was not specified. This option must be specified +before any \-\-libs or \-\-cflags options. +.TP 8 +.B \-\-exec\-prefix=PREFIX +If specified, use PREFIX instead of the installation exec prefix that +\fIGpgME\fP was built with when computing the output for the \-\-cflags +and \-\-libs options. This option must be specified before any +\-\-libs or \-\-cflags options. --- gpgme1.0-1.0.1.orig/debian/libgpgme11-dev.dirs +++ gpgme1.0-1.0.1/debian/libgpgme11-dev.dirs @@ -0,0 +1,5 @@ +usr/lib +usr/include +usr/bin +usr/share/aclocal +usr/share/info --- gpgme1.0-1.0.1.orig/debian/libgpgme11-dev.doc-base +++ gpgme1.0-1.0.1/debian/libgpgme11-dev.doc-base @@ -0,0 +1,12 @@ +Document: gpgme +Title: gpgme +Abstract: GPGME is a wrapper library which provides a C API to access some of the + GnuPG functions, such as encrypt, decrypt, sign, verify, ... + . + This package contains the headers and other files needed to compile + against this library. +Section: Apps/programming + +Format: info +Index: /usr/share/info/gpgme.info.gz +Files: /usr/share/info/gpgme.info* --- gpgme1.0-1.0.1.orig/debian/libgpgme11-dev.files +++ gpgme1.0-1.0.1/debian/libgpgme11-dev.files @@ -0,0 +1,7 @@ +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/*.la +usr/bin/gpgme-config +usr/share/aclocal/* +usr/share/info/* --- gpgme1.0-1.0.1.orig/debian/libgpgme11-dev.info +++ gpgme1.0-1.0.1/debian/libgpgme11-dev.info @@ -0,0 +1 @@ +doc/gpgme.info --- gpgme1.0-1.0.1.orig/debian/libgpgme11-dev.manpages +++ gpgme1.0-1.0.1/debian/libgpgme11-dev.manpages @@ -0,0 +1 @@ +debian/gpgme-config.1 --- gpgme1.0-1.0.1.orig/debian/libgpgme11.dirs +++ gpgme1.0-1.0.1/debian/libgpgme11.dirs @@ -0,0 +1 @@ +usr/lib --- gpgme1.0-1.0.1.orig/debian/libgpgme11.files +++ gpgme1.0-1.0.1/debian/libgpgme11.files @@ -0,0 +1 @@ +usr/lib/lib*.so.*