opal_check_package: convert "test ... -o" to "test ... ||"
Этот коммит содержится в:
родитель
ed3809a23a
Коммит
fa92996ccb
@ -36,7 +36,8 @@ AC_DEFUN([_OPAL_CHECK_PACKAGE_HEADER], [
|
|||||||
unset opal_Header
|
unset opal_Header
|
||||||
|
|
||||||
opal_check_package_header_happy="no"
|
opal_check_package_header_happy="no"
|
||||||
AS_IF([test "$3" = "/usr" -o "$3" = "/usr/local"],
|
AS_IF([test "$3" = "/usr" || \
|
||||||
|
test "$3" = "/usr/local"],
|
||||||
[ # try as is...
|
[ # try as is...
|
||||||
AC_VERBOSE([looking for header without includes])
|
AC_VERBOSE([looking for header without includes])
|
||||||
AC_CHECK_HEADERS([$2], [opal_check_package_header_happy="yes"], [])
|
AC_CHECK_HEADERS([$2], [opal_check_package_header_happy="yes"], [])
|
||||||
@ -85,7 +86,9 @@ AC_DEFUN([_OPAL_CHECK_PACKAGE_LIB], [
|
|||||||
unset opal_Lib])],
|
unset opal_Lib])],
|
||||||
[ # libdir was not specified - go through search path
|
[ # libdir was not specified - go through search path
|
||||||
opal_check_package_libdir="$5"
|
opal_check_package_libdir="$5"
|
||||||
AS_IF([test "$opal_check_package_libdir" = "" -o "$opal_check_package_libdir" = "/usr" -o "$opal_check_package_libdir" = "/usr/local"],
|
AS_IF([test "$opal_check_package_libdir" = "" || \
|
||||||
|
test "$opal_check_package_libdir" = "/usr" || \
|
||||||
|
test "$opal_check_package_libdir" = "/usr/local"],
|
||||||
[ # try as is...
|
[ # try as is...
|
||||||
AC_VERBOSE([looking for library without search path])
|
AC_VERBOSE([looking for library without search path])
|
||||||
AC_CHECK_LIB([$2], [$3],
|
AC_CHECK_LIB([$2], [$3],
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user