No OneTemporary
Actions

Size

25 KB

Subscribers

None

View Options

This document is not UTF8. It was detected as Shift JIS and converted to UTF8 for display.

	diff --git a/ChangeLog b/ChangeLog
	index c03f7b60..90d7db3d 100644
	--- a/ChangeLog
	+++ b/ChangeLog
	@@ -1,280 +1,285 @@
	+Thu Jun 10 14:18:23 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
	+
	+
	+ * configure.in (ZLIB,GDBM): Check both, header and lib.
	+
	Sat Jun 5 15:30:33 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* pkclist.c (key_present_in_pk_list): New (Michael).

	Tue May 25 19:50:32 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* configure.in (IS_DEVELOPMENT_VERSION): Fixed detection.

	Sun May 23 14:20:22 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): assume yes when
	cross-compiling.

	Mon May 17 21:54:43 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* configure.in (socket): Fix for Unisys by Katsuhiro Kondou.

	Sat May 8 19:28:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* NEWS: Add a marker line which I forgot to do for 0.9.6.

	Thu May 6 14:18:17 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* README: Minor updates

	* VERSION: Now 0.9.6

	Thu Apr 8 09:35:53 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* acinclude.m4 (GNUPG_CHECK_RDYNAMIC): Fix for
	amiga-openbsd (Peter Reich)
	(GNUPG_PROG_NM): Ditto

	Wed Apr 7 20:51:39 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* Makefile.am (g10defs.h): Removed.
	* configure.in (AC_OUTPUT_COMMANDS): Create g10defs.h

	Sat Mar 20 12:55:33 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* VERSION: Now 0.9.5

	Sun Mar 14 19:34:36 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* acinclude.m4 (AM_SYS_SYMBOL_UNDERSCORE): Removed because it is
	now in the latest libtool.

	Thu Mar 11 16:39:46 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* configure.in: Removed the need for libtool

	Mon Mar 8 20:47:17 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* configure.in (DLSYM_NEEDS_UNDERSCORE): Replaced.
	* acinclude.in (AM_SYS_SYMBOL_UNDERSCORE): New.

	* VERSION: Now 0.9.4

	Sun Feb 28 19:11:00 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* configure.in (dld): Test disabled.

	Fri Feb 26 17:55:41 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* encode.c (encode_simple): temporary fix.

	Wed Feb 24 11:07:27 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* configure.in: New option --enable-static-rnd.

	Mon Feb 22 20:04:00 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* BUGS: Now we assign bug numbers.
	* OBUGS: New to keep rack o fixed bugs (CVS only)

	Fri Feb 19 18:01:54 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* VERSION: Released 0.9.3

	Fri Feb 19 15:49:15 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* acinclude.m4: Removed gettext macros.

	Tue Feb 16 14:10:02 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* configure.in (socket): Check for -lsocket and -lnsl.
	(osf4): Disable all warnings for DEC's cc.
	(-Wall): Add more warning options for gcc

	Sat Feb 13 12:04:43 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* configure.in: Changed detection of compiler flags.
	* intl/ : Removed directory

	Wed Feb 10 17:15:39 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* acinclude.m4 (GNUPG_CHECK_RDYNAMIC): Fix for freebsd 2.2

	* configure.in: a lot of changes to allow selection of modules.
	Add support for OS/2.

	* acinclude.m4: add some more caching

	* README: Spelling and grammar corrections (John A. Martin)
	* INSTALL: Ditto.

	Wed Jan 20 21:40:21 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* configure.in: --enable-m-guard is now default

	Wed Jan 13 12:49:36 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* INSTALL: Applied new information how to build rpms by Fabio Coatti
	* Makefile.in (gnupg.spec): Changed the names.

	Tue Jan 12 11:17:18 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* config.links (m68k-atari-mint): New

	Tue Jan 12 09:17:19 CET 1999 Ga? Qu駻i <gqueri@mail.dotcom.fr>

	* all: Fixed typos all over the place

	Sat Jan 9 16:02:23 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* configure.in: Add a way to statically link rndunix

	Sun Jan 3 15:28:44 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* acinclude.m4 (GNUPG_CHECK_RDYNAMIC): New.
	* configure.in (DYNLOAD_CFLAGS): Use result from CHECK_RDYNAMIC

	Wed Dec 23 13:18:14 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* README: Replaced the command overview with a short intro.

	Sat Dec 12 18:40:32 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* configure.in: Add check for dlopen in libc (Greg Troxel)
	and a new define
	* acconfig.h (DLSYM_NEEDS_UNDERSCORE): New.

	Thu Dec 10 20:15:36 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* acinclude.m (GNUPG_CHECK_PIC): New
	* configure.in, acinclude.m4: Renamed all WK_ to GNUPG_

	Tue Dec 8 15:09:29 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* VERSION: Set to 0.4.5

	Wed Nov 25 12:38:29 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in (USE_RNDLINUX): New.

	Fri Nov 20 19:34:57 1998 Werner Koch (wk@isil.d.shuttle.de)

	* VERSION: Released 0.4.4

	* configure.in (try_asm_modules): For option --disable-asm

	Tue Nov 10 19:32:40 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in (MPI_SFLAGS): New.

	Tue Nov 10 13:44:53 1998 Werner Koch (wk@isil.d.shuttle.de)

	* ABOUT-NLS: New
	* configure.in (AC_REVISION): New.

	Sun Nov 8 18:20:35 1998 Werner Koch (wk@isil.d.shuttle.de)

	* VERSION: Set to 0.4.3

	Sun Oct 25 19:49:37 1998 Werner Koch (wk@isil.d.shuttle.de)

	* Makefile.am (g10defs.h): New macro GNUPG_DATADIR.

	Wed Oct 21 17:24:24 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in: Removed gettext kludge
	* acinclude.m4: Add patched AM_WITH_NKS macro

	Tue Oct 20 19:03:36 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in: Kludge to make AM_GNU_GETTEXT work,
	changed some macors to more modern versions. Also
	changeg the all makefiles to remove duplicate ../intl.
	* acinclude.m4: Removed the gettext stuff, as this
	already comes with automake now.

	Wed Oct 14 12:11:34 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in (NAME_OF_DEV_RANDOM): New.
	(DYNLINK_MOD_CFLAGS): New.

	Thu Oct 8 10:55:15 1998 Werner Koch (wk@isil.d.shuttle.de)

	* Makefile.am (g10defs.h): creates include file
	* acconfig.h: now includes g10defs.h
	* configure.in: Removed G10_LOCALEDIR and GNUPG_LIB

	Thu Sep 17 18:49:40 1998 Werner Koch (wk@(none))

	* Makefile.am (dist-hook): Now creates RPM file.
	* scripts/gnupg.spec: New template file for RPMs

	Thu Jul 30 19:17:07 1998 Werner Koch (wk@(none))

	* acinclude.h (WK_CHECK_IPC): New
	* configure.in : Add checks for SysV IPC

	Thu Jun 25 11:18:49 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in (--disable-dynload): New.

	Wed Jun 10 07:48:59 1998 Werner Koch,mobil,,, (wk@tobold)

	* configure.in (GNUPG_LIBDIR): New.

	Mon May 25 19:10:59 1998 Werner Koch (wk@isil.d.shuttle.de)

	* rand-unix.c (fast_random_poll): fixed syntax bug.

	Mon May 11 10:21:31 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in (PRINTABLE_OS_NAME): Linux is now GNU/Linux

	Tue Apr 14 19:08:05 1998 Werner Koch (wk@isil.d.shuttle.de)

	* [all files]: Applied Matthew Skala's typo and grammar fixes.

	Wed Mar 4 10:32:40 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in (getrusage,gettimeofday): New tests.

	Fri Feb 27 13:14:17 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in (--disable-m-guard): New.

	Thu Feb 26 17:09:27 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in, acinclude.m4, intl/, po/: New macros taken
	from GNOME, switched to automake 1.2f

	Thu Feb 26 09:05:46 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in (doc/Makefile): New

	Thu Feb 26 07:40:47 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in: Changed gettext stuff

	Wed Feb 25 11:44:10 1998 Werner Koch (wk@isil.d.shuttle.de)

	* checks/*test : restructured the directory.

	Tue Feb 24 15:59:12 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in: Changed the name of the package to GNUPG and
	chnaged several other names too.

	Wed Feb 18 17:36:45 1998 Werner Koch (wk@isil.d.shuttle.de)

	* Makefile.am (checks): New.

	Sat Feb 14 15:37:55 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in (mpi_config_done): Removed asm links caching.

	Sat Feb 14 14:02:20 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in (PRINTABLE_OS_NAME): New.
	* acconfig.h: Likewise.

	Fri Feb 13 19:43:41 1998 Werner Koch (wk@isil.d.shuttle.de)

	* configure.in : Fixed zlib stuff
	* Makefile.am: Likewise

	diff --git a/Makefile.am b/Makefile.am
	index 1651d0a4..9793c146 100644
	--- a/Makefile.am
	+++ b/Makefile.am
	@@ -1,44 +1,36 @@
	## Process this file with automake to produce Makefile.in

	SUBDIRS = intl zlib util mpi cipher tools g10 po doc checks
	EXTRA_DIST = VERSION PROJECTS BUGS


	dist-hook:
	@set -e; \
	for file in `cd $(top_srcdir); find . -type f -name distfiles`; do \
	dir=`dirname $$file` ; $(mkinstalldirs) $(distdir)/$$dir ; \
	for i in distfiles `cat $(top_srcdir)/$$file` ; do \
	ln $(top_srcdir)/$$dir/$$i $(distdir)/$$dir/$$i 2> /dev/null \
	\|\| cp -p $(top_srcdir)/$$dir/$$i $(distdir)/$$dir/$$i; \
	done ; \
	done
	@set -e; \
	sed -e 's/@pkg_version@/$(VERSION)/g' \
	$(top_srcdir)/scripts/gnupg.spec.in \
	> $(distdir)/scripts/gnupg.spec


	# maintainer only
	cvs-get:
	rsync -Cavuzb --exclude scratch --exclude .deps \
	wkoch@sigtrap.guug.de:work/gnupg .

	cvs-put:
	rsync -Cavuzb --exclude .deps --exclude scratch \
	. wkoch@sigtrap.guug.de:work/gnupg

	cvs-sync: cvs-get cvs-put


	-tobold-get:
	- rsync -Cavuzb --exclude scratch --exclude .deps \
	- tobold:gnupg/ .
	-
	-tobold-put:
	- rsync -Cavuzb --exclude scratch --exclude .deps \
	- . tobold:gnupg/
	-

	.PHONY: cvs-get cvs-put cvs-sync

	diff --git a/configure.in b/configure.in
	index 2faf657c..a414e64d 100644
	--- a/configure.in
	+++ b/configure.in
	@@ -1,571 +1,582 @@
	dnl
	dnl Configure template for GNUPG
	dnl
	dnl (Process this file with autoconf to produce a configure script.)
	AC_REVISION($Revision$)dnl

	dnl Must reset CDPATH so that bash's cd does not print to stdout
	CDPATH=

	AC_PREREQ(2.13)
	AC_INIT(g10/g10.c)
	AC_CONFIG_AUX_DIR(scripts)
	AM_CONFIG_HEADER(config.h)


	VERSION=`cat $srcdir/VERSION`
	PACKAGE=gnupg
	ALL_LINGUAS="de es_ES fr it pl pt_BR ru"
	static_modules="sha1 md5 rmd160"
	AC_SUBST(VERSION)
	AC_SUBST(PACKAGE)
	AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
	AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")

	MODULES_IN_CIPHER=`awk '/# MODULES: / { for(i=3;i<=NF;i++) print $i}' \
	$srcdir/cipher/Makefile.am`

	dnl
	dnl Check for random module options
	dnl
	dnl Fixme: get the list of available modules from MODULES_IN_CIPHER
	dnl and check against this list

	AC_MSG_CHECKING([which static random module to use])
	AC_ARG_ENABLE(static-rnd,
	[ --enable-static-rnd=[egd\|unix\|linux\|none] ],
	[use_static_rnd=$enableval], [use_static_rnd=default] )

	if test "$use_static_rnd" = no; then
	use_static_rnd=default
	fi

	case "$use_static_rnd" in
	egd \| linux \| unix \| none \| default )
	AC_MSG_RESULT($use_static_rnd)
	;;
	* )
	AC_MSG_RESULT(invalid argument)
	AC_MSG_ERROR(there is no random module rnd$use_static_rnd)
	;;
	esac

	dnl
	dnl See whether the user wants to disable checking for /dev/random

	AC_MSG_CHECKING([whether use of /dev/random is requested])
	AC_ARG_ENABLE(dev-random,
	[ --disable-dev-random disable the use of dev random],
	try_dev_random=$enableval, try_dev_random=yes)
	AC_MSG_RESULT($try_dev_random)


	dnl
	dnl Check other options
	dnl

	AC_MSG_CHECKING([whether use of extensions is requested])
	AC_ARG_ENABLE(dynload,
	[ --disable-dynload disable use of extensions],
	try_dynload=$enableval, try_dynload=yes)
	AC_MSG_RESULT($try_dynload)

	AC_MSG_CHECKING([whether assembler modules are requested])
	AC_ARG_ENABLE(asm,
	[ --disable-asm do not use assembler modules],
	try_asm_modules=$enableval, try_asm_modules=yes)
	AC_MSG_RESULT($try_asm_modules)

	AC_MSG_CHECKING([whether memory debugging is requested])
	AC_ARG_ENABLE(m-debug,
	[ --enable-m-debug enable debugging of memory allocation],
	use_m_debug=$enableval, use_m_debug=no)
	AC_MSG_RESULT($use_m_debug)
	if test "$use_m_debug" = yes; then
	AC_DEFINE(M_DEBUG)
	use_m_guard=yes
	else
	AC_MSG_CHECKING([whether memory guard is requested])
	AC_ARG_ENABLE(m-guard,
	[ --enable-m-guard enable memory guard facility],
	use_m_guard=$enableval, use_m_guard=no)
	AC_MSG_RESULT($use_m_guard)
	fi
	if test "$use_m_guard" = yes ; then
	AC_DEFINE(M_GUARD)
	fi


	AC_MSG_CHECKING([whether included zlib is requested])
	AC_ARG_WITH(included-zlib,
	[ --with-included-zlib use the zlib code included here],
	[g10_force_zlib=yes], [g10_force_zlib=no] )
	AC_MSG_RESULT($g10_force_zlib)


	dnl Checks for programs.

	AC_CANONICAL_SYSTEM
	AC_ARG_PROGRAM
	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)
	dnl AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
	AC_PROG_CC
	AC_PROG_CPP
	AC_ISC_POSIX
	AC_PROG_INSTALL
	AC_PROG_RANLIB

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


	try_gettext=yes
	try_gdbm=yes
	case "${target}" in
	i386--mingw32)
	# special stuff for Windoze NT
	cross_compiling=yes
	CC="i386--mingw32-gcc"
	CPP="i386--mingw32-gcc -E"
	RANLIB="i386--mingw32-ranlib"
	ac_cv_have_dev_random=no
	AC_DEFINE(USE_ONLY_8DOT3)
	AC_DEFINE(HAVE_DRIVE_LETTERS)
	AC_DEFINE(HAVE_DOSISH_SYSTEM)
	try_gettext="no"
	try_gdbm="no"
	;;
	i386-emx-os2 \| i[3456]86-pc-os2emx )
	# OS/2 with the EMX environment
	ac_cv_have_dev_random=no
	AC_DEFINE(HAVE_DRIVE_LETTERS)
	AC_DEFINE(HAVE_DOSISH_SYSTEM)
	try_gettext="no"
	try_gdbm="no"
	;;
	--hpux*)
	if test -z "$GCC" ; then
	CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"
	fi
	;;
	-dec-osf4)
	if test -z "$GCC" ; then
	# Suppress all warnings
	# to get rid of the unsigned/signed char mismatch warnings.
	CFLAGS="$CFLAGS -w"
	fi
	;;
	m68k-atari-mint)
	;;
	*)
	;;
	esac

	AC_SUBST(MPI_OPT_FLAGS)
	GNUPG_SYS_SYMBOL_UNDERSCORE
	GNUPG_CHECK_PIC
	GNUPG_CHECK_RDYNAMIC
	if test "$NO_PIC" = yes; then
	try_dynload=no
	fi


	case "${target}" in
	i386--mingw32)
	PRINTABLE_OS_NAME="MingW32"
	;;
	i386-emx-os2 \| i[3456]86-pc-os2emx)
	PRINTABLE_OS_NAME="OS/2"
	;;
	-linux)
	PRINTABLE_OS_NAME="GNU/Linux"
	;;
	*)
	PRINTABLE_OS_NAME=`uname -s \|\| echo "Unknown"`
	;;
	esac
	AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME")

	dnl Fixme: Are these the best flags for OpenBSD????
	dnl (I have removed the -lc from * ...CFLAGS for test purposes.)
	case "${target}" in
	-openbsd)
	NAME_OF_DEV_RANDOM="/dev/srandom"
	NAME_OF_DEV_URANDOM="/dev/urandom"
	DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
	;;
	*)
	NAME_OF_DEV_RANDOM="/dev/random"
	NAME_OF_DEV_URANDOM="/dev/urandom"
	DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"
	;;
	esac
	AC_DEFINE_UNQUOTED(NAME_OF_DEV_RANDOM, "$NAME_OF_DEV_RANDOM")
	AC_DEFINE_UNQUOTED(NAME_OF_DEV_URANDOM, "$NAME_OF_DEV_URANDOM")
	AC_SUBST(MPI_OPT_FLAGS)


	dnl Checks for libraries.

	if test "$try_gettext" = yes; then
	AM_GNU_GETTEXT
	else
	USE_NLS=no
	USE_INCLUDED_LIBINTL=no
	AC_SUBST(USE_NLS)
	AC_SUBST(USE_INCLUDED_LIBINTL)
	fi

	+dnl
	+dnl There are lot of misconfigured systems. We include
	+dnl gdbm support only if the lib and the header is installed.
	+dnl
	if test "$try_gdbm" = yes; then
	-AC_CHECK_LIB(gdbm,gdbm_firstkey)
	+AC_CHECK_HEADERS(gdbm.h)
	+if test "$ac_cv_header_gdbm_h" = yes ; then
	+ AC_CHECK_LIB(gdbm,gdbm_firstkey)
	+fi
	fi

	+
	dnl Solaris needs -lsocket and -lnsl. Unisys system includes
	dnl gethostbyname in libsocket but needs libnsl for socket.
	AC_CHECK_LIB(nsl, gethostbyname)
	AC_CHECK_LIB(socket, socket, ac_need_libsocket=1, ac_try_nsl=1)
	if test x$ac_need_libsocket = x1; then
	LIBS="$LIBS -lsocket"
	fi
	if test x$ac_try_nsl = x1; then
	AC_CHECK_LIB(nsl, gethostbyname, ac_need_libnsl=1)
	if test x$ac_need_libnsl = x1
	then
	LIBS="$LIBS -lnsl"
	fi
	fi


	if test "$try_dynload" = yes ; then
	AC_CHECK_LIB(dl,dlopen)
	if test "$ac_cv_lib_dl_dlopen" = "yes"; then
	AC_DEFINE(USE_DYNAMIC_LINKING)
	AC_DEFINE(HAVE_DL_DLOPEN)
	DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC"
	use_gnupg_extensions=yes
	else
	AC_CHECK_LIB(c,dlopen)
	if test "$ac_cv_lib_c_dlopen" = "yes"; then
	AC_DEFINE(USE_DYNAMIC_LINKING)
	AC_DEFINE(HAVE_DL_DLOPEN)
	DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC"
	use_gnupg_extensions=yes
	dnl else
	dnl
	dnl DLD is not ready for use. So I better disable this test
	dnl
	dnl AC_CHECK_LIB(dld,dld_link)
	dnl if test "$ac_cv_lib_dld_dld_link" = "yes"; then
	dnl AC_DEFINE(USE_DYNAMIC_LINKING)
	dnl AC_DEFINE(HAVE_DLD_DLD_LINK)
	dnl DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC"
	dnl use_gnupg_extensions=yes
	dnl fi
	fi
	fi
	else
	AC_MSG_CHECKING(for dynamic loading)
	DYNLINK_LDFLAGS=
	DYNLINK_MOD_CFLAGS=
	use_gnupg_extensions=no
	AC_MSG_RESULT(has been disabled)
	fi

	AM_CONDITIONAL(ENABLE_GNUPG_EXTENSIONS, test "$use_gnupg_extensions" = yes )
	AC_SUBST(DYNLINK_LDFLAGS)
	AC_SUBST(DYNLINK_MOD_CFLAGS)


	dnl Checks for header files.
	AC_HEADER_STDC
	AC_CHECK_HEADERS(unistd.h langinfo.h)


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

	GNUPG_CHECK_ENDIAN


	GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF)
	GNUPG_CHECK_TYPEDEF(ushort, HAVE_USHORT_TYPEDEF)
	GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF)
	GNUPG_CHECK_TYPEDEF(u16, HAVE_U16_TYPEDEF)
	GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)

	AC_CHECK_SIZEOF(unsigned short, 2)
	AC_CHECK_SIZEOF(unsigned int, 4)
	AC_CHECK_SIZEOF(unsigned long, 4)

	if test "$ac_cv_sizeof_unsigned_short" = "0" \
	\|\| test "$ac_cv_sizeof_unsigned_int" = "0" \
	\|\| test "$ac_cv_sizeof_unsigned_long" = "0"; then
	AC_MSG_WARN([Hmmm, something is wrong with the sizes - using defaults]);
	fi



	dnl Checks for library functions.
	AC_FUNC_VPRINTF
	AC_CHECK_FUNCS(strerror stpcpy strlwr tcgetattr rand strtoul mmap)
	AC_CHECK_FUNCS(memmove gettimeofday getrusage gethrtime setrlimit)
	AC_CHECK_FUNCS(memicmp atexit raise getpagesize strftime nl_langinfo)

	GNUPG_CHECK_MLOCK

	GNUPG_CHECK_IPC
	if test "$ac_cv_header_sys_shm_h" = "yes"; then
	AC_DEFINE(USE_SHM_COPROCESSING)
	fi

	dnl
	dnl check whether we have a random device
	dnl
	if test "$try_dev_random" = yes ; then
	AC_CACHE_CHECK(for random device, ac_cv_have_dev_random,
	[if test -c "$NAME_OF_DEV_RANDOM" && test -c "$NAME_OF_DEV_URANDOM" ; then
	ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi])
	if test "$ac_cv_have_dev_random" = yes; then
	AC_DEFINE(HAVE_DEV_RANDOM)
	fi
	else
	AC_MSG_CHECKING(for random device)
	ac_cv_have_dev_random=no
	AC_MSG_RESULT(has been disabled)
	fi

	dnl
	dnl and whether this device supports ioctl
	dnl (Note, that we should do a real test here)
	dnl
	if test "$ac_cv_have_dev_random" = yes ; then
	AC_CHECK_HEADERS(linux/random.h)
	AC_CACHE_CHECK(for random device ioctl, ac_cv_have_dev_random_ioctl,
	[ if test "$ac_cv_header_linux_random_h" = yes ; then
	ac_cv_have_dev_random_ioctl=yes;
	else
	ac_cv_have_dev_random_ioctl=no;
	fi
	])
	if test "$ac_cv_have_dev_random_ioctl" = yes; then
	AC_DEFINE(HAVE_DEV_RANDOM_IOCTL)
	fi
	fi


	dnl
	dnl Figure out the default linkage mode for cipher modules
	dnl
	dnl (We always need a static rmd160)
	static_modules="$static_modules rmd160"
	if test "$use_static_rnd" = default; then
	if test "$ac_cv_have_dev_random" = yes; then
	static_modules="$static_modules rndlinux"
	else
	case "${target}" in
	i386--mingw32)
	static_modules="$static_modules rndw32"
	;;
	i386-emx-os2\|i[3456]86-pc-os2emx)
	static_modules="$static_modules rndos2"
	;;
	m68k-atari-mint)
	static_modules="$static_modules rndatari"
	;;
	*)
	static_modules="$static_modules rndunix"
	;;
	esac
	fi
	else
	if test "$use_static_rnd" = none; then
	:
	else
	static_modules="$static_modules rnd$use_static_rnd"
	fi
	fi

	dnl
	dnl Parse the modules list and build the list
	dnl of static and dymically linked modules
	dnl
	STATIC_CIPHER_NAMES=""
	STATIC_CIPHER_OBJS=""
	DYNAMIC_CIPHER_MODS=""
	GNUPG_MSG_PRINT([dynamically linked cipher modules:])
	for name in $MODULES_IN_CIPHER; do
	x="no"
	for i in $static_modules; do
	if test "$name" = "$i" ; then
	x="yes"
	fi
	done;
	if test $x = yes; then
	STATIC_CIPHER_NAMES="$STATIC_CIPHER_NAMES $name"
	STATIC_CIPHER_OBJS="$STATIC_CIPHER_OBJS $name.o"
	else
	DYNAMIC_CIPHER_MODS="$DYNAMIC_CIPHER_MODS $name"
	GNUPG_MSG_PRINT([$name])
	fi
	done
	AC_MSG_RESULT()
	AC_SUBST(STATIC_CIPHER_OBJS)
	AC_SUBST(STATIC_CIPHER_NAMES)
	AC_SUBST(DYNAMIC_CIPHER_MODS)

	dnl
	dnl And build the constructor file
	dnl

	test -d cipher \|\| mkdir cipher
	cat <<G10EOF >cipher/construct.c
	/* automatically generated by configure - do not edit */

	G10EOF
	GNUPG_MSG_PRINT([statically linked cipher modules:])
	for name in $STATIC_CIPHER_NAMES; do
	echo "void ${name}_constructor(void);" >>cipher/construct.c
	GNUPG_MSG_PRINT([$name])
	done
	AC_MSG_RESULT()
	cat <<G10EOF >>cipher/construct.c

	void
	cipher_modules_constructor(void)
	{
	static int done = 0;
	if( done )
	return;
	done = 1;

	G10EOF
	for name in $STATIC_CIPHER_NAMES; do
	echo " ${name}_constructor();" >>cipher/construct.c
	done
	echo '}' >>cipher/construct.c




	dnl
	dnl Figure how to link the cipher modules
	dnl
	AC_SUBST(STATIC_CIPHER_OBJS)
	AC_SUBST(DYNAMIC_CIPHER_MODS)


	dnl setup assembler stuff
	AC_MSG_CHECKING(for mpi assembler functions)
	if test -f $srcdir/mpi/config.links ; then
	. $srcdir/mpi/config.links
	GNUPG_LINK_FILES($mpi_ln_src, $mpi_ln_dst)
	ac_cv_mpi_extra_asm_modules="$mpi_extra_modules"
	ac_cv_mpi_sflags="$mpi_sflags"
	ac_cv_mpi_config_done="yes"
	AC_MSG_RESULT(done)
	else
	AC_MSG_RESULT(failed)
	AC_MSG_ERROR([mpi/config.links missing!])
	fi
	MPI_EXTRA_ASM_OBJS=""
	if test "$ac_cv_mpi_extra_asm_modules" != ""; then
	GNUPG_MSG_PRINT([mpi extra asm functions:])
	for i in $ac_cv_mpi_extra_asm_modules; do
	GNUPG_MSG_PRINT([$i])
	MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.o"
	done
	AC_MSG_RESULT()
	fi
	AC_SUBST(MPI_EXTRA_ASM_OBJS)
	MPI_SFLAGS="$ac_cv_mpi_sflags"
	AC_SUBST(MPI_SFLAGS)

	dnl Do we have zlib? Must do it here because Solaris failed
	dnl when compiling a conftest (due to the "-lz" from LIBS).
	+use_local_zlib=yes
	if test "$g10_force_zlib" = "yes"; then
	- ZLIBS="../zlib/libzlib.a"
	+ :
	+else
	+ AC_CHECK_HEADERS(zlib.h)
	+ if test "$ac_cv_header_zlib_h" = yes ; then
	+ AC_CHECK_LIB(z,deflateInit2_,use_local_zlib=no,:)
	+ fi
	+fi
	+
	+if test "use_local_zlib" = yes ; then
	AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true)
	GNUPG_LINK_FILES(zlib/zlib.h, zlib.h )
	GNUPG_LINK_FILES(zlib/zconf.h, zconf.h )
	+ ZLIBS="../zlib/libzlib.a"
	else
	-AC_CHECK_HEADERS(zlib.h)
	-if test "$ac_cv_header_zlib_h" = yes ; then
	- LIBS="$LIBS -lz"
	- ZLIBS=
	AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, false)
	-else
	- ZLIBS="../zlib/libzlib.a"
	- AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true)
	- GNUPG_LINK_FILES(zlib/zlib.h, zlib.h )
	- GNUPG_LINK_FILES(zlib/zconf.h, zconf.h )
	-fi
	+ ZLIBS=
	+ LIBS="-lz $LIBS"
	fi
	AC_SUBST(ZLIBS)

	+
	changequote(,)dnl
	tmp_pat='[a-zA-Z]'
	changequote([,])dnl
	if echo "$VERSION" \| grep $tmp_pat >/dev/null ; then
	AC_DEFINE(IS_DEVELOPMENT_VERSION)
	fi

	GNUPG_DO_LINK_FILES


	AC_OUTPUT_COMMANDS([
	cat >g10defs.tmp <<G10EOF
	/* Generated automatically by configure */
	#ifdef HAVE_DRIVE_LETTERS
	#define G10_LOCALEDIR "c:/lib/gnupg/locale"
	#define GNUPG_LIBDIR "c:/lib/gnupg"
	#define GNUPG_DATADIR "c:/lib/gnupg"
	#else
	#define G10_LOCALEDIR "${prefix}/${DATADIRNAME}/locale"
	#define GNUPG_LIBDIR "${libdir}/gnupg"
	#define GNUPG_DATADIR "${datadir}/gnupg"
	#endif
	G10EOF
	if cmp -s g10defs.h g10defs.tmp 2>/dev/null; then
	echo "g10defs.h is unchanged"
	rm -f g10defs.tmp
	else
	rm -f g10defs.h
	mv g10defs.tmp g10defs.h
	echo "g10defs.h created"
	fi
	],[
	prefix=$prefix
	exec_prefix=$exec_prefix
	libdir=$libdir
	datadir=$datadir
	DATADIRNAME=$DATADIRNAME
	])


	AC_OUTPUT([
	Makefile
	intl/Makefile
	po/Makefile.in
	util/Makefile
	mpi/Makefile
	cipher/Makefile
	g10/Makefile
	doc/Makefile
	tools/Makefile
	zlib/Makefile
	checks/Makefile
	])

	dnl -wedit:notab- Please keep this as the last line.

File Metadata

Mime Type: text/x-diff
Expires: Tue, Jul 8, 12:32 PM (14 h, 25 m)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: 59/2c/594c42312ff073b4af876a97572f

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions