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
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
Submitted upstream: https://github.com/autotrace/autotrace/pull/128
diff --git a/Makefile.am b/Makefile.am
index ea6eadd..cd9de37 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,7 +127,18 @@ autotraceinclude_HEADERS=\
src/exception.h \
src/color.h
-libautotrace_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libautotrace_la_LDFLAGS = \
+ -version-info \
+ $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ $(GRAPHICSMAGICK_LIBS) \
+ $(IMAGEMAGICK_LIBS) \
+ $(LIBPNG_LIBS) \
+ $(LIBSWF_LIBS) \
+ $(LIBPSTOEDIT_LIBS) \
+ $(GLIB2_LIBS) \
+ $(POPT_LIBS) \
+ $(INTLLIBS) \
+ -lm
#
# noinst_HEADERS: headers shared between lib and bin.
@@ -143,17 +154,7 @@ autotrace_SOURCES=\
AM_CPPFLAGS = $(GRAPHICSMAGICK_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(LIBPSTOEDIT_CFLAGS) $(LIBSWF_CFLAGS) $(GLIB2_CFLAGS) -DLOCALEDIR=\""$(datadir)/locale"\"
-autotrace_LDADD = \
- libautotrace.la \
- $(GRAPHICSMAGICK_LIBS) \
- $(IMAGEMAGICK_LIBS) \
- $(LIBPNG_LIBS) \
- $(LIBSWF_LIBS) \
- $(LIBPSTOEDIT_LIBS) \
- $(GLIB2_LIBS) \
- $(POPT_LIBS) \
- $(INTLLIBS) \
- -lm
+autotrace_LDADD = libautotrace.la
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA= autotrace.pc
diff --git a/autotrace.pc.in b/autotrace.pc.in
index 4c2e581..c70808e 100644
--- a/autotrace.pc.in
+++ b/autotrace.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: Autotrace
Description: a utility that converts bitmap to vector graphics
Version: @VERSION@
-Requires:
-Libs: -L@libdir@ -lautotrace @LIBPNG_LIBS@ @MAGICK_LIBS@ @LIBSWF_LIBS@ @LIBPSTOEDIT_LIBS@ @GLIB2_LIBS@
-Cflags: -I@includedir@ @MAGICK_CFLAGS@ @LIBPSTOEDIT_CFLAGS@ @GLIB2_CFLAGS@
+Requires.private: glib-2.0 >= 2.0 gmodule-2.0 >= 2.0 gthread-2.0 >= 2.0 gobject-2.0 >= 2.0 @REQUIRES_PRIVATE@
+Libs: -L@libdir@ -lautotrace
+Cflags: -I@includedir@
diff --git a/configure.ac b/configure.ac
index 43b6fea..e6cf262 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,8 @@ else
if test "x${with_magick}" = xGraphicsMagick; then
PKG_CHECK_MODULES([GRAPHICSMAGICK],
[GraphicsMagick >= 1.3.40],
- [HAVE_MAGICK=yes
+ [REQUIRES_PRIVATE="${REQUIRES_PRIVATE}GraphicsMagick >= 1.3.40 "
+ HAVE_MAGICK=yes
HAVE_GRAPHICSMAGICK=yes
MAGICK_LIBRARY=GraphicsMagick
AC_DEFINE(HAVE_GRAPHICSMAGICK, 1, [GraphicsMagick library is available.])
@@ -97,13 +98,15 @@ else
if test "x${with_magick}" = xImageMagick; then
PKG_CHECK_MODULES([IMAGEMAGICK7],
[ImageMagick >= 7.0.1],
- [HAVE_IMAGEMAGICK7=yes
+ [REQUIRES_PRIVATE="${REQUIRES_PRIVATE}ImageMagick >= 7.0.1 "
+ HAVE_IMAGEMAGICK7=yes
AC_DEFINE(HAVE_IMAGEMAGICK7, 1, [ImageMagick version 7 or higher is available.])
],[]
)
PKG_CHECK_MODULES([IMAGEMAGICK],
[ImageMagick >= 5.2.1],
- [HAVE_MAGICK=yes
+ [REQUIRES_PRIVATE="${REQUIRES_PRIVATE}ImageMagick >= 5.2.1 "
+ HAVE_MAGICK=yes
HAVE_IMAGEMAGICK=yes
MAGICK_LIBRARY=ImageMagick
AC_DEFINE(HAVE_IMAGEMAGICK, 1, [ImageMagick library is available.])
@@ -140,6 +143,7 @@ HAVE_LIBPNG=no
if test "x${with_png}" = xyes; then
PKG_CHECK_MODULES([LIBPNG],[libpng],
[
+ REQUIRES_PRIVATE="${REQUIRES_PRIVATE}libpng "
HAVE_LIBPNG=yes
AC_DEFINE(HAVE_LIBPNG,1,[PNG library is available or not])
],
@@ -165,6 +169,7 @@ if test "${swf_header_found}" = yes ; then
PKG_CHECK_MODULES([LIBSWF],
[libming],
[
+ REQUIRES_PRIVATE="${REQUIRES_PRIVATE}libming "
HAVE_LIBSWF=yes
AC_DEFINE(HAVE_LIBSWF,1,[SWF library is available or not])
],
@@ -187,6 +192,7 @@ if test "x${with_pstoedit}" = xyes; then
PKG_CHECK_MODULES([LIBPSTOEDIT],
[pstoedit >= 3.32.0],
[
+ REQUIRES_PRIVATE="${REQUIRES_PRIVATE}pstoedit >= 3.32.0 "
HAVE_LIBPSTOEDIT=yes
AC_DEFINE(HAVE_LIBPSTOEDIT,1,[pstoedit library is available or not])
],
@@ -210,6 +216,7 @@ fi
dnl po/Makefile.in FIXME FIXME FIXME
AC_CONFIG_FILES([po/Makefile.in Makefile autotrace.pc])
+AC_SUBST([REQUIRES_PRIVATE])
AC_OUTPUT
echo "
|
