author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Sat, 15 Aug 2015 10:34:08 -0700 | |
changeset 4783 | 399cd14618d4 |
parent 4291 | 402cc6853ea3 |
permissions | -rw-r--r-- |
4291
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Adjust the check for the check test framework to look for libcheck.so |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
instead of libcheck.a. |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
|
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
This change will be sent upstream. |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
--- libdnet-1.12/configure.in.orig 2015-05-07 08:14:49.583718066 -0700 |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
+++ libdnet-1.12/configure.in 2015-05-07 08:17:24.526491068 -0700 |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
@@ -131,22 +131,22 @@ |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
;; |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
*) |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
AC_MSG_RESULT($withval) |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
- if test -f $withval/include/check.h -a -f $withval/lib/libcheck.a; then |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
+ if test -f $withval/include/check.h -a -f $withval/lib/libcheck.so; then |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
owd=`pwd` |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
if cd $withval; then withval=`pwd`; cd $owd; fi |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
CHECKINC="-I$withval/include" |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
CHECKLIB="-L$withval/lib -lcheck" |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
- elif test -f $withval/src/check.h -a -f $withval/src/libcheck.a; then |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
+ elif test -f $withval/src/check.h -a -f $withval/src/libcheck.so; then |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
owd=`pwd` |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
if cd $withval; then withval=`pwd`; cd $owd; fi |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
CHECKINC="-I$withval/src" |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
CHECKLIB="-L$withval/src -lcheck" |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
else |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
- AC_ERROR(check.h or libcheck.a not found in $withval) |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
+ AC_ERROR(check.h or libcheck.so not found in $withval) |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
fi |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
;; |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
esac ], |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
-[ if test -f ${prefix}/include/check.h -a -f ${prefix}/lib/libcheck.a; then |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
+[ if test -f ${prefix}/include/check.h -a -f ${prefix}/lib/libcheck.so; then |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
CHECKINC="-I${prefix}/include" |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |
CHECKLIB="-L${prefix}/lib -lcheck" |
402cc6853ea3
19866378 Can enable gmake check in libdnet when check is checked in
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
34 |
AC_MSG_RESULT(yes) |