No OneTemporary
Actions

Size

29 KB

Subscribers

None

View Options

	diff --git a/Makefile.am b/Makefile.am
	index c797e4f..1dc647d 100644
	--- a/Makefile.am
	+++ b/Makefile.am
	@@ -1,63 +1,62 @@
	# Makefile.am - main makefile for libksba
	# Copyright (C) 2001, 2002 g10 Code GmbH
	#
	# This file is part of KSBA.
	#
	# KSBA 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; either version 3 of the License, or
	# (at your option) any later version.
	#
	# KSBA 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, see <http://www.gnu.org/licenses/>.

	## Process this file with automake to produce Makefile.in

	ACLOCAL_AMFLAGS = -I m4 -I gl/m4
	AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip

	# (A suitable gitlog-to-changelog script can be found in GnuPG master.)
	GITLOG_TO_CHANGELOG=gitlog-to-changelog

	EXTRA_DIST = autogen.sh autogen.rc \
	COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3 \
	ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \
	tests/ChangeLog-2011 \
	build-aux/git-log-footer build-aux/git-log-fix


	if CROSS_COMPILING
	tests =
	else
	tests = tests
	endif


	SUBDIRS = m4 gl src ${tests} doc

	dist-hook: gen-ChangeLog
	- @set -e; echo "$(VERSION)" > $(distdir)/VERSION


	gen_start_date = 2011-12-01T00:00:00
	.PHONY: gen-ChangeLog
	gen-ChangeLog:
	if test -d $(top_srcdir)/.git; then \
	(cd $(top_srcdir) && \
	$(GITLOG_TO_CHANGELOG) --append-dot --tear-off \
	--amend=build-aux/git-log-fix \
	--since=$(gen_start_date) ) > $(distdir)/cl-t; \
	cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\
	rm -f $(distdir)/ChangeLog; \
	mv $(distdir)/cl-t $(distdir)/ChangeLog; \
	fi



	stowinstall:
	$(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/libksba
	diff --git a/autogen.sh b/autogen.sh
	index ea3d5fc..7effd56 100755
	--- a/autogen.sh
	+++ b/autogen.sh
	@@ -1,387 +1,468 @@
	#! /bin/sh
	# autogen.sh
	# Copyright (C) 2003, 2014 g10 Code GmbH
	#
	# This file is free software; as a special exception the author gives
	# unlimited permission to copy and/or distribute it, with or without
	# modifications, as long as this notice is preserved.
	#
	# This program is distributed in the hope that it will be useful, but
	# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
	# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	#
	# This is a generic script to create the configure script and handle cross
	# build environments. It requires the presence of a autogen.rc file to
	# configure it for the respective package. It is maintained as part of
	# GnuPG and source copied by other packages.
	#
	-# Version: 2014-01-10
	+# Version: 2014-06-06

	configure_ac="configure.ac"

	cvtver () {
	awk 'NR==1 {split($NF,A,".");X=1000000A[1]+1000A[2]+A[3];print X;exit 0}'
	}

	check_version () {
	if [ $(( `("$1" --version \|\| echo "0") \| cvtver` >= $2 )) = 1 ]; then
	return 0
	fi
	echo "Error: "\`$1\'" not installed or too old." >&2
	echo ' Version '$3' or newer is required.' >&2
	[ -n "$4" ] && echo ' Note that this is part of '\`$4\''.' >&2
	DIE="yes"
	return 1
	}

	fatal () {
	echo "autogen.sh:" "$*" >&2
	DIE=yes
	}

	info () {
	if [ -z "${SILENT}" ]; then
	- echo "autogen.sh:" "$*"
	+ echo "autogen.sh:" "$*" >&2
	fi
	}

	die_p () {
	if [ "$DIE" = "yes" ]; then
	echo "autogen.sh: Stop." >&2
	exit 1
	fi
	}

	replace_sysroot () {
	configure_opts=$(echo $configure_opts \| sed "s#@SYSROOT@#${w32root}#g")
	extraoptions=$(echo $extraoptions \| sed "s#@SYSROOT@#${w32root}#g")
	}

	# Allow to override the default tool names
	AUTOCONF=${AUTOCONF_PREFIX}${AUTOCONF:-autoconf}${AUTOCONF_SUFFIX}
	AUTOHEADER=${AUTOCONF_PREFIX}${AUTOHEADER:-autoheader}${AUTOCONF_SUFFIX}

	AUTOMAKE=${AUTOMAKE_PREFIX}${AUTOMAKE:-automake}${AUTOMAKE_SUFFIX}
	ACLOCAL=${AUTOMAKE_PREFIX}${ACLOCAL:-aclocal}${AUTOMAKE_SUFFIX}

	GETTEXT=${GETTEXT_PREFIX}${GETTEXT:-gettext}${GETTEXT_SUFFIX}
	MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}

	DIE=no
	FORCE=
	SILENT=
	+PRINT_HOST=no
	+PRINT_BUILD=no
	tmp=$(dirname "$0")
	tsdir=$(cd "${tmp}"; pwd)
	+version_parts=3

	if [ -n "${AUTOGEN_SH_SILENT}" ]; then
	SILENT=" --silent"
	fi
	if test x"$1" = x"--help"; then
	echo "usage: ./autogen.sh [--silent] [--force] [--build-TYPE] [ARGS]"
	exit 0
	fi
	if test x"$1" = x"--silent"; then
	SILENT=" --silent"
	shift
	fi
	if test x"$1" = x"--force"; then
	FORCE=" --force"
	shift
	fi
	+if test x"$1" = x"--print-host"; then
	+ PRINT_HOST=yes
	+ shift
	+fi
	+if test x"$1" = x"--print-build"; then
	+ PRINT_BUILD=yes
	+ shift
	+fi


	# Reject unsafe characters in $HOME, $tsdir and cwd. We consider spaces
	# as unsafe because it is too easy to get scripts wrong in this regard.
	am_lf='
	'
	case `pwd` in
	[\;\\\"\#\$\&\'\`$am_lf\ \ ])
	fatal "unsafe working directory name" ;;
	esac
	case $tsdir in
	[\;\\\"\#\$\&\'\`$am_lf\ \ ])
	fatal "unsafe source directory: \`$tsdir'" ;;
	esac
	case $HOME in
	[\;\\\"\#\$\&\'\`$am_lf\ \ ])
	fatal "unsafe home directory: \`$HOME'" ;;
	esac
	die_p


	# List of variables sourced from autogen.rc. The strings '@SYSROOT@' in
	# these variables are replaced by the actual system root.
	configure_opts=
	extraoptions=
	# List of optional variables sourced from autogen.rc and ~/.gnupg-autogen.rc
	w32_toolprefixes=
	w32_extraoptions=
	w32ce_toolprefixes=
	w32ce_extraoptions=
	w64_toolprefixes=
	w64_extraoptions=
	amd64_toolprefixes=
	# End list of optional variables sourced from ~/.gnupg-autogen.rc
	# What follows are variables which are sourced but default to
	# environment variables or lacking them hardcoded values.
	#w32root=
	#w32ce_root=
	#w64root=
	#amd64root=

	# Convenience option to use certain configure options for some hosts.
	myhost=""
	myhostsub=""
	case "$1" in
	+ --find-version)
	+ myhost="find-version"
	+ SILENT=" --silent"
	+ shift
	+ ;;
	--build-w32)
	myhost="w32"
	shift
	;;
	--build-w32ce)
	myhost="w32"
	myhostsub="ce"
	shift
	;;
	--build-w64)
	myhost="w32"
	myhostsub="64"
	shift
	;;
	--build-amd64)
	myhost="amd64"
	shift
	;;
	--build*)
	fatal "Error: invalid build option $1"
	shift
	;;
	*)
	;;
	esac
	die_p


	# Source our configuration
	if [ -f "${tsdir}/autogen.rc" ]; then
	. "${tsdir}/autogen.rc"
	fi

	# Source optional site specific configuration
	if [ -f "$HOME/.gnupg-autogen.rc" ]; then
	info "sourcing extra definitions from $HOME/.gnupg-autogen.rc"
	. "$HOME/.gnupg-autogen.rc"
	fi

	+
	+# ** FIND VERSION **
	+# This is a helper for the configure.ac M4 magic
	+# Called
	+# ./autogen.sh --find-version PACKAGE MAJOR MINOR [MICRO]
	+# returns a complete version string with automatic beta numbering.
	+if [ "$myhost" = "find-version" ]; then
	+ package="$1"
	+ major="$2"
	+ minor="$3"
	+ micro="$4"
	+
	+ case "$version_parts" in
	+ 2)
	+ matchstr1="$package-$major.[0-9]*"
	+ matchstr2="$package-$major-base"
	+ vers="$major.$minor"
	+ ;;
	+ *)
	+ matchstr1="$package-$major.$minor.[0-9]*"
	+ matchstr2="$package-$major.$minor-base"
	+ vers="$major.$minor.$micro"
	+ ;;
	+ esac
	+
	+ beta=no
	+ if [ -d .git ]; then
	+ ingit=yes
	+ tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
	+ if [ -n "$tmp" ]; then
	+ tmp=$(echo "$tmp"\|awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}')
	+ else
	+ tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null \
	+ \| awk -F- '$4!=0{print"-beta"$4}')
	+ fi
	+ [ -n "$tmp" ] && beta=yes
	+ rev=$(git rev-parse --short HEAD \| tr -d '\n\r')
	+ rvd=$((0x$(echo ${rev} \| head -c 4)))
	+ else
	+ ingit=no
	+ beta=yes
	+ tmp="-unknown"
	+ rev="0000000"
	+ rvd="0"
	+ fi
	+
	+ echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:"
	+ exit 0
	+fi
	+# ** end FIND VERSION **
	+
	+
	+if [ ! -f "$tsdir/build-aux/config.guess" ]; then
	+ fatal "$tsdir/build-aux/config.guess not found"
	+ exit 1
	+fi
	+build=`$tsdir/build-aux/config.guess`
	+if [ $PRINT_BUILD = yes ]; then
	+ echo "$build"
	+ exit 0
	+fi
	+
	+
	+
	# ******************
	# W32 build script
	# ******************
	if [ "$myhost" = "w32" ]; then
	- if [ ! -f "$tsdir/build-aux/config.guess" ]; then
	- fatal "$tsdir/build-aux/config.guess not found"
	- exit 1
	- fi
	- build=`$tsdir/build-aux/config.guess`
	-
	case $myhostsub in
	ce)
	w32root="$w32ce_root"
	[ -z "$w32root" ] && w32root="$HOME/w32ce_root"
	toolprefixes="$w32ce_toolprefixes arm-mingw32ce"
	extraoptions="$extraoptions $w32ce_extraoptions"
	;;
	+ 64)
	+ w32root="$w64root"
	+ [ -z "$w32root" ] && w32root="$HOME/w64root"
	+ toolprefixes="$w64_toolprefixes x86_64-w64-mingw32"
	+ extraoptions="$extraoptions $w64_extraoptions"
	+ ;;
	*)
	[ -z "$w32root" ] && w32root="$HOME/w32root"
	toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
	toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
	extraoptions="$extraoptions $w32_extraoptions"
	;;
	esac
	info "Using $w32root as standard install directory"
	replace_sysroot

	# Locate the cross compiler
	crossbindir=
	for host in $toolprefixes; do
	if ${host}-gcc --version >/dev/null 2>&1 ; then
	crossbindir=/usr/${host}/bin
	conf_CC="CC=${host}-gcc"
	break;
	fi
	done
	if [ -z "$crossbindir" ]; then
	fatal "cross compiler kit not installed"
	if [ -z "$myhostsub" ]; then
	info "Under Debian GNU/Linux, you may install it using"
	info " apt-get install mingw32 mingw32-runtime mingw32-binutils"
	fi
	die_p
	fi
	+ if [ $PRINT_HOST = yes ]; then
	+ echo "$host"
	+ exit 0
	+ fi

	if [ -f "$tsdir/config.log" ]; then
	if ! head $tsdir/config.log \| grep "$host" >/dev/null; then
	fatal "Please run a 'make distclean' first"
	die_p
	fi
	fi

	$tsdir/configure --enable-maintainer-mode ${SILENT} \
	--prefix=${w32root} \
	- --host=${host} --build=${build} \
	+ --host=${host} --build=${build} SYSROOT=${w32root} \
	${configure_opts} ${extraoptions} "$@"
	rc=$?
	exit $rc
	fi
	# *** end W32 build script *****

	# *** AMD64 cross build script *****
	# Used to cross-compile for AMD64 (for testing)
	if [ "$myhost" = "amd64" ]; then
	- shift
	- if [ ! -f $tsdir/build-aux/config.guess ]; then
	- echo "$tsdir/build-aux/config.guess not found" >&2
	- exit 1
	- fi
	- build=`$tsdir/build-aux/config.guess`
	-
	[ -z "$amd64root" ] && amd64root="$HOME/amd64root"
	info "Using $amd64root as standard install directory"
	replace_sysroot

	toolprefixes="$amd64_toolprefixes x86_64-linux-gnu amd64-linux-gnu"

	# Locate the cross compiler
	crossbindir=
	for host in $toolprefixes ; do
	if ${host}-gcc --version >/dev/null 2>&1 ; then
	crossbindir=/usr/${host}/bin
	conf_CC="CC=${host}-gcc"
	break;
	fi
	done
	if [ -z "$crossbindir" ]; then
	echo "Cross compiler kit not installed" >&2
	echo "Stop." >&2
	exit 1
	fi
	+ if [ $PRINT_HOST = yes ]; then
	+ echo "$host"
	+ exit 0
	+ fi

	if [ -f "$tsdir/config.log" ]; then
	if ! head $tsdir/config.log \| grep "$host" >/dev/null; then
	echo "Please run a 'make distclean' first" >&2
	exit 1
	fi
	fi

	$tsdir/configure --enable-maintainer-mode ${SILENT} \
	--prefix=${amd64root} \
	--host=${host} --build=${build} \
	${configure_opts} ${extraoptions} "$@"
	rc=$?
	exit $rc
	fi
	# *** end AMD64 cross build script *****


	# Grep the required versions from configure.ac
	autoconf_vers=`sed -n '/^AC_PREREQ(/ {
	s/^.($.$)/\1/p
	q
	}' ${configure_ac}`
	autoconf_vers_num=`echo "$autoconf_vers" \| cvtver`

	automake_vers=`sed -n '/^min_automake_version=/ {
	s/^.="$.$"/\1/p
	q
	}' ${configure_ac}`
	automake_vers_num=`echo "$automake_vers" \| cvtver`

	if [ -d "${tsdir}/po" ]; then
	gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
	s/^.\[$.$])/\1/p
	q
	}' ${configure_ac}`
	gettext_vers_num=`echo "$gettext_vers" \| cvtver`
	else
	gettext_vers="n/a"
	fi

	if [ -z "$autoconf_vers" -o -z "$automake_vers" -o -z "$gettext_vers" ]
	then
	echo "Error: version information not found in "\`${configure_ac}\'"." >&2
	exit 1
	fi


	if check_version $AUTOCONF $autoconf_vers_num $autoconf_vers ; then
	check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf
	fi
	if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
	check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
	fi
	if [ "$gettext_vers" != "n/a" ]; then
	if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
	check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
	fi
	fi

	if [ "$DIE" = "yes" ]; then
	cat <<EOF

	Note that you may use alternative versions of the tools by setting
	the corresponding environment variables; see README.GIT for details.

	EOF
	die_p
	fi

	# Check the git setup.
	if [ -d .git ]; then
	CP="cp -a"
	[ -z "${SILENT}" ] && CP="$CP -v"
	if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
	[ -z "${SILENT}" ] && cat <<EOF
	* Activating trailing whitespace git pre-commit hook. *
	For more information see this thread:
	http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084html
	To deactivate this pre-commit hook again move .git/hooks/pre-commit
	and .git/hooks/pre-commit.sample out of the way.
	EOF
	$CP .git/hooks/pre-commit.sample .git/hooks/pre-commit
	chmod +x .git/hooks/pre-commit
	fi

	if [ "$gettext_vers" != "n/a" ]; then
	tmp=$(git config --get filter.cleanpo.clean)
	if [ "$tmp" != \
	"awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
	then
	info "*** Adding GIT filter.cleanpo.clean configuration."
	git config --add filter.cleanpo.clean \
	"awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
	fi
	fi
	if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
	[ -z "${SILENT}" ] && cat <<EOF
	* Activating commit log message check hook. *
	EOF
	$CP build-aux/git-hooks/commit-msg .git/hooks/commit-msg
	chmod +x .git/hooks/commit-msg
	fi
	fi

	aclocal_flags="-I m4"
	if [ -n "${extra_aclocal_flags}" ]; then
	aclocal_flags="${aclocal_flags} ${extra_aclocal_flags}"
	fi
	if [ -n "${ACLOCAL_FLAGS}" ]; then
	aclocal_flags="${aclocal_flags} ${ACLOCAL_FLAGS}"
	fi
	info "Running $ACLOCAL ${aclocal_flags} ..."
	$ACLOCAL ${aclocal_flags}
	info "Running autoheader..."
	$AUTOHEADER
	info "Running automake --gnu ..."
	$AUTOMAKE --gnu;
	info "Running autoconf${FORCE} ..."
	$AUTOCONF${FORCE}

	info "You may now run:${am_lf} ${final_info}"
	diff --git a/configure.ac b/configure.ac
	index 85311aa..283b9a9 100644
	--- a/configure.ac
	+++ b/configure.ac
	@@ -1,417 +1,417 @@
	# configure.ac - for libksba
	# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
	# 2010, 2011, 2012 g10 Code GmbH
	#
	# This file is part of KSBA
	#
	# KSBA 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; either version 3 of the License, or
	# (at your option) any later version.
	#
	# KSBA 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, see <http://www.gnu.org/licenses/>.

	# Process this file with autoconf to produce a configure script.
	AC_PREREQ(2.61)
	min_automake_version="1.10"


	# To build a release you need to create a tag with the version number
	# (git tag -s libksba-n.m.k) and run "./autogen.sh --force". Please
	# bump the version number immediately after the release and do another
	# commit and push so that the git magic is able to work. See below
	# for the LT versions.
	-m4_define(mym4_version, [1.3.2])
	-
	-# Below is m4 magic to extract and compute the revision number, the
	-# decimalized short revision number, a beta version string, and a flag
	-# indicating a development version (mym4_isgit). Note that the m4
	-# processing is done by autoconf and not during the configure run.
	-m4_define([mym4_revision],
	- m4_esyscmd([git rev-parse --short HEAD \| tr -d '\n\r']))
	-m4_define([mym4_revision_dec],
	- m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[\|head -c 4)))]))
	-m4_define([mym4_betastring],
	- m4_esyscmd_s([git describe --match 'libksba-[0-9].*[0-9]' --long\|\
	- awk -F- '$3!=0{print"-beta"$3}']))
	-m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
	-m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
	-
	-AC_INIT([libksba],[mym4_full_version],[http://bugs.gnupg.org])
	+m4_define([mym4_package],[libksba])
	+m4_define([mym4_major], [1])
	+m4_define([mym4_minor], [3])
	+m4_define([mym4_micro], [2])
	+
	+# Below is m4 magic to extract and compute the git revision number,
	+# the decimalized short revision number, a beta version string and a
	+# flag indicating a development version (mym4_isbeta). Note that the
	+# m4 processing is done by autoconf and not during the configure run.
	+m4_define([mym4_verslist], m4_split(m4_esyscmd([./autogen.sh --find-version] \
	+ mym4_package mym4_major mym4_minor mym4_micro),[:]))
	+m4_define([mym4_isbeta], m4_argn(2, mym4_verslist))
	+m4_define([mym4_version], m4_argn(4, mym4_verslist))
	+m4_define([mym4_revision], m4_argn(7, mym4_verslist))
	+m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist))
	+m4_esyscmd([echo ]mym4_version[>VERSION])
	+AC_INIT([mym4_package],[mym4_version], [http://bugs.gnupg.org])

	# LT Version numbers: Remember to change them just before a release.
	# (Interfaces removed: CURRENT++, AGE=0, REVISION=0)
	# (Interfaces added: CURRENT++, AGE++, REVISION=0)
	# (No interfaces changed: REVISION++)
	# Please remember to document interface changes in the NEWS file.
	LIBKSBA_LT_CURRENT=19
	LIBKSBA_LT_AGE=11
	LIBKSBA_LT_REVISION=2
	#-------------------
	# If the API is changed in an incompatible way: increment the next counter.
	KSBA_CONFIG_API_VERSION=1


	NEED_GPG_ERROR_VERSION=1.8


	PACKAGE=$PACKAGE_NAME
	VERSION=$PACKAGE_VERSION

	AC_CONFIG_AUX_DIR([build-aux])
	AC_CONFIG_SRCDIR([src/ksba.h])
	AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
	AM_CONFIG_HEADER(config.h)
	AC_CONFIG_MACRO_DIR([m4])
	AC_CANONICAL_HOST
	AB_INIT

	AC_GNU_SOURCE

	LT_PREREQ([2.2.6])
	LT_INIT([win32-dll disable-static])
	LT_LANG([Windows Resource])

	AM_MAINTAINER_MODE


	AC_SUBST(LIBKSBA_LT_CURRENT)
	AC_SUBST(LIBKSBA_LT_AGE)
	AC_SUBST(LIBKSBA_LT_REVISION)
	AC_SUBST(PACKAGE)
	AC_SUBST(VERSION)
	AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
	AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])

	AH_TOP([
	#ifndef _KSBA_CONFIG_H_INCLUDED
	#define _KSBA_CONFIG_H_INCLUDED

	/* Enable gpg-error's strerror macro for W32CE. */
	#define GPG_ERR_ENABLE_ERRNO_MACROS 1
	])

	AH_BOTTOM([

	#endif /_KSBA_CONFIG_H_INCLUDED/
	])



	# Checks for programs.
	missing_dir=`cd $ac_aux_dir && pwd`
	AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
	AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
	AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
	AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
	AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
	AM_SILENT_RULES
	AC_PROG_AWK
	AC_PROG_CC
	AC_PROG_CPP
	AM_PROG_CC_C_O
	if test "x$ac_cv_prog_cc_c89" = "xno" ; then
	AC_MSG_ERROR([[No C-89 compiler found]])
	fi
	AC_PROG_INSTALL
	AC_PROG_LN_S
	AC_PROG_MAKE_SET
	gl_EARLY
	#AC_ARG_PROGRAM
	AC_PROG_YACC
	AC_C_INLINE

	# We need to compile and run a program on the build machine.
	# The AC_PROG_CC_FOR_BUILD macro in the AC archive is broken for
	# autoconf 2.57.
	AC_MSG_CHECKING(for cc for build)
	if test "$cross_compiling" = "yes"; then
	CC_FOR_BUILD="${CC_FOR_BUILD-cc}"
	else
	CC_FOR_BUILD="${CC_FOR_BUILD-$CC}"
	fi
	AC_MSG_RESULT($CC_FOR_BUILD)
	AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])


	# This is handy for debugging so the compiler doesn't rearrange
	# things and eliminate variables.
	AC_ARG_ENABLE(optimization,
	AC_HELP_STRING([--disable-optimization],
	[disable compiler optimization]),
	[if test $enableval = no ; then
	CFLAGS=`echo $CFLAGS \| sed 's/-O[[0-9]]//'`
	fi])

	if test "$GCC" = yes; then
	CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes"

	if test "$USE_MAINTAINER_MODE" = "yes"; then
	CFLAGS="$CFLAGS -Wformat -Wno-format-y2k -Wformat-security"

	# We use -W only if -Wno-missing-field-initializers is supported.
	# -W is important because it detects errors like "if (foo);"
	AC_MSG_CHECKING([if gcc supports -Wno-missing-field-initializers])
	_gcc_cflags_save=$CFLAGS
	CFLAGS="-Wno-missing-field-initializers"
	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_wopt=yes,_gcc_wopt=no)
	AC_MSG_RESULT($_gcc_wopt)
	CFLAGS=$_gcc_cflags_save;
	if test x"$_gcc_wopt" = xyes ; then
	CFLAGS="$CFLAGS -W -Wno-sign-compare -Wno-missing-field-initializers"
	fi

	AC_MSG_CHECKING([if gcc supports -Wdeclaration-after-statement])
	_gcc_cflags_save=$CFLAGS
	CFLAGS="-Wdeclaration-after-statement"
	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_wopt=yes,_gcc_wopt=no)
	AC_MSG_RESULT($_gcc_wopt)
	CFLAGS=$_gcc_cflags_save;
	if test x"$_gcc_wopt" = xyes ; then
	CFLAGS="$CFLAGS -Wdeclaration-after-statement"
	fi
	fi

	AC_MSG_CHECKING([if gcc supports -Wpointer-arith])
	_gcc_cflags_save=$CFLAGS
	CFLAGS="-Wpointer-arith"
	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_wopt=yes,_gcc_wopt=no)
	AC_MSG_RESULT($_gcc_wopt)
	CFLAGS=$_gcc_cflags_save;
	if test x"$_gcc_wopt" = xyes ; then
	CFLAGS="$CFLAGS -Wpointer-arith"
	fi

	AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
	_gcc_cflags_save=$CFLAGS
	CFLAGS="-Wno-pointer-sign"
	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_psign=yes,_gcc_psign=no)
	AC_MSG_RESULT($_gcc_psign)
	CFLAGS=$_gcc_cflags_save;
	if test x"$_gcc_psign" = xyes ; then
	CFLAGS="$CFLAGS -Wno-pointer-sign"
	fi

	fi

	# Setup some stuff depending on host.
	have_w32_system=no
	have_w32ce_system=no
	case "${host}" in
	--mingw32ce*)
	have_w32_system=yes
	have_w32ce_system=yes
	;;
	--mingw32*)
	have_w32_system=yes
	;;
	*)
	;;
	esac
	if test "$have_w32_system" = yes; then
	AC_DEFINE(HAVE_W32_SYSTEM,1, [Defined if we run on a W32 API based system])
	if test "$have_w32ce_system" = yes; then
	AC_DEFINE(HAVE_W32CE_SYSTEM,1,[Defined if we run on WindowsCE])
	fi
	fi
	AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
	AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes)


	# For some systems we know that we have ld_version scripts.
	# Use it then as default.
	have_ld_version_script=no
	case "${host}" in
	--linux*)
	have_ld_version_script=yes
	;;
	--gnu*)
	have_ld_version_script=yes
	;;
	esac
	AC_ARG_ENABLE([ld-version-script],
	AC_HELP_STRING([--enable-ld-version-script],
	[enable/disable use of linker version script.
	(default is system dependent)]),
	[have_ld_version_script=$enableval],
	[ : ] )
	AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")


	#
	# Check for ELF visibility support.
	#
	AC_CACHE_CHECK(whether the visibility attribute is supported,
	ksba_cv_visibility_attribute,
	[ksba_cv_visibility_attribute=no
	AC_LANG_CONFTEST([AC_LANG_SOURCE(
	[[int foo __attribute__ ((visibility ("hidden"))) = 1;
	int bar __attribute__ ((visibility ("protected"))) = 1;
	]])])

	if ${CC-cc} -Werror -S conftest.c -o conftest.s \
	1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ; then
	if grep '\.hidden.*foo' conftest.s >/dev/null 2>&1 ; then
	if grep '\.protected.*bar' conftest.s >/dev/null 2>&1; then
	ksba_cv_visibility_attribute=yes
	fi
	fi
	fi
	])
	if test "$ksba_cv_visibility_attribute" = "yes"; then
	AC_CACHE_CHECK(for broken visibility attribute,
	ksba_cv_broken_visibility_attribute,
	[ksba_cv_broken_visibility_attribute=yes
	AC_LANG_CONFTEST([AC_LANG_SOURCE(
	[[int foo (int x);
	int bar (int x) __asm__ ("foo")
	__attribute__ ((visibility ("hidden")));
	int bar (int x) { return x; }
	]])])

	if ${CC-cc} -Werror -S conftest.c -o conftest.s \
	1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ; then
	if grep '\.hidden@<:@ _@:>@foo' conftest.s >/dev/null 2>&1;
	then
	ksba_cv_broken_visibility_attribute=no
	fi
	fi
	])
	fi
	if test "$ksba_cv_visibility_attribute" = "yes"; then
	AC_CACHE_CHECK(for broken alias attribute,
	ksba_cv_broken_alias_attribute,
	[ksba_cv_broken_alias_attribute=yes
	AC_LANG_CONFTEST([AC_LANG_SOURCE(
	[[extern int foo (int x) __asm ("xyzzy");
	int bar (int x) { return x; }
	extern __typeof (bar) foo __attribute ((weak, alias ("bar")));
	extern int dfoo;
	extern __typeof (dfoo) dfoo __asm ("abccb");
	int dfoo = 1;
	]])])

	if ${CC-cc} -Werror -S conftest.c -o conftest.s \
	1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ; then
	if grep 'xyzzy' conftest.s >/dev/null 2>&1 && \
	grep 'abccb' conftest.s >/dev/null 2>&1; then
	ksba_cv_broken_alias_attribute=no
	fi
	fi
	])
	fi
	if test "$ksba_cv_visibility_attribute" = "yes"; then
	AC_CACHE_CHECK(if gcc supports -fvisibility=hidden,
	ksba_cv_gcc_has_f_visibility,
	[ksba_cv_gcc_has_f_visibility=no
	_gcc_cflags_save=$CFLAGS
	CFLAGS="-fvisibility=hidden"
	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
	ksba_cv_gcc_has_f_visibility=yes)
	CFLAGS=$_gcc_cflags_save;
	])
	fi
	if test "$ksba_cv_visibility_attribute" = "yes" \
	&& test "$ksba_cv_broken_visibility_attribute" != "yes" \
	&& test "$ksba_cv_broken_alias_attribute" != "yes" \
	&& test "$ksba_cv_gcc_has_f_visibility" = "yes"
	then
	AC_DEFINE(KSBA_USE_VISIBILITY, 1,
	[Define to use the GNU C visibility attribute.])
	CFLAGS="$CFLAGS -fvisibility=hidden"
	fi


	#
	# Checks for libraries.
	#
	AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION")
	if test "x$GPG_ERROR_LIBS" = "x"; then
	AC_MSG_ERROR([libgpg-error is needed.
	See ftp://ftp.gnupg.org/gcrypt/libgpg-error/ .])
	fi

	AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_KSBA,
	[The default error source for libksba.])


	# Checks for header files.
	AC_HEADER_STDC
	AC_CHECK_HEADERS([string.h])

	# Checks for typedefs, structures, and compiler characteristics.
	AC_C_CONST

	AC_C_BIGENDIAN

	AC_CHECK_SIZEOF(unsigned int)
	AC_CHECK_SIZEOF(unsigned long)
	GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)


	# Checks for library functions.
	AC_CHECK_FUNCS([memmove strchr strtol strtoul stpcpy gmtime_r getenv])


	# GNUlib checks
	gl_SOURCE_BASE(gl)
	gl_M4_BASE(gl/m4)
	gl_MODULES(alloca valgrind-tests)
	gl_INIT

	# To be used in ksba-config
	KSBA_CONFIG_LIBS="-lksba"
	KSBA_CONFIG_CFLAGS=""
	KSBA_CONFIG_HOST="$host"
	AC_SUBST(KSBA_CONFIG_LIBS)
	AC_SUBST(KSBA_CONFIG_CFLAGS)
	AC_SUBST(KSBA_CONFIG_API_VERSION)
	AC_SUBST(KSBA_CONFIG_HOST)

	# The Makefiles need to know about cross compiling
	AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling != xno)


	# Generate extended version information for W32.
	if test "$have_w32_system" = yes; then
	BUILD_TIMESTAMP=`date --iso-8601=minutes`
	changequote(,)dnl
	BUILD_FILEVERSION=`echo "$VERSION" \| sed 's/$[0-9.]$./\1./;s/\./,/g'`
	changequote([,])dnl
	BUILD_FILEVERSION="${BUILD_FILEVERSION}mym4_revision_dec"
	fi
	AC_SUBST(BUILD_REVISION)
	AC_SUBST(BUILD_TIMESTAMP)
	AC_SUBST(BUILD_FILEVERSION)
	BUILD_REVISION="mym4_revision"
	AC_SUBST(BUILD_REVISION)
	AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
	[GIT commit id revision used to build this package])


	AC_CONFIG_FILES([
	Makefile
	m4/Makefile
	gl/Makefile
	src/Makefile
	src/ksba-config
	src/versioninfo.rc
	tests/Makefile
	doc/Makefile
	])
	AC_OUTPUT


	echo "
	Libksba v${VERSION} has been configured as follows:

	Revision: mym4_revision (mym4_revision_dec)
	Platform: $host

	"

File Metadata

Mime Type: text/x-diff
Expires: Thu, Feb 26, 6:39 PM (14 h, 52 m)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: dd/b6/50571795114e8769ccc32e6dc754

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions