diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2006-09-18 17:17:41 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2006-09-18 17:17:41 +0000 |
| commit | 5f292c611fc60bf3115dcf3d1213fdedc36fc65c (patch) | |
| tree | c5ab8006e85ef7b3c9471ac39585dbc50c1170bd | |
| parent | 1ececca7e15adc20d3f922aeb81af74c6f98e980 (diff) | |
* tools/Makefile.am: use @EXPANDED_DATADIR@ instead of @DATADIRNAME@
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps-util-unix.c | 4 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 |
4 files changed, 12 insertions, 1 deletions
@@ -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 b4e965fe..e87fdef0 100644 --- 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 aa2f4ad2..ba00f462 100644 --- 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 06d85b47..eb19ddb7 100644 --- 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 |