Re: Add glib-2.0 and gobject-2.0 library dependency (issue 568820043 by address@hidden)

[pkxgnugitcl]

Reviewers: lemzwerg,


https://codereview.appspot.com/568820043/diff/550830043/config.make.in
File config.make.in (right):

https://codereview.appspot.com/568820043/diff/550830043/config.make.in#newcode34
config.make.in:34: CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(GLIB_LIBS)
$(GUILE_LIBS) $(PANGO_FT2_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS)
On 2019/06/16 19:38:50, lemzwerg wrote:
> Not really important, but I would prefer if we don't intentionally
introduce
> overlong lines...

Done.

Description:
Add glib-2.0 and gobject-2.0 library dependency

For a long time we relied
on pango/pangoft2 to pull
in the glib and gobject
libraries. That worked as
long as every distribution
used a pangoft2.pc file
that included both libs in
the 'Required:' line.

According to the pkg-config
documentation that was
definitely wrong, and the
problem was corrected on
opensuse tumbleweed
recently.

As a consequence building
lilypond failed with a
linker error as we use
symbols from both libs
directly in our c++ source
code.

Signed-off-by: Knut Petersen <address@hidden>

Please review this at https://codereview.appspot.com/568820043/

Affected files (+44, -2 lines):
  M aclocal.m4
  M config.make.in
  M configure.ac


Index: aclocal.m4
diff --git a/aclocal.m4 b/aclocal.m4
index  
aec7813fc01b2067191f32adfc2e6f06d74f0ae8..dc088ea3f988c2285782093979835b450fdf317f  
100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1337,6 +1337,44 @@ AC_DEFUN(PKG_CHECK_MODULES, [
     fi
 ])

+AC_DEFUN(STEPMAKE_GLIB, [
+    PKG_CHECK_MODULES(GLIB, $1 >= $3, have_glib=yes, true)
+    if test "$have_glib" = yes; then
+       AC_DEFINE(HAVE_GLIB)
+        save_CPPFLAGS="$CPPFLAGS"
+        save_LIBS="$LIBS"
+       CPPFLAGS="$GLIB_CFLAGS $CPPFLAGS"
+       LIBS="$GLIB_LIBS $LIBS"
+       AC_SUBST(GLIB_CFLAGS)
+       AC_SUBST(GLIB_LIBS)
+       CPPFLAGS="$save_CPPFLAGS"
+       LIBS="$save_LIBS"
+    else
+      r="libglib-dev or glib?-devel"
+      ver="`pkg-config --modversion $1`"
+      STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
+    fi
+])
+
+AC_DEFUN(STEPMAKE_GOBJECT, [
+    PKG_CHECK_MODULES(GOBJECT, $1 >= $3, have_gobject=yes, true)
+    if test "$have_gobject" = yes; then
+       AC_DEFINE(HAVE_GOBJECT)
+        save_CPPFLAGS="$CPPFLAGS"
+        save_LIBS="$LIBS"
+       CPPFLAGS="$GOBJECT_CFLAGS $CPPFLAGS"
+       LIBS="$GOBJECT_LIBS $LIBS"
+       AC_SUBST(GOBJECT_CFLAGS)
+       AC_SUBST(GOBJECT_LIBS)
+       CPPFLAGS="$save_CPPFLAGS"
+       LIBS="$save_LIBS"
+    else
+      r="libgobject-dev or gobject?-devel"
+      ver="`pkg-config --modversion $1`"
+      STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
+    fi
+])
+

 AC_DEFUN(STEPMAKE_FREETYPE2, [
     PKG_CHECK_MODULES(FREETYPE2, $1 >= $3, have_freetype2=yes, true)
Index: config.make.in
diff --git a/config.make.in b/config.make.in
index  
420600ae8e5327a676be2940362e457ba6b6c3ce..97cf5634cb16c216913287437314e4deefc58a4b  
100644
--- a/config.make.in
+++ b/config.make.in
@@ -15,11 +15,12 @@ FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
 GUILE_CFLAGS = @GUILE_CFLAGS@
 PANGO_FT2_CFLAGS = @PANGO_FT2_CFLAGS@
 PYTHON_CFLAGS = @PYTHON_CFLAGS@
+GLIB_CLFAGS = @GLIB_CFLAGS@ @GOBJECT_CFLAGS@

 CONFIG_CPPFLAGS = @CPPFLAGS@
 CONFIG_DEFINES = @DEFINES@

-CONFIG_CFLAGS = @CFLAGS@ $(GUILE_CFLAGS) $(FREETYPE2_CFLAGS)  
$(PANGO_FT2_CFLAGS)
+CONFIG_CFLAGS = @CFLAGS@ $(GLIB_CFLAGS) $(GUILE_CFLAGS)  
$(FREETYPE2_CFLAGS) $(PANGO_FT2_CFLAGS)
 CONFIG_CXXFLAGS = @CXXFLAGS@ $(GUILE_CFLAGS) $(FREETYPE2_CFLAGS)  
$(PANGO_FT2_CFLAGS)

 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -28,8 +29,9 @@ FREETYPE2_LIBS = @FREETYPE2_LIBS@
 PANGO_FT2_LIBS = @PANGO_FT2_LIBS@
 PYTHON_LIBS = @PYTHON_LDFLAGS@
 CXXABI_LIBS = @CXXABI_LIBS@
+GLIB_LIBS = @GLIB_LIBS@ @GOBJECT_LIBS@

-CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(GUILE_LIBS) $(PANGO_FT2_LIBS)  
$(FONTCONFIG_LIBS) $(FREETYPE2_LIBS)
+CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(GLIB_LIBS) $(GUILE_LIBS)  
$(PANGO_FT2_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS)
 CONFIG_LDFLAGS = @LDFLAGS@

 PACKAGE = @PACKAGE@
Index: configure.ac
diff --git a/configure.ac b/configure.ac
index  
f4121f43824dbbfcbcb01d64aafef23212ce74ca..ed796bb5126c5f41195237397edcb08e31703eca  
100644
--- a/configure.ac
+++ b/configure.ac
@@ -298,6 +298,8 @@ if test "$have_pangoft2_with_otf_feature" != yes ; then
 fi
 STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.4.0)
 STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10)
+STEPMAKE_GLIB(glib-2.0, REQUIRED, 2.44)
+STEPMAKE_GOBJECT(gobject-2.0, REQUIRED, 2.44)

 STEPMAKE_WINDOWS