[git] GCRYPT - branch, wk-pth-pthreads-test, created. post-nuke-of-trailing-ws-21-ge41d6a6

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU crypto library".

The branch, wk-pth-pthreads-test has been created
        at  e41d6a6a483795947aa3ce8da67b3bf69b51871e (commit)

- Log -----------------------------------------------------------------
commit e41d6a6a483795947aa3ce8da67b3bf69b51871e
Merge: a67aeed 9730275
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Mar 11 09:49:09 2011 +0100

    Merge branch 'master' into wk-pth-pthreads-test
    
    Conflicts:
    	ChangeLog due to a typo.


commit a67aeede867a0644c522125e059730fa898e44be
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Mar 8 13:49:04 2011 +0100

    Make build_revision shorter for W32 use

diff --git a/ChangeLog b/ChangeLog
index e499f15..1c043e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
+2011-03-08  Werner Koch  <wk at g10code.com>
+
+	* configure.ac (BUILD_REVISION): Use new git_previs macro.
+
 2011-02-23  Werner Koch  <wk at g10code.com>
 
+	* configure.ac (HAVE_PTHREAD): New.
+
 	* configure.ac (LIBGCRYPT_CONFIG_HOST): New.
 
 	* acinclude.m4 (AM_PATH_GPG_ERROR): Remove.
diff --git a/configure.ac b/configure.ac
index 618a5ee..f86ccd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,8 @@ LIBGCRYPT_CONFIG_API_VERSION=1
 NEED_GPG_ERROR_VERSION=1.8
 
 is_development_version=my_issvn
-BUILD_REVISION=m4_if(git_revision,[],[svn_revision],[git_revision])
+m4_define([git_brevis],m4_esyscmd(printf "%u" 0x[]m4_substr(git_revision,0,4)))
+BUILD_REVISION=m4_if(git_revision,[],[svn_revision],[git_brevis])
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
@@ -181,6 +182,8 @@ LIBGCRYPT_THREAD_MODULES=""
 print_egd_notice=no
 have_w32_system=no
 have_w32ce_system=no
+have_pthread=no
+
 
 # Setup some stuff depending on host.
 case "${host}" in
@@ -610,6 +613,14 @@ fi
 AC_SUBST(PTH_CFLAGS)
 AC_SUBST(PTH_LIBS)
 
+#
+# Check whether pthreads is available
+#
+AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes)
+if test "$have_pthread" = yes; then
+   AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.])
+fi
+
 
 # Solaris needs -lsocket and -lnsl. Unisys system includes
 # gethostbyname in libsocket but needs libnsl for socket.
diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
index 831dc0c..6cf482f 100644
--- a/src/libgcrypt.m4
+++ b/src/libgcrypt.m4
@@ -1,5 +1,5 @@
 dnl Autoconf macros for libgcrypt
-dnl       Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+dnl       Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc.
 dnl
 dnl This file is free software; as a special exception the author gives
 dnl unlimited permission to copy and/or distribute it, with or without
@@ -21,7 +21,8 @@ dnl this features allows to prevent build against newer versions of libgcrypt
 dnl with a changed API.
 dnl
 AC_DEFUN([AM_PATH_LIBGCRYPT],
-[ AC_ARG_WITH(libgcrypt-prefix,
+[ AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_ARG_WITH(libgcrypt-prefix,
             AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
                            [prefix where LIBGCRYPT is installed (optional)]),
      libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
@@ -98,10 +99,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
     LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
     LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
     ifelse([$2], , :, [$2])
-    if test x"$host" != x ; then
-      libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
-      if test x"$libgcrypt_config_host" != xnone ; then
-        if test x"$libgcrypt_config_host" != x"$host" ; then
+    libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+    if test x"$libgcrypt_config_host" != xnone ; then
+      if test x"$libgcrypt_config_host" != x"$host" ; then
   AC_MSG_WARN([[
 ***
 *** The config script $LIBGCRYPT_CONFIG was
@@ -110,7 +110,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
 *** You may want to use the configure option --with-libgcrypt-prefix
 *** to specify a matching config script.
 ***]])
-        fi
       fi
     fi
   else

-----------------------------------------------------------------------


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org