Alexandre Julliard : configure: Disable clean and depend rules for disabled top-level directories.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9bdd0272ce45b7d720b1b7d0cf90c744a967cc4a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9bdd0272ce45b7d720b1b7d0cf...

Author: Alexandre Julliard 
Date:   Wed Jun 30 17:34:20 2010 +0200

configure: Disable clean and depend rules for disabled top-level directories.

---

aclocal.m4 |    7 ++++---
 configure  |    9 ++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 69d0e1a..a77f15e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -183,9 +183,10 @@ wine_fn_config_makefile ()
 {
     ac_dir=$[1]
     ac_enable=$[2]
-    wine_fn_all_dir_rules $ac_dir "Make.rules $(MAKEDEP)"
+    AS_VAR_IF([$ac_enable],[no],[return 0])

-    AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+    wine_fn_all_dir_rules $ac_dir "Make.rules $(MAKEDEP)"
+    wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "all: $ac_dir
 .PHONY: $ac_dir
 $ac_dir: $ac_dir/Makefile dummy
@@ -197,7 +198,7 @@ install-lib:: $ac_dir
 install-dev:: $ac_dir
    @cd $ac_dir && $(MAKE) install-dev
 uninstall:: $ac_dir/Makefile
-	@cd $ac_dir && $(MAKE) uninstall"])
+	@cd $ac_dir && $(MAKE) uninstall"
 }

wine_fn_config_lib ()
diff --git a/configure b/configure
index 530c551..4847297 100755
--- a/configure
+++ b/configure
@@ -13989,13 +13989,13 @@ wine_fn_config_makefile ()
 {
     ac_dir=$1
     ac_enable=$2
-    wine_fn_all_dir_rules $ac_dir "Make.rules $(MAKEDEP)"
-
     eval as_val=$$ac_enable
    if test "x$as_val" = x""no; then :
+  return 0
+fi

-else
-  wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+    wine_fn_all_dir_rules $ac_dir "Make.rules $(MAKEDEP)"
+    wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "all: $ac_dir
 .PHONY: $ac_dir
 $ac_dir: $ac_dir/Makefile dummy
@@ -14008,7 +14008,6 @@ install-dev:: $ac_dir
    @cd $ac_dir && $(MAKE) install-dev
 uninstall:: $ac_dir/Makefile
    @cd $ac_dir && $(MAKE) uninstall"
-fi
 }

wine_fn_config_lib ()