diff options
| author | Victor Kareh <[email protected]> | 2026-01-26 15:15:05 -0500 |
|---|---|---|
| committer | Victor Kareh <[email protected]> | 2026-01-26 16:50:04 -0500 |
| commit | f7f056b21b3aec5b6e80d2eaeb34726377c7bba3 (patch) | |
| tree | d250459939737c189728b96bc2e74c5db5d353b6 | |
| parent | 3d238ef2c45fe50eb835076163a42d76d8895168 (diff) | |
| download | eom-f7f056b21b3aec5b6e80d2eaeb34726377c7bba3.tar.bz2 eom-f7f056b21b3aec5b6e80d2eaeb34726377c7bba3.tar.xz | |
configure: Only use girepository-2.0 if libpeas uses it too
Fixes header conflicts on systems where glib has girepository-2.0 but
libpeas still uses the old gobject-introspection-1.0 headers.
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index f3d0316..fb5b4be 100644 --- a/configure.ac +++ b/configure.ac @@ -118,9 +118,16 @@ if test "$found_introspection" = "yes"; then AC_DEFINE([HAVE_INTROSPECTION], [1], [Define to enable GObject Introspection]) # Check for girepository-2.0 API (moved to glib in version 1.80+) - PKG_CHECK_EXISTS([girepository-2.0], - [AC_DEFINE([HAVE_GIREPOSITORY_2], [1], [Using girepository-2.0 API])], - []) + # We can only use girepository-2.0 if libpeas also uses it, otherwise we get conflicts + PKG_CHECK_EXISTS([girepository-2.0], [ + # Check if libpeas requires girepository-2.0 + if pkg-config --print-requires libpeas-1.0 | grep -q "girepository-2.0"; then + AC_DEFINE([HAVE_GIREPOSITORY_2], [1], [Using girepository-2.0 API]) + have_girepository_2=yes + else + have_girepository_2=no + fi + ], [have_girepository_2=no]) else have_introspection=no fi @@ -434,6 +441,7 @@ Configure summary: RSVG support ...............: ${have_rsvg} Colour management support ..: ${have_lcms} GObject Introspection.......: ${have_introspection} + GIRepository 2.0............: ${have_girepository_2:-no} Native Language support.....: ${USE_NLS} Thumbnailer.................: ${eom_thumbnailer} " |