forked from pool/xfce4-session
91 lines
3.8 KiB
Diff
91 lines
3.8 KiB
Diff
--- configure
|
|
+++ configure
|
|
@@ -26560,7 +26560,7 @@
|
|
|
|
|
|
if test x"$xdt_cv_DBUS_check" = x"yes"; then
|
|
- if $PKG_CONFIG --exists "dbus-1 >= 0.34" >/dev/null 2>&1; then
|
|
+ if $PKG_CONFIG --exists "dbus-glib-1 >= 0.34" >/dev/null 2>&1; then
|
|
|
|
|
|
# minimum supported version of pkg-config
|
|
@@ -26644,22 +26644,22 @@
|
|
fi
|
|
|
|
|
|
- { $as_echo "$as_me:$LINENO: checking for dbus-1 >= 0.34" >&5
|
|
-$as_echo_n "checking for dbus-1 >= 0.34... " >&6; }
|
|
- if $PKG_CONFIG "--atleast-version=0.34" "dbus-1" >/dev/null 2>&1; then
|
|
- DBUS_VERSION=`$PKG_CONFIG --modversion "dbus-1"`
|
|
+ { $as_echo "$as_me:$LINENO: checking for dbus-glib-1 >= 0.34" >&5
|
|
+$as_echo_n "checking for dbus-glib-1 >= 0.34... " >&6; }
|
|
+ if $PKG_CONFIG "--atleast-version=0.34" "dbus-glib-1" >/dev/null 2>&1; then
|
|
+ DBUS_VERSION=`$PKG_CONFIG --modversion "dbus-glib-1"`
|
|
{ $as_echo "$as_me:$LINENO: result: $DBUS_VERSION" >&5
|
|
$as_echo "$DBUS_VERSION" >&6; }
|
|
|
|
{ $as_echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5
|
|
$as_echo_n "checking DBUS_CFLAGS... " >&6; }
|
|
- DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1"`
|
|
+ DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1"`
|
|
{ $as_echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5
|
|
$as_echo "$DBUS_CFLAGS" >&6; }
|
|
|
|
{ $as_echo "$as_me:$LINENO: checking DBUS_LIBS" >&5
|
|
$as_echo_n "checking DBUS_LIBS... " >&6; }
|
|
- DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1"`
|
|
+ DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1"`
|
|
{ $as_echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5
|
|
$as_echo "$DBUS_LIBS" >&6; }
|
|
|
|
@@ -26678,15 +26678,15 @@
|
|
|
|
DBUS_FOUND="yes"
|
|
|
|
- elif $PKG_CONFIG --exists "dbus-1" >/dev/null 2>&1; then
|
|
- xdt_cv_version=`$PKG_CONFIG --modversion "dbus-1"`
|
|
+ elif $PKG_CONFIG --exists "dbus-glib-1" >/dev/null 2>&1; then
|
|
+ xdt_cv_version=`$PKG_CONFIG --modversion "dbus-glib-1"`
|
|
{ $as_echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
|
|
$as_echo "found, but $xdt_cv_version" >&6; }
|
|
|
|
|
|
- echo "*** The required package dbus-1 was found on your system,"
|
|
+ echo "*** The required package dbus-glib-1 was found on your system,"
|
|
echo "*** but the installed version ($xdt_cv_version) is too old."
|
|
- echo "*** Please upgrade dbus-1 to atleast version 0.34, or adjust"
|
|
+ echo "*** Please upgrade dbus-glib-1 to atleast version 0.34, or adjust"
|
|
echo "*** the PKG_CONFIG_PATH environment variable if you installed"
|
|
echo "*** the new version of the package in a nonstandard prefix so"
|
|
echo "*** pkg-config is able to find it."
|
|
@@ -26697,8 +26697,8 @@
|
|
$as_echo "not found" >&6; }
|
|
|
|
|
|
- echo "*** The required package dbus-1 was not found on your system."
|
|
- echo "*** Please install dbus-1 (atleast version 0.34) or adjust"
|
|
+ echo "*** The required package dbus-glib-1 was not found on your system."
|
|
+ echo "*** Please install dbus-glib-1 (atleast version 0.34) or adjust"
|
|
echo "*** the PKG_CONFIG_PATH environment variable if you"
|
|
echo "*** installed the package in a nonstandard prefix so that"
|
|
echo "*** pkg-config is able to find it."
|
|
@@ -26707,14 +26707,14 @@
|
|
fi
|
|
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: checking for optional package dbus-1 >= 0.34" >&5
|
|
-$as_echo_n "checking for optional package dbus-1 >= 0.34... " >&6; }
|
|
+ { $as_echo "$as_me:$LINENO: checking for optional package dbus-glib-1 >= 0.34" >&5
|
|
+$as_echo_n "checking for optional package dbus-glib-1 >= 0.34... " >&6; }
|
|
{ $as_echo "$as_me:$LINENO: result: not found" >&5
|
|
$as_echo "not found" >&6; }
|
|
fi
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: checking for optional package dbus-1" >&5
|
|
-$as_echo_n "checking for optional package dbus-1... " >&6; }
|
|
+ { $as_echo "$as_me:$LINENO: checking for optional package dbus-glib-1" >&5
|
|
+$as_echo_n "checking for optional package dbus-glib-1... " >&6; }
|
|
{ $as_echo "$as_me:$LINENO: result: disabled" >&5
|
|
$as_echo "disabled" >&6; }
|
|
fi
|