Merge branch 'tmp'

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32854

diff --git a/configure.in b/configure.in
index e8c036c..ea11098 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1038,7 +1038,7 @@ AC_SUBST(DBUS_CLIENT_CFLAGS)
 AC_SUBST(DBUS_CLIENT_LIBS)
 
 DBUS_BUS_CFLAGS="$XML_CFLAGS"
-DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS $THREAD_LIBS $ADT_LIBS $NETWORK_libs"
+DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $THREAD_LIBS $ADT_LIBS $NETWORK_libs"
 AC_SUBST(DBUS_BUS_CFLAGS)
 AC_SUBST(DBUS_BUS_LIBS)
 
@@ -1693,7 +1693,6 @@ echo "
         Building XML docs:        ${enable_xml_docs}
         Building cache support:   ${enable_userdb_cache}
         Building launchd support: ${have_launchd}
-        Gettext libs (empty OK):  ${INTLLIBS}
         Using XML parser:         ${with_xml}
         Init scripts style:       ${with_init_scripts}
         Abstract socket names:    ${ac_cv_have_abstract_sockets}

diff --git a/test/name-test/.gitignore b/test/name-test/.gitignore
index c04df31..09f7ad3 100644 (file)
--- a/test/name-test/.gitignore
+++ b/test/name-test/.gitignore
@@ -12,3 +12,4 @@ test-privserver
 test-privserver-client
 test-shutdown
 test-threads-init
+test-autolaunch