[network-manager-sstp: 3/3] Merge branch 'gettext' into 'master'

[Eivind Næss <eivnaes src gnome org>]

commit 1432bea1feb45fa56f8ade5e4710dca863073467
Merge: 5b39035 0aa8889
Author: Eivind Næss <eivnaes yahoo com>
Date:   Sun Sep 11 20:31:35 2022 +0000

    Merge branch 'gettext' into 'master'
    
    Closes #45, Migrate to GNU Gettext instead of using intltool
    
    Closes #45
    
    See merge request GNOME/network-manager-sstp!45

 .gitignore                                   |  78 +++-
 .gitlab-ci.yml                               |   9 +-
 Makefile.am                                  |  15 +-
 appdata/network-manager-sstp.metainfo.xml.in |  11 +-
 autogen.sh                                   |  25 +-
 configure.ac                                 |   9 +-
 m4/host-cpu-c-abi.m4                         | 644 +++++++++++++++++++++++++++
 po/Makevars                                  |  78 ++++
 po/POTFILES.in                               |   2 +-
 9 files changed, 823 insertions(+), 48 deletions(-)
---
diff --cc configure.ac
index a6f76c9,b7ee5dc..6918050
--- a/configure.ac
+++ b/configure.ac
@@@ -139,26 -139,32 +139,32 @@@ if test x"$with_libnm_glib_specified" !
                AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
        fi
  fi
 -if test "$with_gnome" != no; then
 +if test x"$with_gnome" != xno; then
        with_gnome=yes
  fi
 -if test "$with_gtk4_specified" == no; then
 +if test x"$with_gtk4_specified" = xno; then
        with_gtk4=no
  fi
 -if test "$with_gtk4" != yes; then
 +if test x"$with_gtk4" != xyes; then
        with_gtk4=no
  fi
 -if test "$with_libnm_glib_specified" == no; then
 +if test x"$with_libnm_glib_specified" = xno; then
        with_libnm_glib=no
  fi
 -if test "$with_libnm_glib" != yes; then
 +if test x"$with_libnm_glib" != xyes; then
        with_libnm_glib=no
  fi
 -AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
 -AM_CONDITIONAL(WITH_GTK4, test "$with_gtk4" != no)
 -AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
 +AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
 +AM_CONDITIONAL(WITH_GTK4, test x"$with_gtk4" != xno)
 +AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno)
  AC_ARG_ENABLE(absolute-paths, AS_HELP_STRING([--enable-absolute-paths], [Use absolute paths to in .name 
files. Useful for development. (default is no)]))
  
+ dnl
+ dnl translation support
+ dnl
+ AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.20])
+ 
  GETTEXT_PACKAGE=NetworkManager-sstp
  AC_SUBST(GETTEXT_PACKAGE)
  AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])