No OneTemporary
Actions

Size

17 KB

Subscribers

None

View Options

	diff --git a/configure.ac b/configure.ac
	index 44da1cb..1efb3ef 100644
	--- a/configure.ac
	+++ b/configure.ac
	@@ -1,429 +1,438 @@
	# 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.14"


	# 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_package],[libksba])
	m4_define([mym4_major], [1])
	m4_define([mym4_minor], [3])
	m4_define([mym4_micro], [6])

	# 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=6
	#-------------------
	# 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([serial-tests dist-bzip2 no-dist-gzip])
	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
	+AX_PROG_BISON([have_bison=yes],[have_bison=no])
	+
	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
	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_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_ARG_ENABLE([build-timestamp],
	AC_HELP_STRING([--enable-build-timestamp],
	[set an explicit build timestamp for reproducibility.
	(default is the current time in ISO-8601 format)]),
	[if test "$enableval" = "yes"; then
	BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null \|\| date`
	else
	BUILD_TIMESTAMP="$enableval"
	fi],
	[BUILD_TIMESTAMP="<none>"])
	AC_SUBST(BUILD_TIMESTAMP)
	AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP",
	[The time this package was configured for a build])


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

	+if test x"$have_bison" = xno; then
	+ AC_MSG_NOTICE([[
	+***
	+*** Note: The installed yacc version is not GNU Bison. You need
	+*** to install Bison if you want to change any grammar (.y) file.
	+***]])
	+fi

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

	Revision: mym4_revision (mym4_revision_dec)
	Platform: $host

	"
	diff --git a/m4/Makefile.am b/m4/Makefile.am
	index 3a1716c..6078d25 100644
	--- a/m4/Makefile.am
	+++ b/m4/Makefile.am
	@@ -1,5 +1,5 @@

	EXTRA_DIST = autobuild.m4 gnupg-typedef.m4 gpg-error.m4 libgcrypt.m4 \
	- libtool.m4
	+ libtool.m4 ax_prog_bison.m4


	diff --git a/m4/ax_prog_bison.m4 b/m4/ax_prog_bison.m4
	new file mode 100644
	index 0000000..b7ba31d
	--- /dev/null
	+++ b/m4/ax_prog_bison.m4
	@@ -0,0 +1,64 @@
	+# ===========================================================================
	+# http://www.gnu.org/software/autoconf-archive/ax_prog_bison.html
	+# ===========================================================================
	+#
	+# SYNOPSIS
	+#
	+# AX_PROG_BISON(ACTION-IF-TRUE,ACTION-IF-FALSE)
	+#
	+# DESCRIPTION
	+#
	+# Check whether bison is the parser generator. Run ACTION-IF-TRUE if
	+# successful, ACTION-IF-FALSE otherwise
	+#
	+# LICENSE
	+#
	+# Copyright (c) 2009 Francesco Salvestrini <salvestrini@users.sourceforge.net>
	+# Copyright (c) 2010 Diego Elio Petteno` <flameeyes@gmail.com>
	+#
	+# 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; either version 2 of the License, or (at your
	+# option) any later version.
	+#
	+# 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, see <http://www.gnu.org/licenses/>.
	+#
	+# As a special exception, the respective Autoconf Macro's copyright owner
	+# gives unlimited permission to copy, distribute and modify the configure
	+# scripts that are the output of Autoconf when processing the Macro. You
	+# need not follow the terms of the GNU General Public License when using
	+# or distributing such scripts, even though portions of the text of the
	+# Macro appear in them. The GNU General Public License (GPL) does govern
	+# all other use of the material that constitutes the Autoconf Macro.
	+#
	+# This special exception to the GPL applies to versions of the Autoconf
	+# Macro released by the Autoconf Archive. When you make and distribute a
	+# modified version of the Autoconf Macro, you may extend this special
	+# exception to the GPL to apply to your modified version as well.
	+
	+#serial 9
	+
	+AC_DEFUN([AX_PROG_BISON], [
	+ AC_REQUIRE([AC_PROG_YACC])
	+ AC_REQUIRE([AC_PROG_EGREP])
	+
	+ AC_CACHE_CHECK([if bison is the parser generator],[ax_cv_prog_bison],[
	+ AS_IF([$YACC --version 2>/dev/null \| $EGREP -q '^bison '],
	+ [ax_cv_prog_bison=yes], [ax_cv_prog_bison=no])
	+ ])
	+ AS_IF([test "$ax_cv_prog_bison" = "yes"], [
	+ dnl replace the yacc-compatible compiler with the real bison, as
	+ dnl otherwise autoconf limits us to the POSIX yacc.
	+ dnl We also change the generated filename to the old one, so that
	+ dnl automake's ylwrap can deal with it.
	+ YACC="${YACC% -y} -o y.tab.c"
	+ ] m4_ifnblank([$1], [[$1]]),
	+ m4_ifnblank([$2], [[$2]])
	+ )
	+])

File Metadata

Mime Type: text/x-diff
Expires: Thu, Mar 19, 5:31 AM (1 d, 15 h)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: 82/22/5ebf1223518e2da576eb43b1eb29

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions