summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-04-23 06:17:30 -0400
committerGlenn Morris <rgm@gnu.org>2012-04-23 06:17:30 -0400
commitca0294bbd827c08fd60d32e63c8e133342b6551d (patch)
tree94d6da25eab1f8959152b0f5ba566e1caf1e7cfe
parentf621ccf5b8d7038c1e614616d7aa831a0e25b18f (diff)
downloademacs-ca0294bbd827c08fd60d32e63c8e133342b6551d.tar.gz
emacs-ca0294bbd827c08fd60d32e63c8e133342b6551d.tar.bz2
emacs-ca0294bbd827c08fd60d32e63c8e133342b6551d.zip
Auto-commit of generated files.
-rw-r--r--autogen/config.in12
-rwxr-xr-xautogen/configure16
2 files changed, 23 insertions, 5 deletions
diff --git a/autogen/config.in b/autogen/config.in
index 1082e150fc6..805629c9c8f 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -148,6 +148,18 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if using D-Bus. */
#undef HAVE_DBUS
+/* Define to 1 if you have the `dbus_validate_bus_name' function. */
+#undef HAVE_DBUS_VALIDATE_BUS_NAME
+
+/* Define to 1 if you have the `dbus_validate_interface' function. */
+#undef HAVE_DBUS_VALIDATE_INTERFACE
+
+/* Define to 1 if you have the `dbus_validate_member' function. */
+#undef HAVE_DBUS_VALIDATE_MEMBER
+
+/* Define to 1 if you have the `dbus_validate_path' function. */
+#undef HAVE_DBUS_VALIDATE_PATH
+
/* Define to 1 if you have the `dbus_watch_get_unix_fd' function. */
#undef HAVE_DBUS_WATCH_GET_UNIX_FD
diff --git a/autogen/configure b/autogen/configure
index 52575eb075b..5c57dcc0374 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -7144,7 +7144,7 @@ fi
nw="$nw -Waggregate-return" # anachronistic
- nw="$nw -Wlong-long" # C90 is anachronistic (lib/gethrxtime.h)
+ nw="$nw -Wlong-long" # C90 is anachronistic
nw="$nw -Wc++-compat" # We don't care about C++ compilers
nw="$nw -Wundef" # Warns on '#if GNULIB_FOO' etc in gnulib
nw="$nw -Wtraditional" # Warns on #elif which we use often
@@ -11913,12 +11913,18 @@ $as_echo "no" >&6; }
$as_echo "#define HAVE_DBUS 1" >>confdefs.h
- for ac_func in dbus_watch_get_unix_fd
+ for ac_func in dbus_watch_get_unix_fd \
+ dbus_validate_bus_name \
+ dbus_validate_path \
+ dbus_validate_interface \
+ dbus_validate_member
do :
- ac_fn_c_check_func "$LINENO" "dbus_watch_get_unix_fd" "ac_cv_func_dbus_watch_get_unix_fd"
-if test "x$ac_cv_func_dbus_watch_get_unix_fd" = x""yes; then :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define HAVE_DBUS_WATCH_GET_UNIX_FD 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi