diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2004-03-11 01:44:44 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2004-03-11 01:44:44 +0000 |
| commit | 7995b7f73dce3b2b48d85066fca134cb24b8a4dc (patch) | |
| tree | 8d544b18e7cc5b6ff45e26f182674d8df0c4978f /src/libgcrypt-config.in | |
| parent | fe6cf2d0fb865f9d6c1d0944a8c128c8d4f70989 (diff) | |
| download | libgcrypt-7995b7f73dce3b2b48d85066fca134cb24b8a4dc.tar.gz | |
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.
Diffstat (limited to 'src/libgcrypt-config.in')
| -rw-r--r-- | src/libgcrypt-config.in | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/src/libgcrypt-config.in b/src/libgcrypt-config.in index 5bdbd083..3309b692 100644 --- a/src/libgcrypt-config.in +++ b/src/libgcrypt-config.in @@ -12,20 +12,13 @@ # General. prefix="@prefix@" exec_prefix="@exec_prefix@" -thread_module="" version="@VERSION@" gpg_error_libs="@GPG_ERROR_LIBS@" gpg_error_cflags="@GPG_ERROR_CFLAGS@" -# LIBS values. +# libgcrypt values. libs="@LIBGCRYPT_CONFIG_LIBS@" -libs_pthread="@LIBGCRYPT_CONFIG_LIBS_PTHREAD@" -libs_pth="@LIBGCRYPT_CONFIG_LIBS_PTH@" - -# CFLAGS values. cflags="@LIBGCRYPT_CONFIG_CFLAGS@" -cflags_pthread="@LIBGCRYPT_CONFIG_CFLAGS_PTHREAD@" -cflags_pth="@LIBGCRYPT_CONFIG_CFLAGS_PTH@" # API info api_version="@LIBGCRYPT_CONFIG_API_VERSION@" @@ -34,7 +27,6 @@ api_version="@LIBGCRYPT_CONFIG_API_VERSION@" symmetric_ciphers="@LIBGCRYPT_CIPHERS@" asymmetric_ciphers="@LIBGCRYPT_PUBKEY_CIPHERS@" digests="@LIBGCRYPT_DIGESTS@" -thread_modules="@LIBGCRYPT_THREAD_MODULES@" # State variables. echo_libs=no @@ -51,7 +43,6 @@ usage() cat <<EOF Usage: $0 [OPTIONS] Options: - [--thread={${thread_modules}}] [--prefix] [--exec-prefix] [--version] @@ -81,14 +72,8 @@ while test $# -gt 0; do case $1 in --thread=*) - for thread_mod in $thread_modules; do - if test "$thread_mod" = "$optarg"; then - thread_module="$optarg"; - fi - done - if test "x$thread_module" = "x"; then - usage 1 1>&2 - fi + echo "$0: --thread option obsolete: use the thread callback interface" 1>&2 + exit 1 ;; --prefix=*) # For compatibility reasons with old M4 macros, we ignore @@ -145,17 +130,8 @@ if test "$echo_cflags" = "yes"; then fi done fi - # Set up `cflags_final'. - case "$thread_module" in - pthread) - cflags_final=$cflags_pthread - ;; - pth) - cflags_final=$cflags_pth - ;; - esac - cflags_final="$cflags_final @GPG_ERROR_CFLAGS@" + cflags_final="@GPG_ERROR_CFLAGS@" echo "$includes $cflags_final" fi @@ -175,15 +151,7 @@ if test "$echo_libs" = "yes"; then fi # Set up `libs_final'. - case "$thread_module" in - pthread) - libs_final=$libs_pthread - ;; - pth) - libs_final=$libs_pth - ;; - esac - libs_final="$libs_final @GPG_ERROR_LIBS@" + libs_final="@GPG_ERROR_LIBS@" echo "$libdirs $libs_final" fi |