[Libreoffice-commits] .: configure.in

[Libreoffice Gerrit user]

 configure.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f5a6f34ad627166d5f54955eea9135466f64710d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 18 19:44:52 2012 +0200

    configure: sdremote option was missing a comma
    
    Change-Id: I5956b2dcacc10a6413fc82d9a120b98644e6ab68

diff --git a/configure.in b/configure.in
index 061bd2e..cd3b7a4 100644
--- a/configure.in
+++ b/configure.in
@@ -872,7 +872,7 @@ AC_ARG_ENABLE(packagekit,
 AC_ARG_ENABLE(sdremote,
     AS_HELP_STRING([--disable-sdremote],
         [Determines whether to enable Impress remote control.
-         Uses dbus and bluetooth (bluez(.])
+         Uses dbus and bluetooth (bluez(.]),
 ,enable_sdremote=yes)
 
 AC_ARG_ENABLE(gconf,
@@ -9311,7 +9311,7 @@ AC_SUBST(DBUS_LIBS)
 
 AC_MSG_CHECKING([whether to enable font install via packagekit])
 if test "$ENABLE_DBUS" = "TRUE"; then
-	if test -n "$enable_packagekit"; then
+	if test -n "$enable_packagekit" -a "$enable_packagekit" != "no"; then
 		ENABLE_PACKAGEKIT=YES
 		AC_MSG_RESULT([yes])
 	else
@@ -9325,7 +9325,7 @@ AC_SUBST(ENABLE_PACKAGEKIT)
 
 AC_MSG_CHECKING([whether to enable sd remotecontrol])
 if test "$ENABLE_DBUS" = "TRUE"; then
-	if test -n "$enable_sdremote"; then
+	if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
 		AC_MSG_RESULT([yes])
 		ENABLE_SDREMOTE=YES
 		if test "$OS" = "LINUX"; then