dbus ChangeLog,1.1187,1.1188 configure.in,1.195,1.196

[John Palmieri]

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

Modified Files:
	ChangeLog configure.in 
Log Message:
* configure.in: Add a check for DIR *dirp->dd_fd

* dbus/dbus-sysdeps-util-unix: if HAVE_DDFD is defined use
  DIR *dirp->dd_fd else use DIR *dirp->__dd_fd.  This takes care
  of both Solaris and Irix



Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.1187
retrieving revision 1.1188
diff -u -d -r1.1187 -r1.1188
--- ChangeLog	2 Nov 2006 04:26:23 -0000	1.1187
+++ ChangeLog	2 Nov 2006 19:19:08 -0000	1.1188
@@ -1,3 +1,11 @@
+2006-11-02  John (J5) Palmieri  <johnp at redhat.com>
+
+	* configure.in: Add a check for DIR *dirp->dd_fd
+
+	* dbus/dbus-sysdeps-util-unix: if HAVE_DDFD is defined use 
+	DIR *dirp->dd_fd else use DIR *dirp->__dd_fd.  This takes care
+	of both Solaris and Irix
+
 2006-11-01  Havoc Pennington  <hp at redhat.com>
 
 	* bus/dbus-daemon.1.in: document standard_session_servicedirs

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- configure.in	1 Nov 2006 23:30:46 -0000	1.195
+++ configure.in	2 Nov 2006 19:19:08 -0000	1.196
@@ -526,10 +526,8 @@
 
 AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv unsetenv socketpair getgrouplist fpathconf)
 
-
-
 AC_MSG_CHECKING(for dirfd)
-AC_TRY_COMPILE([
+AC_TRY_LINK([
 #include <sys/types.h>
 #include <dirent.h>
 ],[
@@ -542,6 +540,23 @@
 AC_MSG_RESULT($dbus_have_dirfd)
 if test "$dbus_have_dirfd" = yes; then
 	AC_DEFINE(HAVE_DIRFD,1,[Have dirfd function])
+else
+	AC_MSG_CHECKING(for DIR *dirp->dd_fd)    
+	AC_TRY_LINK([
+#include <sys/types.h>
+#include <dirent.h>
+	],[
+DIR *dirp;
+int fd;
+dirp = opendir(".");
+fd = dirp->dd_fd;
+closedir(dirp);
+	],
+	dbus_have_ddfd=yes, dbus_have_ddfd=no)
+	AC_MSG_RESULT($dbus_have_ddfd)
+	if test "$dbus_have_ddfd" = yes; then
+		AC_DEFINE(HAVE_DDFD,1,[Have the ddfd member of DIR])
+	fi
 fi
 
 AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])