[libredwg] avoiding pkg-config

[Thien-Thi Nguyen]

Good news: Hydra now is able to build the tarball, and to
successfully "make" for various platforms:

 http://hydra.nixos.org/jobset/gnu/libredwg-master

The failures now come from "make check", which invokes
pkg-config(1) to compute the flags to build program
testsuite/xmlsuite/testsuite (from the corresponding .c) file.

There are two reasonable solutions, i think: (a) make Hydra
aware of pkg-config; (b) avoid pkg-config altogether.  IMHO (b)
is cleaner, since we can get the same information from program
xml2-config(1), which is normally part of package libxml2-dev
(on Debian, that is, YMMV), along w/ the library's headers.
In sum, pkg-config is overkill; we don't need it.

So, please find attached here:

 configure.ac                   | 4 ++++
 testsuite/xmlsuite/Makefile.am | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 22e7e7e..6ca2063 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,10 @@ AC_SUBST(ISODATE)
 AC_CANONICAL_HOST

 dnl Checks for programs.
+AC_CHECK_TOOL([XML2CFG],[xml2-config],[:])
+AS_IF([test x"$XML2CFG" = x:],
+[AC_MSG_ERROR([Install libxml2-dev first (or whatever it takes
+to provide the command 'xml2-config')])])
 AC_PROG_CC
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
diff --git a/testsuite/xmlsuite/Makefile.am b/testsuite/xmlsuite/Makefile.am
index 6c82cbf..4f3f56d 100644
--- a/testsuite/xmlsuite/Makefile.am
+++ b/testsuite/xmlsuite/Makefile.am
@@ -1,6 +1,6 @@

-LIBXML = `pkg-config libxml-2.0 --cflags`
-AM_CFLAGS = $(LIBXML) -g -lredwg -lm -lxml2
+AM_CPPFLAGS = `$(XML2CFG) --cflags`
+AM_CFLAGS = -g -lredwg -lm -lxml2

 check_PROGRAMS = testsuite
 TESTS = check.py

a patch to make the configure script require xml2-config(1)
and the testsuite/xmlsuite/ makefiles use it.  I took the
opportunity to use the "correct" Makefile.am var (AM_CPPFLAGS),
as well.

Any objections to installing it?  (I don't want to seem pushy,
and would be delighted to hear from the more active hackers.)

-- 
Thien-Thi Nguyen
   GPG key: 4C807502
   (if you're human and you know it)
      read my lisp: (responsep (questions 'technical)
                               (not (via 'mailing-list)))
                     => nil

signature.asc
Description: PGP signature