Alexandre Julliard : configure: Only output the disabled crosstest rule once.
Alexandre Julliard
julliard at winehq.org
Wed Jul 28 10:45:02 CDT 2010
Module: wine
Branch: master
Commit: a070f9b0389333c939f1a92cfaf2b7e4eaa0e8b0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a070f9b0389333c939f1a92cfaf2b7e4eaa0e8b0
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jul 26 20:53:12 2010 +0200
configure: Only output the disabled crosstest rule once.
---
aclocal.m4 | 13 ++++++++-----
configure | 11 +++++++----
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 67c7997..f67e938 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -357,10 +357,6 @@ testclean::
.PHONY: $ac_dir/__crosstest__
$ac_dir/__crosstest__: $ac_dir/Makefile __builddeps__ dummy
@cd $ac_dir && \$(MAKE) crosstest"
- else
- wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"crosstest:
- @echo \"crosstest is not supported (mingw not installed?)\" && false"
fi])
}
@@ -416,7 +412,14 @@ wine_fn_config_symlink ()
@./config.status $ac_link
distclean::
\$(RM) $ac_link"
-}])
+}
+
+if test "x$CROSSTEST_DISABLE" != x
+then
+ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+"crosstest:
+ @echo \"crosstest is not supported (mingw not installed?)\" && false"
+fi])
dnl **** Define helper function to append a file to a makefile file list ****
dnl
diff --git a/configure b/configure
index a966b1b..c8b1709 100755
--- a/configure
+++ b/configure
@@ -14234,10 +14234,6 @@ testclean::
.PHONY: $ac_dir/__crosstest__
$ac_dir/__crosstest__: $ac_dir/Makefile __builddeps__ dummy
@cd $ac_dir && \$(MAKE) crosstest"
- else
- wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"crosstest:
- @echo \"crosstest is not supported (mingw not installed?)\" && false"
fi
fi
}
@@ -14297,6 +14293,13 @@ wine_fn_config_symlink ()
distclean::
\$(RM) $ac_link"
}
+
+if test "x$CROSSTEST_DISABLE" != x
+then
+ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+"crosstest:
+ @echo \"crosstest is not supported (mingw not installed?)\" && false"
+fi
ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd"
test "$srcdir" = "." || wine_fn_config_symlink dlls/wineps.drv/generic.ppd
if test "x$enable_fonts" != xno; then
More information about the wine-cvs
mailing list