dbus ChangeLog, 1.1175, 1.1176 configure.in, 1.193, 1.194 dbus-1.pc.in, 1.3, 1.4

[John Palmieri]

Update of /cvs/dbus/dbus
In directory kemper:/tmp/cvs-serv18224

Modified Files:
	ChangeLog configure.in dbus-1.pc.in 
Log Message:
* configure.in, dbus-1.pc.in: Check to see if thread methods 
  are in glibc or libpthread and add -lpthread to the link stage 
  if it is the latter



Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.1175
retrieving revision 1.1176
diff -u -d -r1.1175 -r1.1176
--- ChangeLog	26 Oct 2006 18:03:24 -0000	1.1175
+++ ChangeLog	26 Oct 2006 18:06:06 -0000	1.1176
@@ -1,3 +1,9 @@
+2006-10-26  John (J5) Palmieri  <johnp at redhat.com>
+
+	* configure.in, dbus-1.pc.in: Check to see if thread methods 
+	are in glibc or libpthread and add -lpthread to the link stage 
+	if it is the latter
+
 2006-10-26  Thiago Macieira  <thiago at kde.org>
 
 	* dbus/dbus-connection.c (_dbus_connection_open_internal): Fix

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- configure.in	26 Oct 2006 15:55:44 -0000	1.193
+++ configure.in	26 Oct 2006 18:06:07 -0000	1.194
@@ -526,6 +526,8 @@
 
 AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv unsetenv socketpair getgrouplist fpathconf)
 
+
+
 AC_MSG_CHECKING(for dirfd)
 AC_TRY_COMPILE([
 #include <sys/types.h>
@@ -776,6 +778,10 @@
    XML_CFLAGS=$LIBXML_CFLAGS
 fi
 
+# Thread lib detection
+AC_CHECK_FUNC(pthread_cond_timedwait,,[AC_CHECK_LIB(pthread,pthread_cond_timedwait,
+                                                    [THREAD_LIBS="-lpthread"])])
+
 # SELinux detection
 if test x$enable_selinux = xno ; then
     have_selinux=no;
@@ -810,7 +816,12 @@
 AM_CONDITIONAL(HAVE_SELINUX, test x$have_selinux = xyes)
 
 if test x$have_selinux = xyes ; then
-    SELINUX_LIBS="-lselinux -lpthread"
+    # the selinux code creates threads
+    # which requires libpthread even on linux
+    AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create,
+                                                [SELINUX_THREAD_LIBS="-lpthread"])])
+
+    SELINUX_LIBS="-lselinux $SELINUX_THREAD_LIBS"
     AC_DEFINE(HAVE_SELINUX,1,[SELinux support])
 else
     SELINUX_LIBS=
@@ -872,17 +883,17 @@
 
 #### Set up final flags
 DBUS_CLIENT_CFLAGS=
-DBUS_CLIENT_LIBS=
+DBUS_CLIENT_LIBS="$THREAD_LIBS"
 AC_SUBST(DBUS_CLIENT_CFLAGS)
 AC_SUBST(DBUS_CLIENT_LIBS)
 
 DBUS_BUS_CFLAGS=$XML_CFLAGS
-DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS"
+DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS $THREAD_LIBS"
 AC_SUBST(DBUS_BUS_CFLAGS)
 AC_SUBST(DBUS_BUS_LIBS)
 
 DBUS_TEST_CFLAGS=
-DBUS_TEST_LIBS=
+DBUS_TEST_LIBS="$THREAD_LIBS"
 AC_SUBST(DBUS_TEST_CFLAGS)
 AC_SUBST(DBUS_TEST_LIBS)
 

Index: dbus-1.pc.in
===================================================================
RCS file: /cvs/dbus/dbus/dbus-1.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dbus-1.pc.in	17 Mar 2006 03:20:14 -0000	1.3
+++ dbus-1.pc.in	26 Oct 2006 18:06:07 -0000	1.4
@@ -9,6 +9,6 @@
 Name: dbus
 Description: Free desktop message bus
 Version: @VERSION@
-Libs: -L${libdir} -ldbus-1
+Libs: -L${libdir} -ldbus-1 @DBUS_CLIENT_LIBS@ 
 Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include