aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcontrib/scripts/gnunet-bugreport287
1 files changed, 127 insertions, 160 deletions
diff --git a/contrib/scripts/gnunet-bugreport b/contrib/scripts/gnunet-bugreport
index 724c38e06..aaba45252 100755
--- a/contrib/scripts/gnunet-bugreport
+++ b/contrib/scripts/gnunet-bugreport
@@ -1,4 +1,10 @@
1#!/bin/sh 1#!/usr/bin/env sh
2
3# Caveats:
4# - checks with textprocessing assuming that system language is English.
5# - maybe check last return status instead?
6# - Do we need to set awk to which awk becomes available or is awk
7# always available as just awk?
2 8
3progname=${0##*/} 9progname=${0##*/}
4 10
@@ -27,13 +33,15 @@ linemsg()
27 statusmsg "=========================================" 33 statusmsg "========================================="
28} 34}
29 35
30# It is okay to assume which(1) here because we provide 36errmsg=''
31# more than 1 fallback. 37
32TEST=`type type|grep not` 38# Check if shell support builtin 'type'.
33if test -n "$TEST"; then 39if test -z "$errmsg"; then
34 WHICH=which 40 if ! (eval 'type type') >/dev/null 2>&1
35else 41 then
36 WHICH=type 42 errmsg='Shell does not support type builtin'
43 exit 1
44 fi
37fi 45fi
38 46
39os_check() 47os_check()
@@ -50,17 +58,17 @@ os_check()
50# awk isn't there it can't be found. 58# awk isn't there it can't be found.
51awk_check() 59awk_check()
52{ 60{
53 if test -n "`awk 2>&1 | tail -1 | awk '{print $1}'`"; then 61 if test -z "`type awk 2>&1 | awk '/not found/'`"; then
54 infomsg "awk : Found" 62 infomsg "awk : Found"
55 else 63 else
56 warningmsg "awk : Not found!" 64 warningmsg "awk : Not found!"
65 exit 1
57 fi 66 fi
58} 67}
59 68
60gcc_check() 69gcc_check()
61{ 70{
62 TEST=`$WHICH gcc | grep -v "not found" 2>/dev/null` 71 if test -z "`type gcc | awk '/not found/' 2>/dev/null`"; then
63 if test -n "$TEST"; then
64 VERS=`gcc --version 2>/dev/null | head -n 1` 72 VERS=`gcc --version 2>/dev/null | head -n 1`
65 infomsg "gcc : $VERS" 73 infomsg "gcc : $VERS"
66 elif test -n "`gcc 2>&1 | tail -1 | awk '{print $1}'`"; then 74 elif test -n "`gcc 2>&1 | tail -1 | awk '{print $1}'`"; then
@@ -73,8 +81,7 @@ gcc_check()
73 81
74cc_check() 82cc_check()
75{ 83{
76 TEST=`$WHICH cc | grep -v "not found" 2>/dev/null` 84 if test -z "`type cc | awk '/not found/' 2>/dev/null`"; then
77 if test -n "$TEST"; then
78 VERS=`cc --version 2>/dev/null | head -n 1` 85 VERS=`cc --version 2>/dev/null | head -n 1`
79 infomsg "cc : $VERS" 86 infomsg "cc : $VERS"
80 else 87 else
@@ -84,8 +91,7 @@ cc_check()
84 91
85cplusplus_check() 92cplusplus_check()
86{ 93{
87 TEST=`$WHICH c++ | grep -v "not found" 2>/dev/null` 94 if test -z "`type c++ | awk '/not found/' 2>/dev/null`"; then
88 if test -n "$TEST"; then
89 VERS=`c++ --version 2>/dev/null | head -n 1` 95 VERS=`c++ --version 2>/dev/null | head -n 1`
90 infomsg "c++ : $VERS" 96 infomsg "c++ : $VERS"
91 else 97 else
@@ -95,8 +101,8 @@ cplusplus_check()
95 101
96clang_check() 102clang_check()
97{ 103{
98 TEST=`$WHICH clang | grep -v "not found" 2>/dev/null` 104 TEST=`type clang | awk '/not found/' 2>/dev/null`
99 if test -n "$TEST"; then 105 if test -z "$TEST"; then
100 VERS=`clang --version 2>/dev/null | head -n 1` 106 VERS=`clang --version 2>/dev/null | head -n 1`
101 infomsg "clang : $VERS" 107 infomsg "clang : $VERS"
102 elif test -n "`clang 2>&1 | tail -1 | awk '{print $1}'`"; then 108 elif test -n "`clang 2>&1 | tail -1 | awk '{print $1}'`"; then
@@ -109,7 +115,7 @@ clang_check()
109 115
110clangplusplus_check() 116clangplusplus_check()
111{ 117{
112 TEST=`$WHICH clang++ | grep -v "not found" 2>/dev/null` 118 TEST=`type clang++ | awk '/not found/' 2>/dev/null`
113 if test -n "$TEST"; then 119 if test -n "$TEST"; then
114 VERS=`clang++ --version 2>/dev/null | head -n 1` 120 VERS=`clang++ --version 2>/dev/null | head -n 1`
115 infomsg "clang++ : $VERS" 121 infomsg "clang++ : $VERS"
@@ -123,35 +129,41 @@ clangplusplus_check()
123 129
124gmake_check() 130gmake_check()
125{ 131{
126 TEST=`$WHICH gmake | grep -v "not found" 2>/dev/null` 132 TEST=`type gmake | awk '/not found/' 2>/dev/null`
127 if test -n "$TEST" ; then 133 if test -z "$TEST" ; then
128 VER=$(gmake --version 2>/dev/null | awk '/GNU Make/ {print $3}') 134 VER=$(gmake --version 2>/dev/null | awk '/GNU Make/ {print $3}')
129 infomsg "gmake : $VER" 135 infomsg "gmake : $VER"
130 else 136 else
131 TEST=`make --version 2>/dev/null` 137 TEST=`make --version 2>/dev/null`
132 if test -n "$TEST"; then 138 if test -n "$TEST"; then
133 VER=$(make --version 2>/dev/null | awk '/GNU Make/ {print $3}') 139 VER=$(make --version 2>/dev/null | awk '/GNU Make/ {print $3}')
134 infomsg "gmake : $VER" 140 infomsg "gmake : $VER"
135 else 141 else
136 warningmsg "gmake : Not Found" 142 warningmsg "gmake : Not Found"
137 fi 143 fi
138 fi 144 fi
139} 145}
140 146
141# Applies for NetBSD make and possibly every make. 147# Applies at least for NetBSD make. This test is a little awkward,
148# we should probably grep the output of 'make -dA'. nbmake identifies,
149# NetBSD make from NetBSD (nbmake is portable, external) does not identify.
142make_check() 150make_check()
143{ 151{
144 if test -n "`make 2>/dev/null`"; then 152 TEST=`type make | awk '/not found/' 2>/dev/null`
145 infomsg "make : Found" 153 if test -z "$TEST"; then
146 else 154 VER=$(make --version 2>/dev/null | awk '// {print $0}')
147 warningmsg "make : Not Found" 155 if test -z "$VER"; then
156 infomsg "make : Found"
157 else
158 warningmsg "make : Not Found (unexpected result)"
159 fi
148 fi 160 fi
149} 161}
150 162
151autoconf_check() 163autoconf_check()
152{ 164{
153 TEST=`$WHICH autoconf | grep -v "not found" 2>/dev/null` 165 TEST=`type autoconf | awk '/not found/' 2>/dev/null`
154 if test -n "$TEST"; then 166 if test -z "$TEST"; then
155 autoconf --version |\ 167 autoconf --version |\
156 head -n 1 |\ 168 head -n 1 |\
157 awk '{\ 169 awk '{\
@@ -167,8 +179,8 @@ autoconf_check()
167 179
168automake_check() 180automake_check()
169{ 181{
170 TEST=`$WHICH automake | grep -v "not found" 2>/dev/null` 182 TEST=`type automake | awk '/not found/' 2>/dev/null`
171 if test -n "$TEST"; then 183 if test -z "$TEST"; then
172 VER=`automake --version 2>/dev/null | head -n 1 | awk '{print $4}'` 184 VER=`automake --version 2>/dev/null | head -n 1 | awk '{print $4}'`
173 infomsg "automake : $VER" 185 infomsg "automake : $VER"
174 else 186 else
@@ -179,8 +191,8 @@ automake_check()
179# TODO: More libtool variants. 191# TODO: More libtool variants.
180libtool_check() 192libtool_check()
181{ 193{
182 TEST=`$WHICH libtoolize | grep -v "not found" 2>/dev/null` 194 TEST=`type libtoolize | awk '/not found/' 2>/dev/null`
183 if test -n "$TEST"; then 195 if test -z "$TEST"; then
184 VER=`libtoolize --version 2>/dev/null | head -n 1 | awk '{print $4}'` 196 VER=`libtoolize --version 2>/dev/null | head -n 1 | awk '{print $4}'`
185 infomsg "libtool : $VER" 197 infomsg "libtool : $VER"
186 else 198 else
@@ -190,8 +202,8 @@ libtool_check()
190 202
191libextractor_check() 203libextractor_check()
192{ 204{
193 TEST=`$WHICH extract | grep -v "not found" 2>/dev/null` 205 TEST=`type extract | awk '/not found/' 2>/dev/null`
194 if test -n "$TEST"; then 206 if test -z "$TEST"; then
195 VER=`extract -v 2>/dev/null | head -n 1 | awk '{print $2}'` 207 VER=`extract -v 2>/dev/null | head -n 1 | awk '{print $2}'`
196 infomsg "libextractor : $VER" 208 infomsg "libextractor : $VER"
197 else 209 else
@@ -199,63 +211,36 @@ libextractor_check()
199 fi 211 fi
200} 212}
201 213
202gnunet08_check() 214gnunet_version_check()
203{ 215{
204 if test -x gnunetd; then 216 # historical, should not be matched
205 VER=`gnunetd -v | sed -e "s/v//" 2>/dev/null` 217 T08=`type gnunetd | awk '/not found/' 2>/dev/null`
206 warningmsg "GNUnet 0.8 : $VER (may conflict!)" 218 if test -z "$T08"; then
207 else 219 VER08=`gnunetd -v | awk '{if(/0.8/) { gsub("v",""); print $2}}'`
208 infomsg "GNUnet 0.8 : Not Found (good)" 220 infomsg "GNUnet 0.8 : Not Found (good)"
221 # else
222 # warningmsg "GNUnet 0.8 : $VER08 (may conflict!)"
209 fi 223 fi
210} 224 TEST=`type gnunet-arm | awk '/not found/' 2>/dev/null`
211 225 if test -z "$TEST"; then
212gnunet09x_check() 226 gnunet-arm --version |\
213{ 227 awk '{\
214 TEST=`$WHICH gnunet-arm | grep -v "not found" 2>/dev/null` 228 if (/not found/) {\
215 if test -n "$TEST"; then 229 print " INFO: GNUnet : Not found"\
216 VER=`gnunet-arm -v | sed -e "s/v//" 2>/dev/null | awk '{print $2}'` 230 } else if (/[0-9]/) {\
217 VER9=`echo $VER | grep ^0\.9\.` 231 gsub("v",""); print " INFO: GNUnet : "$2\
218 if test -n "$VER9"; then 232 } else {\
219 warningmsg "GNUnet 0.9 : $VER" 233 print " INFO: GNUnet : Test failed"\
220 else 234 }}'
221 infomsg "GNUnet 0.9 : Not Found (good)"
222 fi
223 else
224 infomsg "GNUnet 0.9 : Not Found (good)"
225 fi
226}
227
228gnunet010x_check()
229{
230 TEST=`$WHICH gnunet-arm | grep -v "not found" 2>/dev/null`
231 if test -n "$TEST"; then
232 VER=`gnunet-arm -v | sed -e "s/v//" 2>/dev/null | awk '{print $2}'`
233 VER10=`echo $VER | grep ^0\.10\.`
234 if test -n "$VER10"; then
235 warningmsg "GNUnet 0.10 : $VER"
236 else
237 infomsg "GNUnet 0.10 : Not Found (good)"
238 fi
239 else
240 infomsg "GNUnet 0.10 : Not Found (good)"
241 fi
242}
243
244gnunet011x_check()
245{
246 TEST=`$WHICH gnunet-arm | grep -v "not found" 2>/dev/null`
247 if test -n "$TEST"; then
248 VER=`gnunet-arm -v | sed -e "s/v//" 2>/dev/null | awk '{print $2}'`
249 infomsg "GNUnet 0.11 : $VER"
250 else 235 else
251 warningmsg "GNUnet 0.11.x : Not Found" 236 warningmsg "GNUnet : Not Found"
252 fi 237 fi
253} 238}
254 239
255gitcommit_check() 240gitcommit_check()
256{ 241{
257 TEST=$(git | grep -v "not found" 2> /dev/null) 242 TEST=$(git | awk '/not found/' 2> /dev/null)
258 if test -n "$TEST"; then 243 if test -z "$TEST"; then
259 VER=$(git rev-parse HEAD) 244 VER=$(git rev-parse HEAD)
260 infomsg "git commit : $VER" 245 infomsg "git commit : $VER"
261 else 246 else
@@ -265,8 +250,8 @@ gitcommit_check()
265 250
266gcrypt_check() 251gcrypt_check()
267{ 252{
268 TEST=`$WHICH libgcrypt-config | grep -v "not found" 2> /dev/null` 253 TEST=`type libgcrypt-config | awk '/not found/' 2> /dev/null`
269 if test -n "$TEST"; then 254 if test -z "$TEST"; then
270 VER=`libgcrypt-config --version 2> /dev/null` 255 VER=`libgcrypt-config --version 2> /dev/null`
271 infomsg "libgcrypt : $VER" 256 infomsg "libgcrypt : $VER"
272 else 257 else
@@ -276,8 +261,8 @@ gcrypt_check()
276 261
277mysql_check() 262mysql_check()
278{ 263{
279 TEST=`$WHICH mysql_config | grep -v "not found" 2> /dev/null` 264 TEST=`type mysql_config | awk '/not found/' 2> /dev/null`
280 if test -n "$TEST"; then 265 if test -z "$TEST"; then
281 VER=`mysql_config --version 2> /dev/null` 266 VER=`mysql_config --version 2> /dev/null`
282 infomsg "mysql : $VER" 267 infomsg "mysql : $VER"
283 else 268 else
@@ -287,18 +272,14 @@ mysql_check()
287 272
288pkgconf_check() 273pkgconf_check()
289{ 274{
290 TEST=`$WHICH pkgconf | grep -v "not found" 2> /dev/null` 275 TEST=`type pkgconf | awk '/not found/' 2> /dev/null`
291 if test -n "$TEST"; then 276 if test -z "$TEST"; then
292 pkgconf --version 2> /dev/null | awk '{print " INFO: pkgconf : "$1}' 277 pkgconf --version 2> /dev/null | awk '{print " INFO: pkgconf : "$1}'
293 else 278 else
294 infomsg "pkgconf : Not Found" 279 infomsg "pkgconf : Not Found"
295 fi 280 fi
296} 281 TEST=`type pkg-config | awk '/not found/' 2> /dev/null`
297 282 if test -z "$TEST"; then
298pkgconfig_check()
299{
300 TEST=`$WHICH pkg-config | grep -v "not found" 2> /dev/null`
301 if test -n "$TEST"; then
302 VER=`pkg-config --version 2> /dev/null | awk '{print $1}'` 283 VER=`pkg-config --version 2> /dev/null | awk '{print $1}'`
303 infomsg "pkg-config : $VER" 284 infomsg "pkg-config : $VER"
304 else 285 else
@@ -308,8 +289,8 @@ pkgconfig_check()
308 289
309glib2_check() 290glib2_check()
310{ 291{
311 TEST=`$WHICH pkg-config | grep -v "not found" 2> /dev/null` 292 TEST=`type pkg-config | awk '/not found/' 2> /dev/null`
312 if test -n "$TEST"; then 293 if test -z "$TEST"; then
313 VER=`pkg-config --modversion glib-2.0 2> /dev/null | awk '{print $1}'` 294 VER=`pkg-config --modversion glib-2.0 2> /dev/null | awk '{print $1}'`
314 infomsg "glib2 : $VER" 295 infomsg "glib2 : $VER"
315 else 296 else
@@ -317,55 +298,47 @@ glib2_check()
317 fi 298 fi
318} 299}
319 300
320gtk2_check() 301gtk_check()
321{ 302{
322 TEST=`$WHICH pkg-config | grep -v "not found" 2> /dev/null` 303 TEST=`type pkg-config | awk '/not found/' 2> /dev/null`
323 if test -n "$TEST"; then 304 if test -z "$TEST"; then
324 VER=`pkg-config --modversion gtk+-2.0 2> /dev/null | awk '{print $1}'` 305 VER=`pkg-config --modversion gtk+-2.0 2> /dev/null | awk '{print $1}'`
325 if test -n "$VER"; then 306 if test -n "$VER"; then
326 infomsg "gtk2+ : $VER" 307 infomsg "GTK2 : $VER"
327 else 308 else
328 infomsg "gtk2+ : Not found" 309 infomsg "GTK2 : Not found"
329 fi 310 fi
330 else 311 else
331 infomsg "gtk2+ : Not Found" 312 infomsg "GTK2 : Not Found"
332 fi 313 fi
333}
334 314
335gtk3_check() 315 if test -z "$TEST"; then
336{
337 TEST=`$WHICH pkg-config | grep -v "not found" 2> /dev/null`
338 if test -n "$TEST"; then
339 VER=`pkg-config --modversion gtk+-3.0 2> /dev/null | awk '{print $1}'` 316 VER=`pkg-config --modversion gtk+-3.0 2> /dev/null | awk '{print $1}'`
340 if test -n "$VER"; then 317 if test -n "$VER"; then
341 infomsg "gtk3+ : $VER" 318 infomsg "GTK3 : $VER"
342 else 319 else
343 infomsg "gtk3+ : Not found" 320 infomsg "GTK3 : Not found"
344 fi 321 fi
345 else 322 else
346 infomsg "gtk3+ : Not Found" 323 infomsg "GTK3 : Not Found"
347 fi 324 fi
348}
349 325
350gtk4_check() 326 if test -z "$TEST"; then
351{
352 TEST=`$WHICH pkg-config | grep -v "not found" 2> /dev/null`
353 if test -n "$TEST"; then
354 VER=`pkg-config --modversion gtk+-4.0 2> /dev/null | awk '{print $1}'` 327 VER=`pkg-config --modversion gtk+-4.0 2> /dev/null | awk '{print $1}'`
355 if test -n "$VER"; then 328 if test -z "$VER"; then
356 infomsg "gtk4+ : $VER" 329 infomsg "GTK4 : $VER"
357 else 330 else
358 infomsg "gtk4+ : Not found" 331 infomsg "GTK4 : Not found"
359 fi 332 fi
360 else 333 else
361 infomsg "gtk4+ : Not Found" 334 infomsg "GTK4 : Not Found"
362 fi 335 fi
363} 336}
364 337
365gmp_check() 338gmp_check()
366{ 339{
367 TEST=`$WHICH dpkg | grep -v "not found" 2> /dev/null` 340 TEST=`type dpkg | awk '/not found/' 2> /dev/null`
368 if test -n "$TEST"; then 341 if test -z "$TEST"; then
369 LINES=`dpkg -s libgmp-dev | grep Version | wc -l 2> /dev/null` 342 LINES=`dpkg -s libgmp-dev | grep Version | wc -l 2> /dev/null`
370 if test "$LINES" = "1" 343 if test "$LINES" = "1"
371 then 344 then
@@ -375,15 +348,15 @@ gmp_check()
375 errormsg "GMP : dpkg: libgmp-dev not installed" 348 errormsg "GMP : dpkg: libgmp-dev not installed"
376 fi 349 fi
377 else 350 else
378 TEST=`$WHICH rpm | grep -v "not found" 2> /dev/null` 351 TEST=`type rpm | awk '/not found/' 2> /dev/null`
379 if test -n "$TEST"; then 352 if test -z "$TEST"; then
380 rpm -q gmp | sed -e "s/gmp-//" 2> /dev/null | \ 353 rpm -q gmp | sed -e "s/gmp-//" 2> /dev/null | \
381 infomsg "GMP : $1.rpm" 354 infomsg "GMP : $1.rpm"
382 else 355 else
383 infomsg "GMP : Test not available" 356 infomsg "GMP : Test not available"
384 fi 357 fi
385 TEST=$($WHICH pkg_info | grep -v "not found" 2> /dev/null) 358 TEST=$(type pkg_info | awk '/not found/' 2> /dev/null)
386 if test -n "$TEST"; then 359 if test -z "$TEST"; then
387 VER=$(pkg_info -e gmp) 360 VER=$(pkg_info -e gmp)
388 infomsg "GMP : $VER" 361 infomsg "GMP : $VER"
389 else 362 else
@@ -394,26 +367,26 @@ gmp_check()
394 367
395libunistring_check() 368libunistring_check()
396{ 369{
397 TEST=`$WHICH dpkg | grep -v "not found" 2> /dev/null` 370 TEST=`type dpkg | awk '/not found/' 2> /dev/null`
398 if test -n "$TEST"; then 371 if test -z "$TEST"; then
399 LINES=`dpkg -s libunistring-dev | grep Version | wc -l` 372 LINES=`dpkg -s libunistring-dev | awk '/Version/' | wc -l`
400 if test "$LINES" = "1" 373 if test "$LINES" = "1"
401 then 374 then
402 VERSION=`dpkg -s libunistring-dev | grep Version | awk '{print $2}'` 375 VERSION=`dpkg -s libunistring-dev | awk '/Version/ {print $2}'`
403 infomsg "libunistring : libunistring3-dev-$VERSION.deb" 376 infomsg "libunistring : libunistring3-dev-$VERSION.deb"
404 else 377 else
405 errormsg "libunistring : dpkg: libunistring3-dev not installed" 378 errormsg "libunistring : dpkg: libunistring3-dev not installed"
406 fi 379 fi
407 else 380 else
408 TEST=`$WHICH rpm | grep -v "not found" 2> /dev/null` 381 TEST=`type rpm | awk '/not found/' 2> /dev/null`
409 if test -n "$TEST"; then 382 if test -z "$TEST"; then
410 rpm -q unistring | sed -e "s/unistring-//" 2> /dev/null | \ 383 rpm -q unistring | sed -e "s/unistring-//" 2> /dev/null | \
411 awk '{print "libunistring : "$1.rpm}' 384 awk '{print "libunistring : "$1.rpm}'
412 else 385 else
413 infomsg "libunistring : Test not available" 386 infomsg "libunistring : Test not available"
414 fi 387 fi
415 TEST=$($WHICH pkg_info | grep -v "not found" 2> /dev/null) 388 TEST=$(type pkg_info | awk '/not found/' 2> /dev/null)
416 if test -n "$TEST"; then 389 if test -z "$TEST"; then
417 VER=$(pkg_info -e libunistring) 390 VER=$(pkg_info -e libunistring)
418 infomsg "libunistring : $VER" 391 infomsg "libunistring : $VER"
419 else 392 else
@@ -424,8 +397,8 @@ libunistring_check()
424 397
425gnugettext_check() 398gnugettext_check()
426{ 399{
427 TEST=`$WHICH gettext | grep -v "not found" 2> /dev/null` 400 TEST=`type gettext | awk '/not found/' 2> /dev/null`
428 if test -n "$TEST"; then 401 if test -z "$TEST"; then
429 if test -n "$(gettext --version 2>&1 | awk '/unknown option/')"; then 402 if test -n "$(gettext --version 2>&1 | awk '/unknown option/')"; then
430 infomsg "GNU gettext : Not found" 403 infomsg "GNU gettext : Not found"
431 else 404 else
@@ -437,7 +410,7 @@ gnugettext_check()
437 410
438gettext_check() 411gettext_check()
439{ 412{
440 if test -n "`$WHICH getext 2>/dev/null`"; then 413 if test -n "`type getext 2>/dev/null`"; then
441 infomsg "gettext : Found" 414 infomsg "gettext : Found"
442 else 415 else
443 infomsg "gettext : Not Found" 416 infomsg "gettext : Not Found"
@@ -448,9 +421,9 @@ gettext_check()
448# found (yes those systems exist) 421# found (yes those systems exist)
449curl_check() 422curl_check()
450{ 423{
451 TEST=`$WHICH curl-config | grep -v "not found" 2> /dev/null` 424 TEST=`type curl-config | awk '/not found/' 2> /dev/null`
452 if test -n "$TEST"; then 425 if test -z "$TEST"; then
453 VER=`curl-config --version | head -n1 2> /dev/null | awk '{print $2}'` 426 VER=`curl-config --version 2> /dev/null | awk '{print $NF}'`
454 infomsg "libcurl : $VER" 427 infomsg "libcurl : $VER"
455 else 428 else
456 infomsg "libcurl : Not found" 429 infomsg "libcurl : Not found"
@@ -459,9 +432,9 @@ curl_check()
459 432
460gnurl_check() 433gnurl_check()
461{ 434{
462 TEST=`$WHICH gnurl-config | grep -v "not found" 2> /dev/null` 435 TEST=`type gnurl-config | awk '/not found/' 2> /dev/null`
463 if test -n "$TEST"; then 436 if test -z "$TEST"; then
464 VER=`gnurl-config --version | head -n1 2> /dev/null | awk '{print $2}'` 437 VER=`gnurl-config --version 2> /dev/null | awk '{print $NF}'`
465 infomsg "libgnurl : $VER" 438 infomsg "libgnurl : $VER"
466 else 439 else
467 infomsg "libgnurl : Not found" 440 infomsg "libgnurl : Not found"
@@ -481,10 +454,10 @@ int main()
481 return 0; 454 return 0;
482} 455}
483EOF 456EOF
484 if test -x `$WHICH gcc | awk '{print $NF}'`; then 457 if test -x `type gcc | awk '{print $NF}'`; then
485 gcc $CPPFLAGS $CFLAGS -o "$TMPFILE".bin "$TMPFILE" 458 gcc $CPPFLAGS $CFLAGS -o "$TMPFILE".bin "$TMPFILE"
486 VER=`./"$TMPFILE".bin` 459 VER=`./"$TMPFILE".bin`
487 elif test -x `$WHICH cc | awk '{print $NF}'`; then 460 elif test -x `type cc | awk '{print $NF}'`; then
488 cc $CPPFLAGS $CFLAGS -o $TMPFILE.bin $TMPFILE 461 cc $CPPFLAGS $CFLAGS -o $TMPFILE.bin $TMPFILE
489 VER=`./$TMPFILE.bin` 462 VER=`./$TMPFILE.bin`
490 else 463 else
@@ -507,10 +480,10 @@ int main()
507 return 0; 480 return 0;
508} 481}
509EOF 482EOF
510 if test -x `$WHICH gcc | awk '{print $NF}'`; then 483 if test -x `type gcc | awk '{print $NF}'`; then
511 gcc $CPPFLAGS $CFLAGS -o "$TMPFILE".bin $TMPFILE 484 gcc $CPPFLAGS $CFLAGS -o "$TMPFILE".bin $TMPFILE
512 VER=`./$TMPFILE.bin` 485 VER=`./$TMPFILE.bin`
513 elif test -x `$WHICH cc | awk '{print $NF}'`; then 486 elif test -x `type cc | awk '{print $NF}'`; then
514 cc $CPPFLAGS $CFLAGS -o "$TMPFILE".bin $TMPFILE 487 cc $CPPFLAGS $CFLAGS -o "$TMPFILE".bin $TMPFILE
515 VER=`./"$TMPFILE".bin` 488 VER=`./"$TMPFILE".bin`
516 else 489 else
@@ -533,10 +506,10 @@ int main()
533 return 0; 506 return 0;
534} 507}
535EOF 508EOF
536 if test -x `$WHICH gcc | awk '{print $NF}'`; then 509 if test -x `type gcc | awk '{print $NF}'`; then
537 gcc $CPPFLAGS $CFLAGS -o "$TMPFILE".bin $TMPFILE 510 gcc $CPPFLAGS $CFLAGS -o "$TMPFILE".bin $TMPFILE
538 VER=`./"$TMPFILE".bin` 511 VER=`./"$TMPFILE".bin`
539 elif test -x `$WHICH cc | awk '{print $NF}'`; then 512 elif test -x `type cc | awk '{print $NF}'`; then
540 cc $CPPFLAGS $CFLAGS -o "$TMPFILE".bin $TMPFILE 513 cc $CPPFLAGS $CFLAGS -o "$TMPFILE".bin $TMPFILE
541 VER=`./"$TMPFILE".bin` 514 VER=`./"$TMPFILE".bin`
542 else 515 else
@@ -554,8 +527,8 @@ main()
554 echo "CPPFLAGS='-I/usr/pkg/include' LDFLAGS='-L/usr/pkg/lib' ${progname}" 527 echo "CPPFLAGS='-I/usr/pkg/include' LDFLAGS='-L/usr/pkg/lib' ${progname}"
555 return 0 528 return 0
556 fi 529 fi
557 echo $LDFLAGS 530 #echo $LDFLAGS
558 echo $CPPFLAGS 531 #echo $CPPFLAGS
559 infomsg "${progname} 0.11.0" 532 infomsg "${progname} 0.11.0"
560 infomsg 533 infomsg
561 infomsg "Please submit the following" 534 infomsg "Please submit the following"
@@ -568,25 +541,19 @@ main()
568 cplusplus_check 541 cplusplus_check
569 clang_check 542 clang_check
570 clangplusplus_check 543 clangplusplus_check
571 gmake_check
572 make_check 544 make_check
545 gmake_check
573 autoconf_check 546 autoconf_check
574 automake_check 547 automake_check
575 libtool_check 548 libtool_check
576 libextractor_check 549 libextractor_check
577 gnunet08_check 550 gnunet_version_check
578 gnunet09x_check
579 gnunet010x_check
580 gnunet011x_check
581 gitcommit_check 551 gitcommit_check
582 gcrypt_check 552 gcrypt_check
583 mysql_check 553 mysql_check
584 pkgconf_check 554 pkgconf_check
585 pkgconfig_check
586 glib2_check 555 glib2_check
587 gtk2_check 556 gtk_check
588 gtk3_check
589 gtk4_check
590 gmp_check 557 gmp_check
591 libunistring_check 558 libunistring_check
592 gnugettext_check 559 gnugettext_check