blob: 535dfda0398094f22a81efac4462f370791307a9 (
plain)
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
124
125
126
127
128
129
130
131
132
|
diff --git a/Project/GNU/CLI/configure.ac b/Project/GNU/CLI/configure.ac
index 959868f..517ebd5 100644
--- a/Project/GNU/CLI/configure.ac
+++ b/Project/GNU/CLI/configure.ac
@@ -65,16 +65,10 @@ dnl #########################################################################
dnl -------------------------------------------------------------------------
dnl Unicode
dnl
-if test -e ../../../../ZenLib/Project/GNU/Library/libzen-config; then
- enable_unicode="$(../../../../ZenLib/Project/GNU/Library/libzen-config Unicode)"
-elif test "$(libzen-config Exists)" = "yes" ; then
- enable_unicode="$(libzen-config Unicode)"
+if pkg-config --exists libzen; then
+ enable_unicode="$(pkg-config --variable=Unicode libzen)"
else
- if pkg-config --exists libzen; then
- enable_unicode="$(pkg-config --variable=Unicode libzen)"
- else
- AC_MSG_ERROR([libzen configuration is not found])
- fi
+ AC_MSG_ERROR([libzen package is not found])
fi
dnl #########################################################################
@@ -197,40 +191,18 @@ fi
dnl -------------------------------------------------------------------------
dnl ZenLib
dnl
-if test -e ../../../../ZenLib/Project/GNU/Library/libzen.la; then
- CXXFLAGS="$CXXFLAGS $(../../../../ZenLib/Project/GNU/Library/libzen-config CXXFLAGS)"
- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(../../../../ZenLib/Project/GNU/Library/libzen-config CXXFLAGS)"
- if test "$enable_staticlibs" = "yes"; then
- with_zenlib="builtin (static)"
- LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS_Static)"
- else
- with_zenlib="builtin"
- LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS)"
- fi
-elif test "$(libzen-config Exists)" = "yes" ; then
- CXXFLAGS="$CXXFLAGS $(libzen-config CXXFLAGS)"
- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(libzen-config CXXFLAGS)"
+if pkg-config --exists libzen; then
+ CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
+ MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)"
if test "$enable_staticlibs" = "yes"; then
with_zenlib="system (static)"
- LIBS="$LIBS $(libzen-config LIBS_Static)"
+ LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)"
else
with_zenlib="system"
- LIBS="$LIBS $(libzen-config LIBS)"
+ LIBS="$LIBS $(pkg-config --libs libzen)"
fi
else
- if pkg-config --exists libzen; then
- CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)"
- if test "$enable_staticlibs" = "yes"; then
- with_zenlib="system (static)"
- LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)"
- else
- with_zenlib="system"
- LIBS="$LIBS $(pkg-config --libs libzen)"
- fi
- else
- AC_MSG_ERROR([libzen configuration is not found])
- fi
+ AC_MSG_ERROR([libzen package is not found])
fi
dnl #########################################################################
diff --git a/Project/GNU/GUI/configure.ac b/Project/GNU/GUI/configure.ac
index 3402da7..67102d8 100644
--- a/Project/GNU/GUI/configure.ac
+++ b/Project/GNU/GUI/configure.ac
@@ -79,14 +79,10 @@ dnl #########################################################################
dnl -------------------------------------------------------------------------
dnl Unicode
dnl
-if test -e ../../../../ZenLib/Project/GNU/Library/libzen-config; then
- enable_unicode="$(../../../../ZenLib/Project/GNU/Library/libzen-config Unicode)"
+if pkg-config --exists libzen; then
+ enable_unicode="$(pkg-config --variable=Unicode libzen)"
else
- if pkg-config --exists libzen; then
- enable_unicode="$(pkg-config --variable=Unicode libzen)"
- else
- AC_MSG_ERROR([libzen configuration is not found])
- fi
+ AC_MSG_ERROR([libzen package is not found])
fi
dnl #########################################################################
@@ -312,30 +308,18 @@ fi
dnl -------------------------------------------------------------------------
dnl ZenLib
dnl
-if test -e ../../../../ZenLib/Project/GNU/Library/libzen.la; then
- CXXFLAGS="$CXXFLAGS $(../../../../ZenLib/Project/GNU/Library/libzen-config CXXFLAGS)"
- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(../../../../ZenLib/Project/GNU/Library/libzen-config CXXFLAGS)"
+if pkg-config --exists libzen; then
+ CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
+ MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)"
if test "$enable_staticlibs" = "yes"; then
- with_zenlib="builtin (static)"
- LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS_Static)"
+ with_zenlib="system (static)"
+ LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)"
else
- with_zenlib="builtin"
- LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS)"
+ with_zenlib="system"
+ LIBS="$LIBS $(pkg-config --libs libzen)"
fi
else
- if pkg-config --exists libzen; then
- CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)"
- if test "$enable_staticlibs" = "yes"; then
- with_zenlib="system (static)"
- LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)"
- else
- with_zenlib="system"
- LIBS="$LIBS $(pkg-config --libs libzen)"
- fi
- else
- AC_MSG_ERROR([libzen configuration is not found])
- fi
+ AC_MSG_ERROR([libzen package is not found])
fi
dnl #########################################################################
|
