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
50
51
52
53
54
55
|
From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Date: Wed, 7 Dec 2022 07:57:15 +0100
Subject: since sigc++-2.5.2,
the sigc++/object.h has been removed (and replaced by sigc++/trackable.h>
Last-Update: 2020-10-03
Forwarded: Jesse Chappell <jesse@essej.net>
---
configure.ac | 10 +++++++++-
libs/pbd/configure.ac | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index e2d8fb8..ef732df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,7 +228,15 @@ then
AC_SUBST(NCURSES_LIBS)
dnl sigc++
- PKG_CHECK_MODULES(SIGCPP, sigc++-2.0 >= 2.2.10)
+ have_sigcpp=no
+ PKG_CHECK_MODULES(SIGCPP, [sigc++-2.0 >= 2.2.10],[have_sigcpp=yes])
+ if test "x${have_sigcpp}" = "xyes"
+ then
+ presigcpp_CFLAGS=$CFLAGS
+ CFLAGS=$CFLAGS $SIGCPP_CFLAGS
+ AC_CHECK_HEADER([sigc++/object.h], [SIGCPP_CFLAGS="$SIGCPP_CFLAGS -DUSE_SIGCPP_OBJECT_H"])
+ CFLAGS=$presigcpp_CFLAGS
+ fi
AC_SUBST(SIGCPP_LIBS)
AC_SUBST(SIGCPP_CFLAGS)
diff --git a/libs/pbd/configure.ac b/libs/pbd/configure.ac
index e9a6943..63fdcdb 100644
--- a/libs/pbd/configure.ac
+++ b/libs/pbd/configure.ac
@@ -198,7 +198,15 @@ dnl PKG_CHECK_MODULES(ICU, icu-i18n, , [AC_MSG_WARN([ICU not found, no problem])
PKG_CHECK_MODULES(XML, libxml-2.0 >= 2.5)
dnl sigc++
-PKG_CHECK_MODULES(SIGCPP, sigc++-2.0 >= 2.2.10)
+have_sigcpp=no
+PKG_CHECK_MODULES(SIGCPP, [sigc++-2.0 >= 2.2.10],[have_sigcpp=yes])
+if test "x${have_sigcpp}" = "xyes"
+then
+ presigcpp_CFLAGS=$CFLAGS
+ CFLAGS=$CFLAGS $SIGCPP_CFLAGS
+ AC_CHECK_HEADER([sigc++/object.h], [SIGCPP_CFLAGS="$SIGCPP_CFLAGS -DUSE_SIGCPP_OBJECT_H"])
+ CFLAGS=$presigcpp_CFLAGS
+fi
AM_BUILD_ENVIRONMENT
|
