1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
Description: Fix FTBFS caused by xml2-config removal
Remove GIT_DEF
Suppress format-truncation warnings (tidy up build log)
Author: Peter Blackman <peter@pblackman.plus.com>
Bug-Debian: https://bugs.debian.org/949143
Last-Update: 2021-12-16
Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -70,13 +70,11 @@
if test "${enable_pthread}" = "yes" ; then
AC_CHECK_LIB([pthread],[pthread_create],,[AC_MSG_WARN([Pthread library not found - threads disabled.])])
fi
+
AC_CHECK_LIB([jpeg],[jpeg_start_compress],,[AC_MSG_ERROR([The jpeg library is required.])])
-AC_PATH_PROG(XML2_CONFIG,xml2-config, no, $PATH:/bin:/usr/bin:/usr/local/bin)
-if test "$XML2_CONFIG" != "no"
-then
- CPPFLAGS="`$XML2_CONFIG --cflags` $CPPFLAGS"
-fi
+PKG_CHECK_MODULES(XML, libxml-2.0)
+#CPPFLAGS+=" -I${includedir}/libxml2"
AC_OUTPUT([
Makefile
Index: b/Makefile.am
===================================================================
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
AUTOMAKE_OPTIONS = foreign no-dependencies
-GIT_DEF = -D'GIT_REV="$(shell git describe --tags --dirty)"'
-AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(GIT_DEF)
+AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" -Wno-format-truncation
ACLOCAL_AMFLAGS = -I m4
@@ -35,3 +34,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = flam3.pc
+
+CPPFLAGS += $(XML_CFLAGS)
+LDFLAGS += $(XML_LIBS)
+
|
