aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2012-06-09 13:12:12 +0200
committerMichael Albinus2012-06-09 13:12:12 +0200
commite3a3e2133197db5c1c0ba91761ba435fde3c20f2 (patch)
tree88fa3f6698cc75c9f4657e8bf4dbb51a2a9199a9
parente75852fd3e300c6f84637cfb1c2e53f89e598d15 (diff)
downloademacs-e3a3e2133197db5c1c0ba91761ba435fde3c20f2.tar.gz
emacs-e3a3e2133197db5c1c0ba91761ba435fde3c20f2.zip
* configure.in (dbus_type_is_valid): Check for library function.
-rw-r--r--ChangeLog6
-rw-r--r--autogen/config.in4
-rw-r--r--configure.in4
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d6d28254d65..bb5ce514999 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12012-06-09 Michael Albinus <michael.albinus@gmx.de>
2
3 * configure.in (dbus_type_is_valid): Check for library function.
4
12012-06-06 Glenn Morris <rgm@gnu.org> 52012-06-06 Glenn Morris <rgm@gnu.org>
2 6
3 * INSTALL, make-dist: Remove vcdiff. 7 * INSTALL, make-dist: Remove vcdiff.
@@ -409,7 +413,7 @@
409 413
410 * configure.in (dbus_validate_bus_name, dbus_validate_path) 414 * configure.in (dbus_validate_bus_name, dbus_validate_path)
411 (dbus_validate_interface, dbus_validate_member): Check also for 415 (dbus_validate_interface, dbus_validate_member): Check also for
412 these library functions 416 these library functions.
413 417
4142012-04-22 Paul Eggert <eggert@cs.ucla.edu> 4182012-04-22 Paul Eggert <eggert@cs.ucla.edu>
415 419
diff --git a/autogen/config.in b/autogen/config.in
index 1f731dfa7d2..31a17177504 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -145,6 +145,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
145/* Define to 1 if using D-Bus. */ 145/* Define to 1 if using D-Bus. */
146#undef HAVE_DBUS 146#undef HAVE_DBUS
147 147
148/* Define to 1 if you have the `dbus_type_is_valid' function. */
149#undef HAVE_DBUS_TYPE_IS_VALID
150
148/* Define to 1 if you have the `dbus_validate_bus_name' function. */ 151/* Define to 1 if you have the `dbus_validate_bus_name' function. */
149#undef HAVE_DBUS_VALIDATE_BUS_NAME 152#undef HAVE_DBUS_VALIDATE_BUS_NAME
150 153
@@ -1407,4 +1410,3 @@ Local Variables:
1407mode: c 1410mode: c
1408End: 1411End:
1409*/ 1412*/
1410
diff --git a/configure.in b/configure.in
index 07925142bc1..4fc151d796c 100644
--- a/configure.in
+++ b/configure.in
@@ -1950,8 +1950,10 @@ if test "${with_dbus}" = "yes"; then
1950 LIBS="$LIBS $DBUS_LIBS" 1950 LIBS="$LIBS $DBUS_LIBS"
1951 AC_DEFINE(HAVE_DBUS, 1, [Define to 1 if using D-Bus.]) 1951 AC_DEFINE(HAVE_DBUS, 1, [Define to 1 if using D-Bus.])
1952 dnl dbus_watch_get_unix_fd has been introduced in D-Bus 1.1.1. 1952 dnl dbus_watch_get_unix_fd has been introduced in D-Bus 1.1.1.
1953 dnl dbus_validate_* have been introduced in D-Bus 1.5.12. 1953 dnl dbus_type_is_valid and dbus_validate_* have been introduced in
1954 dnl D-Bus 1.5.12.
1954 AC_CHECK_FUNCS(dbus_watch_get_unix_fd \ 1955 AC_CHECK_FUNCS(dbus_watch_get_unix_fd \
1956 dbus_type_is_valid \
1955 dbus_validate_bus_name \ 1957 dbus_validate_bus_name \
1956 dbus_validate_path \ 1958 dbus_validate_path \
1957 dbus_validate_interface \ 1959 dbus_validate_interface \