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
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
|
--- a/configure.in
+++ b/configure.in
@@ -24,24 +24,6 @@
MYRUNPATH=""
MYPOSTCMD="true"
-# Building paths
-pathtmp="$PATH"
-PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-CPATH="$HOME/include:/usr/local/include:$CPATH"
-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-if type pkg-config > /dev/null 2>&1
-then
- PATH="$PATH:`pkg-config --variable=bindir qdbm`"
- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-fi
-
#================================================================
@@ -60,7 +42,6 @@
then
MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g"
MYDEFS=""
- MYLDOPTS="-static"
enables="$enables (debug)"
stable="yes"
fi
@@ -187,19 +169,20 @@
fi
# Underlying libraries
+PKG_PROG_PKG_CONFIG
AC_CHECK_LIB(c, main)
AC_CHECK_LIB(m, main)
AC_CHECK_LIB(regex, main)
AC_CHECK_LIB(iconv, main)
-if test "$enable_zlib" != "no" || pkg-config --libs qdbm 2>&1 | grep '\-lz' > /dev/null 2>&1
+if test "$enable_zlib" != "no" || $PKG_CONFIG --libs qdbm 2>&1 | grep '\-lz' > /dev/null 2>&1
then
AC_CHECK_LIB(z, main)
fi
-if test "$enable_lzo" = "yes" || pkg-config --libs qdbm 2>&1 | grep '\-llzo2' > /dev/null 2>&1
+if test "$enable_lzo" = "yes" || $PKG_CONFIG --libs qdbm 2>&1 | grep '\-llzo2' > /dev/null 2>&1
then
AC_CHECK_LIB(lzo2, main)
fi
-if test "$enable_bzip" = "yes" || pkg-config --libs qdbm 2>&1 | grep '\-lbz2' > /dev/null 2>&1
+if test "$enable_bzip" = "yes" || $PKG_CONFIG --libs qdbm 2>&1 | grep '\-lbz2' > /dev/null 2>&1
then
AC_CHECK_LIB(bz2, main)
fi
@@ -227,15 +210,15 @@
fi
# Checking the version of QDBM with pkg-config
-if type pkg-config > /dev/null 2>&1
+if true
then
printf 'checking the version of QDBM ... '
- if pkg-config --atleast-version=1.8.75 qdbm
+ if $PKG_CONFIG --atleast-version=1.8.75 qdbm
then
- printf 'ok (%s)\n' `pkg-config --modversion qdbm`
- MYCPPOPTS="$MYCPPOPTS -I`pkg-config --variable=includedir qdbm`"
- MYLDOPTS="$MYLDOPTS -L`pkg-config --variable=libdir qdbm`"
- MYRUNPATH="$MYRUNPATH:`pkg-config --variable=libdir qdbm`"
+ printf 'ok (%s)\n' `$PKG_CONFIG --modversion qdbm`
+ MYCPPOPTS="$MYCPPOPTS -I`$PKG_CONFIG --variable=includedir qdbm`"
+ MYLDOPTS="$MYLDOPTS -L`$PKG_CONFIG --variable=libdir qdbm`"
+ MYRUNPATH="$MYRUNPATH:`$PKG_CONFIG --variable=libdir qdbm`"
else
printf 'no (maybe not installed or too old)\n'
fi
--- a/javanative/configure.in
+++ b/javanative/configure.in
@@ -27,28 +27,6 @@
MYSKLIBS=""
MYRUNPATH=""
-# Building paths
-pathtmp="$PATH"
-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-if type pkg-config > /dev/null 2>&1
-then
- PATH="$PATH:`pkg-config --variable=bindir qdbm`"
- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-fi
-
#================================================================
@@ -158,7 +136,7 @@
AC_CHECK_LIB(lzo2, main)
AC_CHECK_LIB(bz2, main)
AC_CHECK_LIB(qdbm, main)
-AC_CHECK_LIB(estraier, main)
+LIBS="$LIBS -lestraier"
# For libraries of pthreads
AC_CHECK_LIB(pthread, main, MYMTLIBS="-lpthread $MYMTLIBS",
@@ -170,11 +148,12 @@
AC_CHECK_LIB(resolv, main, MYSKLIBS="-lresolv $MYSKLIBS")
# Checking the version of QDBM with pkg-config
-if type pkg-config > /dev/null 2>&1 && pkg-config --atleast-version=1.0.0 qdbm
+PKG_PROG_PKG_CONFIG
+if $PKG_CONFIG --atleast-version=1.0.0 qdbm
then
- MYCPPOPTS="$MYCPPOPTS -I`pkg-config --variable=includedir qdbm`"
- MYLDOPTS="$MYLDOPTS -L`pkg-config --variable=libdir qdbm`"
- MYRUNPATH="$MYRUNPATH:`pkg-config --variable=libdir qdbm`"
+ MYCPPOPTS="$MYCPPOPTS -I`$PKG_CONFIG --variable=includedir qdbm`"
+ MYLDOPTS="$MYLDOPTS -L`$PKG_CONFIG --variable=libdir qdbm`"
+ MYRUNPATH="$MYRUNPATH:`$PKG_CONFIG --variable=libdir qdbm`"
fi
--- a/javapure/configure.in
+++ b/javapure/configure.in
@@ -21,28 +21,6 @@
JAVADOC="javadoc"
JAVARUN="java"
-# Building paths
-pathtmp="$PATH"
-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-if type pkg-config > /dev/null 2>&1
-then
- PATH="$PATH:`pkg-config --variable=bindir qdbm`"
- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-fi
-
#================================================================
--- a/perlnative/configure.in
+++ b/perlnative/configure.in
@@ -17,28 +17,6 @@
MYPLLIBDIR=/usr/lib/perl5/site_perl
MYRUNPATH=""
-# Building paths
-pathtmp="$PATH"
-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-if type pkg-config > /dev/null 2>&1
-then
- PATH="$PATH:`pkg-config --variable=bindir qdbm`"
- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-fi
-
# Setting the default prefix
if test "$prefix" = NONE
then
@@ -100,12 +78,13 @@
AC_CHECK_LIB(lzo2, main)
AC_CHECK_LIB(bz2, main)
AC_CHECK_LIB(qdbm, main)
-AC_CHECK_LIB(estraier, main)
+LIBS="$LIBS -lestraier"
# Checking the version of QDBM with pkg-config
-if type pkg-config > /dev/null 2>&1 && pkg-config --atleast-version=1.0.0 qdbm
+PKG_PROG_PKG_CONFIG
+if $PKG_CONFIG --atleast-version=1.0.0 qdbm
then
- MYRUNPATH="$MYRUNPATH:`pkg-config --variable=libdir qdbm`"
+ MYRUNPATH="$MYRUNPATH:`$PKG_CONFIG --variable=libdir qdbm`"
fi
--- a/rubynative/configure.in
+++ b/rubynative/configure.in
@@ -16,28 +16,6 @@
MYRBLIBDIR=/usr/local/lib/ruby/site_ruby
MYRUNPATH=""
-# Building paths
-pathtmp="$PATH"
-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-if type pkg-config > /dev/null 2>&1
-then
- PATH="$PATH:`pkg-config --variable=bindir qdbm`"
- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-fi
-
# Setting the default prefix
if test "$prefix" = NONE
then
@@ -74,10 +52,11 @@
MYRBLIBDIR="$myrblibdir"
fi
-# Checking the version of QDBM with pkg-config
-if type pkg-config > /dev/null 2>&1 && pkg-config --atleast-version=1.0.0 qdbm
+# Checking the version of QDBM with $PKG_CONFIG
+PKG_PROG_PKG_CONFIG
+if $PKG_CONFIG --atleast-version=1.0.0 qdbm
then
- MYRUNPATH="$MYRUNPATH:`pkg-config --variable=libdir qdbm`"
+ MYRUNPATH="$MYRUNPATH:`$PKG_CONFIG --variable=libdir qdbm`"
fi
--- a/rubypure/configure.in
+++ b/rubypure/configure.in
@@ -15,28 +15,6 @@
RDOC="rdoc"
MYRBLIBDIR=/usr/local/lib/ruby/site_ruby
-# Building paths
-pathtmp="$PATH"
-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-if type pkg-config > /dev/null 2>&1
-then
- PATH="$PATH:`pkg-config --variable=bindir qdbm`"
- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-fi
-
# Setting the default prefix
if test "$prefix" = NONE
then
|
GitWeb