|
Line
Link Here
|
| 0 |
-- systemd/configure |
0 |
++ systemd-3/configure |
|
Lines 11640-11651
Link Here
|
| 11640 |
pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" |
11640 |
pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" |
| 11641 |
elif test -n "$PKG_CONFIG"; then |
11641 |
elif test -n "$PKG_CONFIG"; then |
| 11642 |
if test -n "$PKG_CONFIG" && \ |
11642 |
if test -n "$PKG_CONFIG" && \ |
| 11643 |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" dbus-1 >= 1.3.2 \""; } >&5 |
11643 |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" dbus-1 >= 1.3.1 \""; } >&5 |
| 11644 |
($PKG_CONFIG --exists --print-errors " dbus-1 >= 1.3.2 ") 2>&5 |
11644 |
($PKG_CONFIG --exists --print-errors " dbus-1 >= 1.3.1 ") 2>&5 |
| 11645 |
ac_status=$? |
11645 |
ac_status=$? |
| 11646 |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
11646 |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 11647 |
test $ac_status = 0; }; then |
11647 |
test $ac_status = 0; }; then |
| 11648 |
pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags " dbus-1 >= 1.3.2 " 2>/dev/null` |
11648 |
pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags " dbus-1 >= 1.3.1 " 2>/dev/null` |
| 11649 |
else |
11649 |
else |
| 11650 |
pkg_failed=yes |
11650 |
pkg_failed=yes |
| 11651 |
fi |
11651 |
fi |
|
Lines 11656-11667
Link Here
|
| 11656 |
pkg_cv_DBUS_LIBS="$DBUS_LIBS" |
11656 |
pkg_cv_DBUS_LIBS="$DBUS_LIBS" |
| 11657 |
elif test -n "$PKG_CONFIG"; then |
11657 |
elif test -n "$PKG_CONFIG"; then |
| 11658 |
if test -n "$PKG_CONFIG" && \ |
11658 |
if test -n "$PKG_CONFIG" && \ |
| 11659 |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" dbus-1 >= 1.3.2 \""; } >&5 |
11659 |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" dbus-1 >= 1.3.1 \""; } >&5 |
| 11660 |
($PKG_CONFIG --exists --print-errors " dbus-1 >= 1.3.2 ") 2>&5 |
11660 |
($PKG_CONFIG --exists --print-errors " dbus-1 >= 1.3.1 ") 2>&5 |
| 11661 |
ac_status=$? |
11661 |
ac_status=$? |
| 11662 |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
11662 |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 11663 |
test $ac_status = 0; }; then |
11663 |
test $ac_status = 0; }; then |
| 11664 |
pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs " dbus-1 >= 1.3.2 " 2>/dev/null` |
11664 |
pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs " dbus-1 >= 1.3.1 " 2>/dev/null` |
| 11665 |
else |
11665 |
else |
| 11666 |
pkg_failed=yes |
11666 |
pkg_failed=yes |
| 11667 |
fi |
11667 |
fi |
|
Lines 11679-11692
Link Here
|
| 11679 |
_pkg_short_errors_supported=no |
11679 |
_pkg_short_errors_supported=no |
| 11680 |
fi |
11680 |
fi |
| 11681 |
if test $_pkg_short_errors_supported = yes; then |
11681 |
if test $_pkg_short_errors_supported = yes; then |
| 11682 |
DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " dbus-1 >= 1.3.2 " 2>&1` |
11682 |
DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " dbus-1 >= 1.3.1 " 2>&1` |
| 11683 |
else |
11683 |
else |
| 11684 |
DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors " dbus-1 >= 1.3.2 " 2>&1` |
11684 |
DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors " dbus-1 >= 1.3.1 " 2>&1` |
| 11685 |
fi |
11685 |
fi |
| 11686 |
# Put the nasty error message in config.log where it belongs |
11686 |
# Put the nasty error message in config.log where it belongs |
| 11687 |
echo "$DBUS_PKG_ERRORS" >&5 |
11687 |
echo "$DBUS_PKG_ERRORS" >&5 |
| 11688 |
|
11688 |
|
| 11689 |
as_fn_error "Package requirements ( dbus-1 >= 1.3.2 ) were not met: |
11689 |
as_fn_error "Package requirements ( dbus-1 >= 1.3.1 ) were not met: |
| 11690 |
|
11690 |
|
| 11691 |
$DBUS_PKG_ERRORS |
11691 |
$DBUS_PKG_ERRORS |
