[network-manager-sstp/gtk4-work: 2/6] Updating build in preparation of gtk4 work

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

commit a9871e39d264b6e704288e045fff69b9b790dad6
Author: Eivind Næss <eivnaes yahoo com>
Date:   Tue Mar 22 07:49:25 2022 -0700

    Updating build in preparation of gtk4 work
    
    Signed-off-by: Eivind Næss <eivnaes yahoo com>

 Makefile.am  | 17 +++++++++++++++--
 autogen.sh   |  2 +-
 configure.ac |  4 +++-
 3 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 63953e7..19077ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -145,8 +145,6 @@ editor_sources = \
        shared/nm-utils/nm-vpn-plugin-utils.h \
        shared/utils.h \
        shared/utils.c \
-       properties/resources.c \
-       properties/resources.h \
        properties/advanced-dialog.c \
        properties/advanced-dialog.h \
        properties/nm-sstp-editor.c \
@@ -195,20 +193,28 @@ endif
 
 properties_libnm_vpn_plugin_sstp_editor_la_SOURCES = \
        $(editor_sources)
+
+nodist_properties_libnm_vpn_plugin_sstp_editor_la_SOURCES = \
+       properties/resources.c \
+       properties/resources.h
+
 properties_libnm_vpn_plugin_sstp_editor_la_CFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(LIBNM_CFLAGS) \
        $(LIBNMA_CFLAGS) \
        $(GNUTLS_CFLAGS)
+
 properties_libnm_vpn_plugin_sstp_editor_la_CPPFLAGS = \
        -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR \
        $(properties_cppflags)
+
 properties_libnm_vpn_plugin_sstp_editor_la_LIBADD = \
        $(GTK_LIBS) \
        $(LIBNM_LIBS) \
        $(LIBNMA_LIBS) \
        $(GNUTLS_LIBS)
+
 properties_libnm_vpn_plugin_sstp_editor_la_LDFLAGS = \
        -avoid-version \
        -Wl,--version-script="$(srcdir)/properties/libnm-vpn-plugin-sstp-editor.ver"
@@ -224,6 +230,10 @@ properties_libnm_sstp_properties_la_SOURCES = \
        $(plugin_sources) \
        $(editor_sources)
 
+nodist_properties_libnm_sstp_properties_la_SOURCES = \
+       properties/resources.c \
+       properties/resources.h
+
 properties_libnm_sstp_properties_la_CFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
@@ -252,14 +262,17 @@ endif
 auth_dialog_nm_sstp_auth_dialog_SOURCES = \
        $(shared_sources) \
        auth-dialog/main.c
+
 auth_dialog_nm_sstp_auth_dialog_CFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(LIBNM_CFLAGS) \
        $(LIBNMA_CFLAGS) \
        $(LIBSECRET_CFLAGS)
+
 auth_dialog_nm_sstp_auth_dialog_CPPFLAGS = \
        -I$(top_srcdir)/shared
+
 auth_dialog_nm_sstp_auth_dialog_LDADD = \
        $(GTK_LIBS) \
        $(LIBNM_LIBS) \
diff --git a/autogen.sh b/autogen.sh
index d74a98f..a0c69c1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,6 +17,6 @@ PKG_NAME=NetworkManager-sstp
     autoreconf --install --symlink &&
     intltoolize --force &&
     autoreconf &&
-    ./configure --enable-maintainer-mode $@
+    ./configure --enable-maintainer-mode --enable-more-warnings=error $@
 )
 
diff --git a/configure.ac b/configure.ac
index 2f9a020..5bfd335 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,11 +165,13 @@ PKG_CHECK_MODULES(SSTPC, [sstp-client-1.0 >= 1.0.10])
 
 # gio-unix will require glib and gio
 PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.40 gmodule-2.0])
-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_44 
-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_44"
+GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_44"
+GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_44"
 
 if test x"$with_gnome" != xno; then
        PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
        GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
+       GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MAX_REQUIRED=GDK_VERSION_3_4"
 
        PKG_CHECK_MODULES(LIBNMA, libnma >= 1.7.0)
        PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18)