From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Sun, 22 Jan 2023 02:30:52 +0000 (-0300)
Subject: Build system: Support new snapd-glib-2 API
X-Git-Tag: v2.4.3~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63890581f643759bd93fa4416ab53e7380c6bd2d;p=thirdparty%2Fcups.git

Build system: Support new snapd-glib-2 API

There is a new API of snapd-glib used for libsoup3

The original API, snapd-glib, is still supported.
---

diff --git a/config-scripts/cups-container.m4 b/config-scripts/cups-container.m4
index 7e345b5ee7..526664d4bf 100644
--- a/config-scripts/cups-container.m4
+++ b/config-scripts/cups-container.m4
@@ -39,12 +39,12 @@ AS_IF([test "x$PKGCONFIG" != x], [
 	APPARMORLIBS="$($PKGCONFIG --libs libapparmor)"
 	AC_DEFINE([HAVE_LIBAPPARMOR], [1], [Have the apparmor library?])
 
-	AC_MSG_CHECKING([for libsnapd-glib])
-	AS_IF([$PKGCONFIG --exists snapd-glib glib-2.0 gio-2.0], [
+	AC_MSG_CHECKING([for libsnapd-glib-2])
+	AS_IF([$PKGCONFIG --exists snapd-glib-2 glib-2.0 gio-2.0], [
 	    AC_MSG_RESULT([yes])
-	    CFLAGS="$CFLAGS $($PKGCONFIG --cflags snapd-glib glib-2.0 gio-2.0)"
-	    SNAPDGLIBLIBS="$($PKGCONFIG --libs snapd-glib glib-2.0 gio-2.0)"
-	    AC_DEFINE([HAVE_LIBSNAPDGLIB], [1], [Have the snapd-glib library?])
+	    CFLAGS="$CFLAGS $($PKGCONFIG --cflags snapd-glib-2 glib-2.0 gio-2.0)"
+	    SNAPDGLIBLIBS="$($PKGCONFIG --libs snapd-glib-2 glib-2.0 gio-2.0)"
+	    AC_DEFINE([HAVE_LIBSNAPDGLIB], [1], [Have the snapd-glib-2 library?])
 	    SAVELIBS="$LIBS"
 	    LIBS="$SNAPDGLIBLIBS $LIBS"
 	    AC_CHECK_FUNC([snapd_client_run_snapctl2_sync], [
@@ -52,7 +52,21 @@ AS_IF([test "x$PKGCONFIG" != x], [
 	    ])
 	    LIBS="$SAVELIBS"
 	], [
-	    AC_MSG_RESULT([no])
+	    AC_MSG_CHECKING([for libsnapd-glib])
+	    AS_IF([$PKGCONFIG --exists snapd-glib glib-2.0 gio-2.0], [
+		AC_MSG_RESULT([yes])
+		CFLAGS="$CFLAGS $($PKGCONFIG --cflags snapd-glib glib-2.0 gio-2.0)"
+		SNAPDGLIBLIBS="$($PKGCONFIG --libs snapd-glib glib-2.0 gio-2.0)"
+		AC_DEFINE([HAVE_LIBSNAPDGLIB], [1], [Have the snapd-glib library?])
+		SAVELIBS="$LIBS"
+		LIBS="$SNAPDGLIBLIBS $LIBS"
+		AC_CHECK_FUNC([snapd_client_run_snapctl2_sync], [
+		    AC_DEFINE([HAVE_SNAPD_CLIENT_RUN_SNAPCTL2_SYNC], [1], [Have the snapd_client_run_snapctl2_sync function?])
+		])
+		LIBS="$SAVELIBS"
+	    ], [
+		AC_MSG_RESULT([no])
+	    ])
 	])
     ])
 ])
diff --git a/configure b/configure
index 75afc8a472..40d9e7a714 100755
--- a/configure
+++ b/configure
@@ -10969,15 +10969,15 @@ printf "%s\n" "yes" >&6; }
 printf "%s\n" "#define HAVE_LIBAPPARMOR 1" >>confdefs.h
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsnapd-glib" >&5
-printf %s "checking for libsnapd-glib... " >&6; }
-	if $PKGCONFIG --exists snapd-glib glib-2.0 gio-2.0
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsnapd-glib-2" >&5
+printf %s "checking for libsnapd-glib-2... " >&6; }
+	if $PKGCONFIG --exists snapd-glib-2 glib-2.0 gio-2.0
 then :
 
 	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	    CFLAGS="$CFLAGS $($PKGCONFIG --cflags snapd-glib glib-2.0 gio-2.0)"
-	    SNAPDGLIBLIBS="$($PKGCONFIG --libs snapd-glib glib-2.0 gio-2.0)"
+	    CFLAGS="$CFLAGS $($PKGCONFIG --cflags snapd-glib-2 glib-2.0 gio-2.0)"
+	    SNAPDGLIBLIBS="$($PKGCONFIG --libs snapd-glib-2 glib-2.0 gio-2.0)"
 
 printf "%s\n" "#define HAVE_LIBSNAPDGLIB 1" >>confdefs.h
 
@@ -10997,7 +10997,35 @@ fi
 
 else $as_nop
 
-	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsnapd-glib" >&5
+printf %s "checking for libsnapd-glib... " >&6; }
+	    if $PKGCONFIG --exists snapd-glib glib-2.0 gio-2.0
+then :
+
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+		CFLAGS="$CFLAGS $($PKGCONFIG --cflags snapd-glib glib-2.0 gio-2.0)"
+		SNAPDGLIBLIBS="$($PKGCONFIG --libs snapd-glib glib-2.0 gio-2.0)"
+
+printf "%s\n" "#define HAVE_LIBSNAPDGLIB 1" >>confdefs.h
+
+		SAVELIBS="$LIBS"
+		LIBS="$SNAPDGLIBLIBS $LIBS"
+		ac_fn_c_check_func "$LINENO" "snapd_client_run_snapctl2_sync" "ac_cv_func_snapd_client_run_snapctl2_sync"
+if test "x$ac_cv_func_snapd_client_run_snapctl2_sync" = xyes
+then :
+
+
+printf "%s\n" "#define HAVE_SNAPD_CLIENT_RUN_SNAPCTL2_SYNC 1" >>confdefs.h
+
+
+fi
+
+		LIBS="$SAVELIBS"
+
+else $as_nop
+
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 fi
@@ -11006,6 +11034,8 @@ fi
 
 fi
 
+fi
+
 
 ONDEMANDFLAGS=""
 ONDEMANDLIBS=""