Merge lp:~heirecka/inkscape/use-pkg_prog_pkg_config into lp:~inkscape.dev/inkscape/trunk

[Heiko Becker]

It has the advantage that it respects the PKG_CONF environment variable which comes in handy when you're using a prefixed pkg-config (e.g arch-prefix) executable.

Successfully built inkscape with a x86_64-pc-linux-gnu-pkg-config exectuable.

[Krzysztof Kosinski (tweenk)]

Looks okay, but I would welcome some information about the required version of Autoconf / pkg-config and how old they are.

review: Approve

[Heiko Becker (heirecka)]

> Looks okay, but I would welcome some information about the required version of
> Autoconf / pkg-config and how old they are.

It was first introduced in 2005 (http://cgit.freedesktop.org/pkg-config/commit/pkg.m4?id=b1584b5aaf9ce396e61599caff2b5e15f01daf91). So the autoconf version shouldn't really matter, but I could not find anything specific. The macro itself checks for a pkg-config version of 0.9.0. which seems to be released in 2003.

[jazzynico (jazzynico)]

Tested successfully with gtkspell-2 on Xubuntu 15.10, Inkscape trunk rev. 14674.

Unfortunately, it doesn't work with gtkspell-3 (--enable-gtk3-experimental configure option) due to an incorrect package name (gtkspell-3.0 doesn't exist). To fix it, I had to use the following code:

if pkg-config --exists gtkspell3-3.0; then
 ink_spell_pkg=gtkspell3-3.0

I have just checked with other Gnu/Linux distros, and it seems the gtkspell3-3.0 package name is consistent.

review: Needs Fixing

Unmerged revisions

14042. By Heiko Becker on 2015-04-02

configure: Use PKG_PROG_PKG_CONFIG macro

It has the advantage that it respects the PKG_CONF environment
variable which comes in handy when you're using a prefixed pkg-config
(e.g arch-prefix) executable.

=== modified file 'configure.ac'
--- configure.ac	2015-02-12 12:09:59 +0000
+++ configure.ac	2015-04-02 23:42:42 +0000
@@ -220,10 +220,7 @@
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Translation domain used])
 
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$PKG_CONFIG" = "xno"; then
-	AC_MSG_ERROR(You have to install pkg-config to compile inkscape.)
-fi
+PKG_PROG_PKG_CONFIG
 
 dnl Find msgfmt.  Without this, po/Makefile fails to set MSGFMT on some platforms.
 AC_PATH_PROG(MSGFMT, msgfmt, msgfmt)
@@ -723,7 +720,7 @@
 if test "x$enable_gtk3" = "xyes"; then
 
 	ink_spell_pkg=
-	if pkg-config --exists gtkspell-3.0; then
+	if $PKG_CONFIG --exists gtkspell-3.0; then
 		ink_spell_pkg=gtkspell-3.0
 		AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
 	fi
@@ -800,7 +797,7 @@
 else
 
 	ink_spell_pkg=
-	if pkg-config --exists gtkspell-2.0; then
+	if $PKG_CONFIG --exists gtkspell-2.0; then
 		ink_spell_pkg=gtkspell-2.0
 		AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
 	fi