No OneTemporary
Actions

Size

24 KB

Subscribers

None

View Options

	diff --git a/Makefile.am b/Makefile.am
	index ed1c11f..e84bf4c 100644
	--- a/Makefile.am
	+++ b/Makefile.am
	@@ -1,28 +1,28 @@
	# Makefile.am - main makefile for GpgEX
	# Copyright (C) 2005 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.

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

	ACLOCAL_AMFLAGS = -I m4
	AUTOMAKE_OPTIONS = no-dist-gzip dist-bzip2
	# Because we can only build the w32 version we need to help automake.
	DISTCHECK_CONFIGURE_FLAGS = --host=@host@ --build=@build@ \
	--with-libassuan-prefix=@prefix@ \
	--with-gpg-error-prefix=@prefix@ \
	--prefix=@prefix@

	-EXTRA_DIST = autogen.sh
	+EXTRA_DIST = autogen.sh autogen.rc


	SUBDIRS = doc src po m4

	dist-hook:
	echo "$(VERSION)" > $(distdir)/VERSION
	diff --git a/autogen.rc b/autogen.rc
	new file mode 100644
	index 0000000..fdfdde2
	--- /dev/null
	+++ b/autogen.rc
	@@ -0,0 +1,12 @@
	+# autogen.sh configuration for GpgEX -- sh --
	+
	+configure_opts="
	+ --with-gpg-error-prefix=@SYSROOT@
	+ --with-libassuan-prefix=@SYSROOT@
	+ "
	+
	+final_info="
	+ ./autogen.sh --build-w32
	+or
	+ ./autorun.sh --build-w64
	+"
	diff --git a/autogen.sh b/autogen.sh
	index c3adc89..471193c 100755
	--- a/autogen.sh
	+++ b/autogen.sh
	@@ -1,239 +1,393 @@
	#! /bin/sh
	-# Run this to generate all the initial makefiles, etc.
	-#
	-# Copyright (C) 2003 g10 Code GmbH
	+# 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

	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` -ge "$2" ]; then
	+ 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:" "$*"
	+ 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=
	+tmp=$(dirname "$0")
	+tsdir=$(cd "${tmp}"; pwd)
	+
	+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

	-# Begin list of optional variables sourced from ~/.gnupg-autogen.rc
	+
	+# 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=
	-
	-if [ -f "$HOME/.gnupg-autogen.rc" ]; then
	- echo "sourcing extra definitions from $HOME/.gnupg-autogen.rc"
	- . "$HOME/.gnupg-autogen.rc"
	-fi
	+#amd64root=

	# Convenience option to use certain configure options for some hosts.
	myhost=""
	myhostsub=""
	case "$1" in
	--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*)
	- echo "Error: invalid build option $1" >&2
	- exit 1
	+ fatal "Error: invalid build option $1"
	+ shift
	;;
	*)
	;;
	esac
	+die_p


	-# *** W32 build script *****
	-# Used to cross-compile for Windows.
	+# 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
	+
	+# ******************
	+# W32 build script
	+# ******************
	if [ "$myhost" = "w32" ]; then
	- tmp=`dirname $0`
	- tsdir=`cd "$tmp"; pwd`
	- shift
	- if [ ! -f $tsdir/config.guess ]; then
	- echo "$tsdir/config.guess not found" >&2
	+ if [ ! -f "$tsdir/build-aux/config.guess" ]; then
	+ fatal "$tsdir/build-aux/config.guess not found"
	exit 1
	fi
	- build=`$tsdir/config.guess`
	+ 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 i586-mingw32msvc"
	+ toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
	toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
	+ extraoptions="$extraoptions $w32_extraoptions"
	;;
	esac
	- echo "Using $w32root as standard install directory" >&2
	+ 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
	- echo "Cross compiler kit not installed" >&2
	+ fatal "cross compiler kit not installed"
	if [ -z "$myhostsub" ]; then
	- echo "Under Debian GNU/Linux, you may install it using" >&2
	- echo " apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2
	+ info "Under Debian GNU/Linux, you may install it using"
	+ info " apt-get install mingw32 mingw32-runtime mingw32-binutils"
	fi
	- echo "Stop." >&2
	- exit 1
	+ die_p
	fi

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

	- $tsdir/configure --enable-maintainer-mode --prefix=${w32root} \
	+ $tsdir/configure --enable-maintainer-mode ${SILENT} \
	+ --prefix=${w32root} \
	--host=${host} --build=${build} \
	- --with-gpg-error-prefix=${w32root} \
	- --with-libassuan-prefix=${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 [ -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`

	-gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
	-s/^.($.$)/\1/p
	+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`
	-
	-
	+ gettext_vers_num=`echo "$gettext_vers" \| cvtver`
	+else
	+ gettext_vers="n/a"
	+fi

	-if [ -z "$autoconf_vers" -o -z "$automake_vers" ]
	+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

	-# 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}
	-

	if check_version $AUTOCONF $autoconf_vers_num $autoconf_vers ; then
	check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf
	fi
	if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
	check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
	fi
	-if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
	- check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
	+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 test "$DIE" = "yes"; then
	+if [ "$DIE" = "yes" ]; then
	cat <<EOF

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

	EOF
	- exit 1
	+ 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
	- cat <<EOF >&2
	+ [ -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
	+ $CP .git/hooks/pre-commit.sample .git/hooks/pre-commit
	chmod +x .git/hooks/pre-commit
	fi
	- tmp=$(git config --get filter.cleanpo.clean)
	- if [ "$tmp" != "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
	- then
	- echo "*** Adding GIT filter.cleanpo.clean configuration." >&2
	- git config --add filter.cleanpo.clean \
	+
	+ 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
	- cat <<EOF >&2
	+ [ -z "${SILENT}" ] && cat <<EOF
	* Activating commit log message check hook. *
	EOF
	- cp build-aux/git-hooks/commit-msg .git/hooks/commit-msg
	+ $CP build-aux/git-hooks/commit-msg .git/hooks/commit-msg
	chmod +x .git/hooks/commit-msg
	fi
	fi

	-
	-echo "Running aclocal -I m4 ${ACLOCAL_FLAGS:+$ACLOCAL_FLAGS }..."
	-$ACLOCAL -I m4 $ACLOCAL_FLAGS
	-echo "Running autoheader..."
	+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
	-echo "Running automake --gnu ..."
	-$AUTOMAKE --gnu --add-missing
	-echo "Running autoconf${FORCE} ..."
	+info "Running automake --gnu ..."
	+$AUTOMAKE --gnu;
	+info "Running autoconf${FORCE} ..."
	$AUTOCONF${FORCE}

	-echo "You may now run:
	- ./autogen.sh --build-w32 && make
	-or
	- ./autogen.sh --build-w64 && make
	-"
	+info "You may now run:${am_lf} ${final_info}"
	diff --git a/configure.ac b/configure.ac
	index 57d6688..028524a 100644
	--- a/configure.ac
	+++ b/configure.ac
	@@ -1,296 +1,296 @@
	# configure.ac - for GpgEX
	# Copyright (C) 2005, 2006, 2007, 2013 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.

	# 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 gnupg-2.n.m) 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.
	m4_define([mym4_version], [1.0.1])

	# 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_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 'gpgex-[0-9].[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([gpgex],[mym4_full_version], [http://bugs.gnupg.org])

	NEED_GPG_ERROR_VERSION=1.12

	NEED_LIBASSUAN_API=2
	NEED_LIBASSUAN_VERSION=2.1.1

	PACKAGE=$PACKAGE_NAME
	PACKAGE_GT=${PACKAGE_NAME}
	VERSION=$PACKAGE_VERSION

	AC_CONFIG_AUX_DIR([build-aux])
	AC_CONFIG_SRCDIR(src/gpgex.def)
	AM_CONFIG_HEADER(config.h)
	AC_CANONICAL_TARGET
	AM_INIT_AUTOMAKE

	AC_GNU_SOURCE

	have_gpg_error=no
	have_libassuan=no

	AC_SUBST(PACKAGE)
	AC_SUBST(PACKAGE_GT)
	AC_SUBST(VERSION)
	AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
	AC_DEFINE_UNQUOTED(PACKAGE_GT, "$PACKAGE_GT",
	[Name of this package for gettext])
	AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
	AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",
	[Bug report address])


	AH_BOTTOM([
	/* Some global constants. */

	/* Force using of NLS for W32 even if no libintl has been found. This is
	okay because we have our own gettext implementation for W32. */
	#if defined(HAVE_W32_SYSTEM) && !defined(ENABLE_NLS)
	#define ENABLE_NLS 1
	#endif
	])

	AM_MAINTAINER_MODE
	AM_SILENT_RULES

	# Checks for programs.
	AC_PROG_MAKE_SET
	AM_SANITY_CHECK
	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)
	AC_PROG_AWK
	AC_PROG_CC
	AC_PROG_CPP
	AC_PROG_CXX
	AC_PROG_INSTALL
	AC_PROG_LN_S
	AC_PROG_MAKE_SET
	AC_PROG_RANLIB
	AC_CHECK_TOOL(AR, ar, :)
	AC_CHECK_TOOL(DLLTOOL, dlltool, :)
	AC_CHECK_TOOL(WINDRES, windres, :)


	have_dosish_system=no
	have_w32_system=no
	have_w64_system=no
	case "${host}" in
	x86_64-mingw32)
	have_dosish_system=yes
	have_w32_system=yes
	have_w64_system=yes
	BUILD_CPU_ARCH=amd64
	;;
	-mingw32)
	have_dosish_system=yes
	have_w32_system=yes
	BUILD_CPU_ARCH=x86
	;;
	*)
	AC_MSG_ERROR([[
	***
	*** This software my only be build for W32 systems. Use
	*** ./autogen.sh --build-w32
	*** or
	*** ./autogen.sh --build-w64
	*** to prepare it for such a build.
	***]])
	;;
	esac

	# We need the CPU architecture for the manifest file.
	AC_SUBST(BUILD_CPU_ARCH)


	AC_DEFINE(HAVE_DRIVE_LETTERS,1,
	[defined if we must run on a stupid file system])

	if test "$have_dosish_system" = yes; then
	AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
	[Defined if we run on some of the PCDOS like systems
	(DOS, Windoze. OS/2) with special properties like
	no file modes])
	fi
	AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = yes)

	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_w64_system" = yes; then
	AC_DEFINE(HAVE_W64_SYSTEM,1,
	[Defined if we run on a 64 bit W32 API based system])
	fi
	fi
	AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
	AM_CONDITIONAL(HAVE_W64_SYSTEM, test "$have_w64_system" = yes)


	#
	# Checks for libraries.
	#

	# Note, that autogen.sh greps for the next line.
	-AM_GNU_GETTEXT_VERSION(0.12.1)
	+AM_GNU_GETTEXT_VERSION([0.12.1])
	AM_GNU_GETTEXT([external])
	# We always want NLs, despite what the above macro figures out.
	USE_NLS=yes

	# Checks for header files.
	AC_HEADER_STDC
	AC_CHECK_HEADERS(string.h unistd.h langinfo.h termio.h locale.h)

	AC_CHECK_FUNCS(stpcpy)

	# Checks for typedefs, structures, and compiler characteristics.
	AC_C_CONST
	AC_C_INLINE
	AC_TYPE_SIZE_T
	AC_TYPE_SIGNAL

	AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)

	# Add some extra libs here so that previous tests don't fail for
	# mysterious reasons - the final link step should bail out.
	if test "$have_w32_system" = yes; then
	W32LIBS="-lwsock32"
	fi

	if test "$GCC" = yes; then
	CFLAGS="$CFLAGS -Wall -mms-bitfields"
	CXXFLAGS="$CXXFLAGS -Wall -mms-bitfields"
	if test "$USE_MAINTAINER_MODE" = "yes"; then
	CFLAGS="$CFLAGS -Wcast-align -Wshadow -Wstrict-prototypes"
	CFLAGS="$CFLAGS -Wno-format-y2k -Wformat-security"
	CXXFLAGS="$CXXFLAGS -Wcast-align -Wshadow"
	CXXFLAGS="$CXXFLAGS -Wno-format-y2k -Wformat-security"
	fi
	fi

	AC_SUBST(W32LIBS)


	#
	# libgpg-error is a library with error codes shared between GnuPG
	# related projects.
	#
	AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION",
	have_gpg_error=yes,have_gpg_error=no)
	AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_USER_1,
	[The default error source for GpgEX.])

	# We need the declaration for the function GetUserDefaultUILanguage
	# and AllowSetForegroundWindow.
	AC_DEFINE(WINVER, 0x500, [Version of Windows API])

	#
	# libassuan is used for IPC
	#
	AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
	have_libassuan=yes,have_libassuan=no)


	AH_BOTTOM([
	/* We don't want the old assuan codes anymore. */
	#define _ASSUAN_ONLY_GPG_ERRORS 1
	/* We use the gettext code from libgpg-error. */
	#define GPG_ERR_ENABLE_GETTEXT_MACROS

	])


	#
	# Provide information about the build.
	#
	BUILD_REVISION="mym4_revision"
	AC_SUBST(BUILD_REVISION)
	AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
	[GIT commit id revision used to build this package])

	changequote(,)dnl
	BUILD_FILEVERSION=`echo "$VERSION" \| sed 's/$[0-9.]$./\1./;s/\./,/g'`
	changequote([,])dnl
	BUILD_FILEVERSION="${BUILD_FILEVERSION}mym4_revision_dec"
	AC_SUBST(BUILD_FILEVERSION)
	BUILD_FILEVERSION_DOT=`echo "$BUILD_FILEVERSION" \| tr ',' '.'`
	AC_SUBST(BUILD_FILEVERSION_DOT)

	BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null \|\| date`
	AC_SUBST(BUILD_TIMESTAMP)
	AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP",
	[The time this package was configured for a build])
	BUILD_HOSTNAME="$ac_hostname"
	AC_SUBST(BUILD_HOSTNAME)


	#
	# Print errors here so that they are visible all
	# together and the user can acquire them all together.
	#
	die=no
	if test "$have_gpg_error" = "no"; then
	die=yes
	AC_MSG_NOTICE([[
	***
	*** You need libgpg-error to build this program.
	** This library is for example available at
	*** ftp://ftp.gnupg.org/gcrypt/libgpg-error
	*** (at least version $NEED_GPG_ERROR_VERSION is required.)
	***]])
	fi
	if test "$have_libassuan" = "no"; then
	die=yes
	AC_MSG_NOTICE([[
	***
	*** You need libassuan to build this program.
	*** This library is for example available at
	*** ftp://ftp.gnupg.org/gcrypt/libassuan/
	*** (at least version $NEED_LIBASSUAN_VERSION is required).
	***]])
	fi
	if test "$die" = "yes"; then
	AC_MSG_ERROR([[
	***
	*** Required libraries not found. Please consult the above messages
	*** and install them before running configure again.
	***]])
	fi


	AC_CONFIG_FILES([ Makefile
	doc/Makefile
	src/Makefile
	src/versioninfo.rc
	src/gpgex.manifest
	po/Makefile.in
	m4/Makefile
	])
	AC_OUTPUT

File Metadata

Mime Type: text/x-diff
Expires: Sat, Feb 7, 5:32 PM (1 d, 10 h)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: a1/69/acc18a942491f6d6fa02325f15b2

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions