2004-03-10 Marcus Brinkmann <marcus@g10code.de>marcus-after-thread-cbs

	* configure.ac (LIBGCRYPT_CONFIG_LIBS_PTHREAD,
	LIBGCRYPT_CONFIG_CFLAGS_PTHREAD, LIBGCRYPT_CONFIG_LIBS_PTH,
	LIBGCRYPT_CONFIG_CFLAGS_PTH, have_pth, have_pthread, AC_CHECK_PTH,
	AC_CHECK_LIB(pthread), HAVE_PTH, HAVE_PTHREAD): Removed.

doc/
2004-03-11  Marcus Brinkmann  <marcus@g10code.de>

	* gcrypt.texi (Multi Threading): Partially document new thread
	support.

src/
2004-03-10  Marcus Brinkmann  <marcus@g10code.de>

	* Makefile.am (ltlib_libgcrypt_pthread, ltlib_libgcrypt_pth): Removed.
	(lib_LTLIBRARIES): Remove those variables from here.
	(libgcrypt_pthread_la_SOURCES, libgcrypt_pthread_la_LDFLAGS,
	(libgcrypt_pthread_la_DEPENDENCIES, libgcrypt_pthread_la_LIBADD,
	(libgcrypt_pth_la_SOURCES, libgcrypt_pth_la_LDFLAGS,
	(libgcrypt_pth_la_DEPENDENCIES, libgcrypt_pth_la_LIBADD,
	(noinst_LTLIBRARIES): Removed.
	(libgcrypt_real_la_SOURCES): Merge with ...
	(libgcrypt_la_SOURCES): ... likewise.
	(libgcrypt_real_la_DEPENDENCIES): Merge with ...
	(libgcrypt_la_DEPENDENCIES): ... this.
	(libgcrypt_real_la_LIBADD): Merge with ...
	(libgcrypt_la_LIBADD): ... this.
	* libgcrypt-config.in (libs_pthread, libs_pth, cflags_pth)
	(cflags_pthread, thread_module, thread_modules): Removed.
	(Options): Remove --thread option from help output.  If the option
	is specified, output an error and exit.
	For --cflags and --libs option, remove pth and pthread from output.
	* gcrypt.h: Include <sys/types.h> and <sys/socket.h>.
	(enum gcry_ctl_cmds): Add GCRYCTL_SET_THREAD_CBS.
	(gcry_thread_cbs): New struct.
	* global.c (gcry_control): Implement GCRYCTL_SET_THREAD_CBS.
	(global_init): Don't call ath_init here.
	* ath.h: Rewritten.
	* ath.c: Rewritten.

1 files changed, 12 insertions, 59 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 9c198be2..e6bb418e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
+# Copyright (C) 1998,1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
 #
 # This file is part of Libgcrypt.
 #
@@ -24,21 +24,7 @@ m4datadir = $(datadir)/aclocal
 m4data_DATA = libgcrypt.m4
 include_HEADERS = gcrypt.h gcrypt-module.h
 
-# Enable thread-library-specific versions of the library.
-if HAVE_PTHREAD
-  ltlib_libgcrypt_pthread = libgcrypt-pthread.la
-else
-  ltlib_libgcrypt_pthread =
-endif
-if HAVE_PTH
-  ltlib_libgcrypt_pth = libgcrypt-pth.la
-else
-  ltlib_libgcrypt_pth =
-endif
-
-noinst_LTLIBRARIES = libgcrypt-real.la
-lib_LTLIBRARIES = libgcrypt.la \
-	$(ltlib_libgcrypt_pthread) $(ltlib_libgcrypt_pth)
+lib_LTLIBRARIES = libgcrypt.la
 
 if HAVE_LD_VERSION_SCRIPT
   libgcrypt_version_script_cmd = -Wl,--version-script=$(srcdir)/libgcrypt.vers
@@ -46,49 +32,16 @@ else
   libgcrypt_version_script_cmd = 
 endif
 
-libgcrypt_real_la_SOURCES = \
-g10lib.h types.h cipher.h \
-misc.c  \
-global.c \
-sexp.c \
-stdmem.c stdmem.h \
-secmem.c secmem.h \
-mpi.h \
-missing-string.c \
-module.c
-
-libgcrypt_real_la_DEPENDENCIES = \
-	../cipher/libcipher.la ../mpi/libmpi.la \
-	$(srcdir)/libgcrypt.vers
+libgcrypt_la_CFLAGS = @GPG_ERROR_CFLAGS@
+libgcrypt_la_SOURCES = g10lib.h types.h cipher.h \
+	misc.c global.c sexp.c \
+	stdmem.c stdmem.h secmem.c secmem.h \
+	mpi.h missing-string.c module.c \
+	ath.h ath.c
 
-libgcrypt_real_la_LIBADD = \
-	../cipher/libcipher.la ../mpi/libmpi.la @GPG_ERROR_LIBS@
-
-AM_CFLAGS = @GPG_ERROR_CFLAGS@
-
-# The standard version.
-libgcrypt_la_SOURCES = ath.h ath.c
 libgcrypt_la_LDFLAGS = $(libgcrypt_version_script_cmd) -version-info \
-  @LIBGCRYPT_LT_CURRENT@:@LIBGCRYPT_LT_REVISION@:@LIBGCRYPT_LT_AGE@
-libgcrypt_la_DEPENDENCIES = libgcrypt-real.la \
-	@LTLIBOBJS@ $(srcdir)/libgcrypt.vers
-libgcrypt_la_LIBADD = libgcrypt-real.la @LTLIBOBJS@ \
-	@GPG_ERROR_LIBS@
-
-# The pthread version.
-libgcrypt_pthread_la_SOURCES = ath.h ath-pthread.c
-libgcrypt_pthread_la_LDFLAGS = $(libgcrypt_version_script_cmd) -version-info \
 	@LIBGCRYPT_LT_CURRENT@:@LIBGCRYPT_LT_REVISION@:@LIBGCRYPT_LT_AGE@
-libgcrypt_pthread_la_DEPENDENCIES = libgcrypt-real.la \
-	@LTLIBOBJS@ $(srcdir)/libgcrypt.vers
-libgcrypt_pthread_la_LIBADD = libgcrypt-real.la @LTLIBOBJS@ \
-	-lpthread @GPG_ERROR_LIBS@
-
-# The pth version.
-libgcrypt_pth_la_SOURCES = ath.h ath-pth.c
-libgcrypt_pth_la_LDFLAGS = $(libgcrypt_version_script_cmd) -version-info \
-	@LIBGCRYPT_LT_CURRENT@:@LIBGCRYPT_LT_REVISION@:@LIBGCRYPT_LT_AGE@
-libgcrypt_pth_la_DEPENDENCIES = libgcrypt-real.la \
-	@LTLIBOBJS@ $(srcdir)/libgcrypt.vers
-libgcrypt_pth_la_LIBADD = libgcrypt-real.la @LTLIBOBJS@ \
-	@PTH_LIBS@ @GPG_ERROR_LIBS@
+libgcrypt_la_DEPENDENCIES = ../cipher/libcipher.la ../mpi/libmpi.la \
+	$(srcdir)/libgcrypt.vers
+libgcrypt_la_LIBADD = ../cipher/libcipher.la ../mpi/libmpi.la \
+	@LTLIBOBJS@ @GPG_ERROR_LIBS@