PKGBUILDs/extra/libproxy/nm-dbus.patch
2009-10-09 21:23:22 -05:00

39 lines
1.4 KiB
Diff

--- libproxy-0.2.3/configure.ac 2008-06-05 22:56:16.000000000 +0200
+++ libproxy-0.2.3.new/configure.ac 2009-01-07 13:42:48.000000000 +0100
@@ -6,6 +6,7 @@
### Checks for programs.
AC_PROG_CC
AC_PROG_CPP
+AM_PROG_CC_C_O
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_PROG_LN_S
@@ -19,8 +20,9 @@
PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes,
[PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes,
[PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])])
-PKG_CHECK_MODULES(NetworkManager, NetworkManager,
- have_networkmanager=yes, have_networkmanager=no)
+PKG_CHECK_MODULES(NetworkManager, NetworkManager,
+ [PKG_CHECK_MODULES(DBUS, dbus-1, have_networkmanager=yes, have_networkmanager=no)],
+ have_networkmanager=no)
# Environmental Variable
AC_ARG_WITH([envvar],
@@ -136,12 +138,12 @@
[test x$have_networkmanager == xyes && with_networkmanager=yes])
if test x$with_networkmanager = xyes; then
if test x$have_networkmanager == xyes; then
- NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS"
- NETWORKMANAGER_LIBS="$NetworkManager_LIBS"
+ NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS $DBUS_CFLAGS"
+ NETWORKMANAGER_LIBS="$NetworkManager_LIBS $DBUS_LIBS"
AC_SUBST(NETWORKMANAGER_CFLAGS)
AC_SUBST(NETWORKMANAGER_LIBS)
else
- echo "NetworkManager plugin requires: NetworkManager!"
+ echo "NetworkManager plugin requires: NetworkManager and DBus!"
exit 1
fi
else