# HG changeset patch # User andrew # Date 1290478643 0 # Node ID 49e7ca187a525dd21cbeae69077cad410e98c86b # Parent e8d03f9ed991f06e2cc1a0db2861d6752b5159eb 7000225: Sanity check on sane-alsa-headers is broken Summary: Fix use of tab separators, ${alsa_version} expansion and conditional Reviewed-by: ohair diff -r e8d03f9ed991 -r 49e7ca187a52 jdk/make/common/shared/Sanity.gmk --- a/jdk/make/common/shared/Sanity.gmk Tue Nov 09 11:45:00 2010 -0800 +++ b/jdk/make/common/shared/Sanity.gmk Tue Nov 23 02:17:23 2010 +0000 @@ -1389,20 +1389,21 @@ endif sane-alsa-headers: ifdef REQUIRED_ALSA_VERSION - if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer" ] ; then \ - $(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \ - " You have the following ALSA version installed: $${alsa_version) \n" \ - " Please reinstall ALSA (drivers and lib). You can download \n" \ - " the source distribution from http://www.alsa-project.org \n" \ - " or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ - "" >> $(ERROR_FILE) ; \ - fi \ + @if [ "$(ALSA_CHECK)" != "missing" ] ; then \ + if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer" ] ; then \ + $(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \ + " You have the following ALSA version installed: $${alsa_version} \n" \ + " Please reinstall ALSA (drivers and lib). You can download \n" \ + " the source distribution from http://www.alsa-project.org \n" \ + " or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ + "" >> $(ERROR_FILE) ; \ + fi ; \ else \ - $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \ - " Please install ALSA (drivers and lib). You can download the \n" \ - " source distribution from http://www.alsa-project.org or go to \n" \ - " http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ - "" >> $(ERROR_FILE) ; \ + $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \ + " Please install ALSA (drivers and lib). You can download the \n" \ + " source distribution from http://www.alsa-project.org or go to \n" \ + " http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ + "" >> $(ERROR_FILE) ; \ fi endif