[svn] assuan - r293 - in trunk: . src

[svn author wk]

Author: wk
Date: 2009-01-22 16:06:28 +0100 (Thu, 22 Jan 2009)
New Revision: 293

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.ac
   trunk/src/assuan-connect.c
Log:
Tweak test for nanosleep.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-11-03 18:27:11 UTC (rev 292)
+++ trunk/ChangeLog	2009-01-22 15:06:28 UTC (rev 293)
@@ -1,3 +1,7 @@
+2009-01-22  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Check for nanoleep only in libc.
+
 2008-11-03  Marcus Brinkmann  <marcus at g10code.de>
 
 	* tests/fdpassing.c (register_commands): Add missing initializer

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2008-11-03 18:27:11 UTC (rev 292)
+++ trunk/NEWS	2009-01-22 15:06:28 UTC (rev 293)
@@ -11,7 +11,7 @@
 
  * Minor fixes.
 
- * Build library for GNU/LInux as PIC.
+ * Build library for GNU/Linux as PIC.
 
 
 Noteworthy changes in version 1.0.4 (2007-12-12)

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-11-03 18:27:11 UTC (rev 292)
+++ trunk/configure.ac	2009-01-22 15:06:28 UTC (rev 293)
@@ -208,10 +208,21 @@
 AM_CONDITIONAL(USE_DESCRIPTOR_PASSING, test "$use_descriptor_passing" = "yes")
 
 
+#
 # Checks for library functions.
+#
+AC_CHECK_FUNCS([flockfile funlockfile])
 
-AC_CHECK_FUNCS([flockfile funlockfile nanosleep])
+# On some systems (e.g. Solaris) nanosleep requires linking to librl.
+# Given that we use nanosleep only as an optimization over a select
+# based wait function we want it only if it is available in libc.
+_save_libs="$LIBS"
+AC_SEARCH_LIBS([nanosleep], [],
+               [AC_DEFINE(HAVE_NANOSLEEP,1,
+                [Define to 1 if you have the `nanosleep' function in libc.])])
+LIBS="$_save_libs"
 
+
 # Check for funopen
 AC_CHECK_FUNCS(funopen)
 if test $ac_cv_func_funopen != yes; then

Modified: trunk/src/assuan-connect.c
===================================================================
--- trunk/src/assuan-connect.c	2008-11-03 18:27:11 UTC (rev 292)
+++ trunk/src/assuan-connect.c	2009-01-22 15:06:28 UTC (rev 293)
@@ -58,8 +58,8 @@
 
 
 #ifndef HAVE_W32_SYSTEM
-/* Return user credentials. PID, UID and GID amy be gived as NULL if
-   you are not interested in this value.  For getting the pid of the
+/* Return user credentials. PID, UID and GID may be given as NULL if
+   you are not interested in a value.  For getting the pid of the
    peer the assuan_get_pid is usually better suited. */
 assuan_error_t
 assuan_get_peercred (assuan_context_t ctx, pid_t *pid, uid_t *uid, gid_t *gid)