build-sys: use itstool instead of intltool

Makefile.am

@@ -27,7 +27,7 @@ AUTOMAKE_OPTIONS = color-tests parallel-tests
 GCC_COLORS ?= 'ooh, shiny!'
 export GCC_COLORS
 
-SUBDIRS = . po
+SUBDIRS = .
 
 # remove targets if the command fails
 .DELETE_ON_ERROR:
@@ -664,7 +664,7 @@ EXTRA_DIST += \
 	.travis.yml \
 	.mailmap
 
-@INTLTOOL_POLICY_RULE@
+@ITSTOOL_POLICY_RULE@
 
 # ------------------------------------------------------------------------------
 

README

@@ -157,7 +157,7 @@ REQUIREMENTS:
         automake
         autoconf
         libtool
-        intltool
+        itstool
         gperf
         python (optional)
         python-lxml (optional, but required to build the indices)

autogen.sh

@@ -28,7 +28,6 @@ if [ -f .git/hooks/pre-commit.sample ] && [ ! -f .git/hooks/pre-commit ]; then
         echo "Activated pre-commit hook." || :
 fi
 
-intltoolize --force --automake
 autoreconf --force --install --symlink
 
 libdir() {

configure.ac

@@ -59,27 +59,33 @@ SET_ARCH(IA32, i*86*)
 SET_ARCH(MIPS, mips*)
 SET_ARCH(AARCH64, aarch64*)
 
-# i18n stuff for the PolicyKit policy files, heck whether intltool can be found, disable NLS otherwise
-AC_CHECK_PROG(intltool_found, [intltool-merge], [yes], [no])
-AS_IF([test x"$intltool_found" != xyes],
+# i18n stuff for the PolicyKit policy files, check whether itstool can be found, disable NLS otherwise
+AC_CHECK_PROG(itstool_found, [itstool], [yes], [no])
+AS_IF([test x"$itstool_found" != xyes],
       [AS_IF([test x"$enable_nls" = xyes],
-             [AC_MSG_ERROR([--enable-nls requested but intltool not found])],
+             [AC_MSG_ERROR([--enable-nls requested but itstool not found])],
              [AS_IF([test x"$enable_nls" != xno],
-                    [AC_MSG_WARN([*** Disabling NLS support because intltool was not found])
+                    [AC_MSG_WARN([*** Disabling NLS support because itstool was not found])
                      enable_nls=no])
              ])
       ])
 
 AM_NLS
 AS_IF([test x"$enable_nls" != xno -o "x$enable_polkit" != xno], [
-    # intltoolize greps for '^(AC|IT)_PROG_INTLTOOL', so it needs to be on its own line
-IT_PROG_INTLTOOL([0.40.0])
+    ITSTOOL_POLICY_RULE='
+_po_files = $(wildcard $(top_srcdir)/po/*.po)
+_mo_files = $(patsubst %.po,%.mo,$(_po_files))
+_mos: $(_mo_files)
+%.mo: %.po ; @echo "  MSGFMT  " $@ && msgfmt $< -o $@
+%.policy: %.policy.in _mos; @echo "  ITSTL   " $@ && itstool -j $< $(_mo_files) -o $@
+'
+    AM_SUBST_NOTMAKE(ITSTOOL_POLICY_RULE)
 ])
 
-AS_IF([test -z "$INTLTOOL_POLICY_RULE"], [
-    # If intltool is not available, provide a dummy rule to fail generation of %.policy files with a meaningful error message
-    INTLTOOL_POLICY_RULE='%.policy: %.policy.in ; @echo "  ITMRG   " $@ && echo "*** intltool support required to build target $@" && false'
-    AC_SUBST(INTLTOOL_POLICY_RULE)
+AS_IF([test x"$itstool_found" != xyes],
+    # If itstool is not available, provide a dummy rule to fail generation of %.policy files with a meaningful error message
+    ITSTOOL_POLICY_RULE='%.policy: %.policy.in ; @echo "  ITSTL   " $@ && echo "*** itstool support required to build target $@" && false'
+    AC_SUBST(ITSTOOL_POLICY_RULE)
 ])
 
 GETTEXT_PACKAGE=systemd
@@ -1430,11 +1436,6 @@ AS_IF([test "x${enable_split_usr}" = "xyes"], [
 ])
 AM_CONDITIONAL(ENABLE_SPLIT_USR, [test "x${enable_split_usr}" = "xyes"])
 
-# work around intltool-update issues during 'make distcheck'
-AS_IF([test "x$0" != "x./configure"], [
-        AC_SUBST([INTLTOOL_UPDATE], [/bin/true])
-])
-
 # QEMU and OVMF UEFI firmware
 AS_IF([test x"$cross_compiling" = "xyes"], [], [
         AC_PATH_PROG([QEMU], [qemu-system-x86_64])
@@ -1490,7 +1491,6 @@ AC_SUBST([rootlibdir], [$with_rootlibdir])
 
 AC_CONFIG_FILES([
         Makefile
-        po/Makefile.in
 ])
 
 AC_OUTPUT

m4/.gitignore

@@ -1,4 +1,3 @@
-intltool.m4
 libtool.m4
 ltoptions.m4
 ltsugar.m4

po/.gitignore

@@ -1,6 +1,3 @@
 POTFILES
-Makefile.in.in
-.intltool-merge-cache
-Makefile
 systemd.pot
 /*.gmo

src/core/org.freedesktop.systemd1.policy.in.in

@@ -17,8 +17,8 @@
         <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
 
         <action id="org.freedesktop.systemd1.reply-password">
-                <_description>Send passphrase back to system</_description>
-                <_message>Authentication is required to send the entered passphrase back to the system.</_message>
+                <description>Send passphrase back to system</description>
+                <message>Authentication is required to send the entered passphrase back to the system.</message>
                 <defaults>
                         <allow_any>no</allow_any>
                         <allow_inactive>no</allow_inactive>
@@ -28,8 +28,8 @@
         </action>
 
         <action id="org.freedesktop.systemd1.manage-units">
-                <_description>Manage system services or other units</_description>
-                <_message>Authentication is required to manage system services or other units.</_message>
+                <description>Manage system services or other units</description>
+                <message>Authentication is required to manage system services or other units.</message>
                 <defaults>
                         <allow_any>auth_admin</allow_any>
                         <allow_inactive>auth_admin</allow_inactive>
@@ -38,8 +38,8 @@
         </action>
 
         <action id="org.freedesktop.systemd1.manage-unit-files">
-                <_description>Manage system service or unit files</_description>
-                <_message>Authentication is required to manage system service or unit files.</_message>
+                <description>Manage system service or unit files</description>
+                <message>Authentication is required to manage system service or unit files.</message>
                 <defaults>
                         <allow_any>auth_admin</allow_any>
                         <allow_inactive>auth_admin</allow_inactive>
@@ -48,8 +48,8 @@
         </action>
 
         <action id="org.freedesktop.systemd1.set-environment">
-                <_description>Set or unset system and service manager environment variables</_description>
-                <_message>Authentication is required to set or unset system and service manager environment variables.</_message>
+                <description>Set or unset system and service manager environment variables</description>
+                <message>Authentication is required to set or unset system and service manager environment variables.</message>
                 <defaults>
                         <allow_any>auth_admin</allow_any>
                         <allow_inactive>auth_admin</allow_inactive>
@@ -58,8 +58,8 @@
         </action>
 
         <action id="org.freedesktop.systemd1.reload-daemon">
-                <_description>Reload the systemd state</_description>
-                <_message>Authentication is required to reload the systemd state.</_message>
+                <description>Reload the systemd state</description>
+                <message>Authentication is required to reload the systemd state.</message>
                 <defaults>
                         <allow_any>auth_admin</allow_any>
                         <allow_inactive>auth_admin</allow_inactive>

src/hostname/org.freedesktop.hostname1.policy.in

@@ -17,8 +17,8 @@
         <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
 
         <action id="org.freedesktop.hostname1.set-hostname">
-                <_description>Set host name</_description>
-                <_message>Authentication is required to set the local host name.</_message>
+                <description>Set host name</description>
+                <message>Authentication is required to set the local host name.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
@@ -27,8 +27,8 @@
         </action>
 
         <action id="org.freedesktop.hostname1.set-static-hostname">
-                <_description>Set static host name</_description>
-                <_message>Authentication is required to set the statically configured local host name, as well as the pretty host name.</_message>
+                <description>Set static host name</description>
+                <message>Authentication is required to set the statically configured local host name, as well as the pretty host name.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
@@ -38,8 +38,8 @@
         </action>
 
         <action id="org.freedesktop.hostname1.set-machine-info">
-                <_description>Set machine information</_description>
-                <_message>Authentication is required to set local machine information.</_message>
+                <description>Set machine information</description>
+                <message>Authentication is required to set local machine information.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>

src/import/org.freedesktop.import1.policy.in

@@ -17,8 +17,8 @@
         <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
 
         <action id="org.freedesktop.import1.import">
-                <_description>Import a VM or container image</_description>
-                <_message>Authentication is required to import a VM or container image</_message>
+                <description>Import a VM or container image</description>
+                <message>Authentication is required to import a VM or container image</message>
                 <defaults>
                         <allow_any>auth_admin</allow_any>
                         <allow_inactive>auth_admin</allow_inactive>
@@ -27,8 +27,8 @@
         </action>
 
         <action id="org.freedesktop.import1.export">
-                <_description>Export a VM or container image</_description>
-                <_message>Authentication is required to export a VM or container image</_message>
+                <description>Export a VM or container image</description>
+                <message>Authentication is required to export a VM or container image</message>
                 <defaults>
                         <allow_any>auth_admin</allow_any>
                         <allow_inactive>auth_admin</allow_inactive>
@@ -37,8 +37,8 @@
         </action>
 
         <action id="org.freedesktop.import1.pull">
-                <_description>Download a VM or container image</_description>
-                <_message>Authentication is required to download a VM or container image</_message>
+                <description>Download a VM or container image</description>
+                <message>Authentication is required to download a VM or container image</message>
                 <defaults>
                         <allow_any>auth_admin</allow_any>
                         <allow_inactive>auth_admin</allow_inactive>

src/locale/org.freedesktop.locale1.policy.in

@@ -17,8 +17,8 @@
         <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
 
         <action id="org.freedesktop.locale1.set-locale">
-                <_description>Set system locale</_description>
-                <_message>Authentication is required to set the system locale.</_message>
+                <description>Set system locale</description>
+                <message>Authentication is required to set the system locale.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
@@ -28,8 +28,8 @@
         </action>
 
         <action id="org.freedesktop.locale1.set-keyboard">
-                <_description>Set system keyboard settings</_description>
-                <_message>Authentication is required to set the system keyboard settings.</_message>
+                <description>Set system keyboard settings</description>
+                <message>Authentication is required to set the system keyboard settings.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>