* tools/Makefile.am: use @EXPANDED_DATADIR@ instead of @DATADIRNAME@

diff --git a/ChangeLog b/ChangeLog
index 3b2ece0b7e11df30a89f0603b6c652574fbfdaef..49a327040a32430bb63cbd4a895a61f489b2f866 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-18  John (J5) Palmieri  <johnp@redhat.com>
+
+       * tools/Makefile.am: use @EXPANDED_DATADIR@ instead of @DATADIRNAME@  
+
 2006-09-17  Havoc Pennington  <hp@redhat.com>
 
        * dbus/dbus-transport.c (_dbus_transport_get_is_authenticated):

diff --git a/configure.in b/configure.in
index b4e965fe2945b7a6596a0038e25f594ba52cf677..e87fdef04ce9770c0ecb9651898b3130c135eb10 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -551,6 +551,9 @@ dnl check for writev header and writev function so we're
 dnl good to go if HAVE_WRITEV gets defined.
 AC_CHECK_HEADERS(sys/uio.h, [AC_CHECK_FUNCS(writev)])
 
+dnl needed on darwin for NAME_MAX
+AC_CHECK_HEADERS(sys/syslimits.h)
+
 dnl check for flavours of varargs macros (test from GLib)
 AC_MSG_CHECKING(for ISO C99 varargs macros in C)
 AC_TRY_COMPILE([],[

diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index aa2f4ad207699ec04add7162bbd31645d74add07..ba00f462b85f9ac85c9f650d3e1d6aafa38602c4 100644 (file)
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -44,6 +44,10 @@
 #include <dirent.h>
 #include <sys/un.h>
 
+#ifdef HAVE_SYS_SYSLIMITS_H
+#include <sys/syslimits.h>
+#endif
+
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 06d85b47bd8e6ca841220d87da2e2d31063d2ad4..eb19ddb71bfc97894ec9e3f2a278d141fca58f1e 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\"
+INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\"
 
 bin_PROGRAMS=dbus-send dbus-monitor dbus-launch dbus-cleanup-sockets