[Xfce4-commits] [xfce/xfce4-power-manager] 02/03: Fix conditional builds

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit 0baa2f092f3c5a0efde0c87980bc9fa9fcaa83e6
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Mon Jun 16 14:04:32 2014 +0300

    Fix conditional builds
    
    This patch fixes it so that the many different --enable/--disable
    options cause the build to still work properly.
---
 configure.ac.in |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index c7d4832..d9ca35b 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -155,18 +155,18 @@ if test "x$ac_cv_enable_panel_plugins" = "xno"; then
 	build_panel_plugins="no"
 else
 	build_panel_plugins="yes"
+fi
 
-    XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [libxfce4panel_minimum_version],
-    [xfce4panel], [To build plugin support for Xfce's panel])
+XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [libxfce4panel_minimum_version],
+[xfce4panel], [To build plugin support for Xfce's panel])
 
-    XDT_CHECK_OPTIONAL_PACKAGE([LXDEPANEL], [lxpanel], [lxdepanel_minimum_version],
-    [lxdepanel],[To build plugin support for LXDE's panel])
-    AC_CHECK_HEADERS([lxpanel/plugin.h lxpanel/panel.h])
+XDT_CHECK_OPTIONAL_PACKAGE([LXDEPANEL], [lxpanel], [lxdepanel_minimum_version],
+[lxdepanel],[To build plugin support for LXDE's panel])
 
-fi
 AM_CONDITIONAL([BUILD_PANEL_PLUGINS], [test "x$build_panel_plugins" = "xyes"])
-AM_CONDITIONAL([BUILD_XFCE_PLUGINS], [test "x$LIBXFCE4PANEL_FOUND" = "xyes"])
-AM_CONDITIONAL([BUILD_LXDE_PLUGINS], [test "x$LXDEPANEL_FOUND" = "xyes"])
+AM_CONDITIONAL([BUILD_XFCE_PLUGINS], [test "x$LIBXFCE4PANEL_FOUND" = "xyes" && "x$build_panel_plugins" = "xyes"])
+AM_CONDITIONAL([BUILD_LXDE_PLUGINS], [test "x$LXDEPANEL_FOUND" = "xyes" && "x$build_panel_plugins" = "xyes"])
+
 
 #=======================================================#
 #     Compile time default choice of backend            #
@@ -244,11 +244,13 @@ echo "POLKIT:			${polkit}"
 echo "DPMS:			${enable_dpms}"
 echo "Network manager:	${ac_network_manager}"
 echo "Build panel plugins:	${build_panel_plugins}"
-if test "x$LIBXFCE4PANEL_FOUND" = "xyes"; then
-echo " Xfce plugins:          yes"
-fi
-if test "x$LXDEPANEL_FOUND" = "xyes"; then
-echo " LXDE plugins:          yes"
+if test "x$build_panel_plugins" = "xyes"; then
+    if test "x$LIBXFCE4PANEL_FOUND" = "xyes"; then
+        echo " Xfce plugins:          yes"
+    fi
+    if test "x$LXDEPANEL_FOUND" = "xyes"; then
+        echo " LXDE plugins:          yes"
+    fi
 fi
 echo "Backend:		${with_backend}"
 echo "Debug:			${enable_debug}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.