Mercurial > hg > release > icedtea7-2.0

changeset 2431:742ab4a6e279

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Treat --without-x-src-zip as equivalent to not specifying the option. 2011-05-25 Andrew John Hughes <ahughes@redhat.com> * acinclude.m4: (IT_WITH_CORBA_SRC_ZIP): Treat --without option as equivalent to unspecified. (IT_WITH_JAXP_SRC_ZIP): Likewise. (IT_WITH_JAXWS_SRC_ZIP): Likewise. (IT_WITH_JDK_SRC_ZIP): Likewise. (IT_WITH_LANGTOOLS_DROP_ZIP): Likewise. 2011-02-23 Andrew John Hughes <ahughes@redhat.com> * acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_ZIP): Treat --without option as equivalent to unspecified. (IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise. (IT_WITH_OPENJDK_SRC_ZIP): Likewise. (IT_WITH_HOTSPOT_SRC_ZIP): Likewise. (IT_WITH_JAXP_DROP_ZIP): Likewise. (IT_WITH_JAF_DROP_ZIP): Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise.
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 25 May 2011 02:11:47 +0100
parents 475fabfc836b
children 8d2c6f90feb9
files ChangeLog acinclude.m4
diffstat 2 files changed, 58 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed May 25 02:08:09 2011 +0100
+++ b/ChangeLog	Wed May 25 02:11:47 2011 +0100
@@ -1,3 +1,25 @@
+2011-05-25  Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	(IT_WITH_CORBA_SRC_ZIP): Treat
+	--without option as equivalent to unspecified.
+	(IT_WITH_JAXP_SRC_ZIP): Likewise.
+	(IT_WITH_JAXWS_SRC_ZIP): Likewise.
+	(IT_WITH_JDK_SRC_ZIP): Likewise.
+	(IT_WITH_LANGTOOLS_DROP_ZIP): Likewise.
+
+2011-02-23  Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	(IT_CHECK_WITH_CACAO_SRC_ZIP): Treat
+	--without option as equivalent to unspecified.
+	(IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise.
+	(IT_WITH_OPENJDK_SRC_ZIP): Likewise.
+	(IT_WITH_HOTSPOT_SRC_ZIP): Likewise.
+	(IT_WITH_JAXP_DROP_ZIP): Likewise.
+	(IT_WITH_JAF_DROP_ZIP): Likewise.
+	(IT_WITH_JAXWS_DROP_ZIP): Likewise.
+
 2011-05-25  Andrew John Hughes  <ahughes@redhat.com>
 
 	* acinclude.m4:
--- a/acinclude.m4	Wed May 25 02:08:09 2011 +0100
+++ b/acinclude.m4	Wed May 25 02:11:47 2011 +0100
@@ -547,7 +547,9 @@
               [AS_HELP_STRING([--with-openjdk-src-zip[[=PATH]]],specify the location of the OpenJDK source zip)],
   [
     ALT_OPENJDK_SRC_ZIP=${withval}
-    if ! test -f ${ALT_OPENJDK_SRC_ZIP} ; then
+    if test "x${ALT_OPENJDK_SRC_ZIP}" = "xno"; then
+      ALT_OPENJDK_SRC_ZIP="not specified"
+    elif ! test -f ${ALT_OPENJDK_SRC_ZIP} ; then
       AC_MSG_ERROR([Invalid OpenJDK source zip specified: ${ALT_OPENJDK_SRC_ZIP}])
     fi
   ],
@@ -898,7 +900,9 @@
               [AS_HELP_STRING(--with-cacao-src-zip=PATH,specify the location of the CACAO source zip)],
   [
     ALT_CACAO_SRC_ZIP=${withval}
-    if ! test -f ${ALT_CACAO_SRC_ZIP} ; then
+    if test "x${ALT_CACAO_SRC_ZIP}" = "xno"; then
+      ALT_CACAO_SRC_ZIP="not specified"
+    elif ! test -f ${ALT_CACAO_SRC_ZIP} ; then
       AC_MSG_ERROR([Invalid CACAO source zip specified: ${ALT_CACAO_SRC_ZIP}])
     fi
   ],
@@ -1047,7 +1051,9 @@
               [AS_HELP_STRING(--with-hotspot-src-zip=PATH,specify the location of the HotSpot source zip)],
   [
     ALT_HOTSPOT_SRC_ZIP=${withval}
-    if ! test -f ${ALT_HOTSPOT_SRC_ZIP} ; then
+    if test "x${ALT_HOTSPOT_SRC_ZIP}" = "xno"; then
+      ALT_HOTSPOT_SRC_ZIP="not specified"
+    elif ! test -f ${ALT_HOTSPOT_SRC_ZIP} ; then
       AC_MSG_ERROR([Invalid HotSpot source zip specified: ${ALT_HOTSPOT_SRC_ZIP}])
     fi
   ],
@@ -1066,7 +1072,9 @@
               [AS_HELP_STRING(--with-corba-src-zip=PATH,specify the location of the CORBA source zip)],
   [
     ALT_CORBA_SRC_ZIP=${withval}
-    if ! test -f ${ALT_CORBA_SRC_ZIP} ; then
+    if test "x${ALT_CORBA_SRC_ZIP}" = "xno"; then
+      ALT_CORBA_SRC_ZIP="not specified"
+    elif ! test -f ${ALT_CORBA_SRC_ZIP} ; then
       AC_MSG_ERROR([Invalid CORBA source zip specified: ${ALT_CORBA_SRC_ZIP}])
     fi
   ],
@@ -1085,7 +1093,9 @@
               [AS_HELP_STRING(--with-jaxp-src-zip=PATH,specify the location of the JAXP source zip)],
   [
     ALT_JAXP_SRC_ZIP=${withval}
-    if ! test -f ${ALT_JAXP_SRC_ZIP} ; then
+    if test "x${ALT_JAXP_SRC_ZIP}" = "xno"; then
+      ALT_JAXP_SRC_ZIP="not specified"
+    elif ! test -f ${ALT_JAXP_SRC_ZIP} ; then
       AC_MSG_ERROR([Invalid JAXP source zip specified: ${ALT_JAXP_SRC_ZIP}])
     fi
   ],
@@ -1104,7 +1114,9 @@
               [AS_HELP_STRING(--with-jaxws-src-zip=PATH,specify the location of the JAXWS source zip)],
   [
     ALT_JAXWS_SRC_ZIP=${withval}
-    if ! test -f ${ALT_JAXWS_SRC_ZIP} ; then
+    if test "x${ALT_JAXWS_SRC_ZIP}" = "xno"; then
+      ALT_JAXWS_SRC_ZIP="not specified"
+    elif ! test -f ${ALT_JAXWS_SRC_ZIP} ; then
       AC_MSG_ERROR([Invalid JAXWS source zip specified: ${ALT_JAXWS_SRC_ZIP}])
     fi
   ],
@@ -1123,7 +1135,9 @@
               [AS_HELP_STRING(--with-jdk-src-zip=PATH,specify the location of the JDK source zip)],
   [
     ALT_JDK_SRC_ZIP=${withval}
-    if ! test -f ${ALT_JDK_SRC_ZIP} ; then
+    if test "x${ALT_JDK_SRC_ZIP}" = "xno"; then
+      ALT_JDK_SRC_ZIP="not specified"
+    elif ! test -f ${ALT_JDK_SRC_ZIP} ; then
       AC_MSG_ERROR([Invalid JDK source zip specified: ${ALT_JDK_SRC_ZIP}])
     fi
   ],
@@ -1142,7 +1156,9 @@
               [AS_HELP_STRING(--with-langtools-src-zip=PATH,specify the location of the langtools source zip)],
   [
     ALT_LANGTOOLS_SRC_ZIP=${withval}
-    if ! test -f ${ALT_LANGTOOLS_SRC_ZIP} ; then
+    if test "x${ALT_LANGTOOLS_SRC_ZIP}" = "xno"; then
+      ALT_LANGTOOLS_SRC_ZIP="not specified"
+    elif ! test -f ${ALT_LANGTOOLS_SRC_ZIP} ; then
       AC_MSG_ERROR([Invalid langtools source zip specified: ${ALT_LANGTOOLS_SRC_ZIP}])
     fi
   ],
@@ -1161,7 +1177,9 @@
               [AS_HELP_STRING(--with-jaxp-drop-zip=PATH,specify the location of the JAXP drop zip)],
   [
     ALT_JAXP_DROP_ZIP=${withval}
-    if ! test -f ${ALT_JAXP_DROP_ZIP} ; then
+    if test "x${ALT_JAXP_DROP_ZIP}" = "xno"; then
+      ALT_JAXP_DROP_ZIP="not specified"
+    elif ! test -f ${ALT_JAXP_DROP_ZIP} ; then
       AC_MSG_ERROR([Invalid JAXP drop zip specified: ${ALT_JAXP_DROP_ZIP}])
     fi
   ],
@@ -1180,7 +1198,9 @@
               [AS_HELP_STRING(--with-jaf-drop-zip=PATH,specify the location of the JAF drop zip)],
   [
     ALT_JAF_DROP_ZIP=${withval}
-    if ! test -f ${ALT_JAF_DROP_ZIP} ; then
+    if test "x${ALT_JAF_DROP_ZIP}" = "xno"; then
+      ALT_JAF_DROP_ZIP="not specified"
+    elif ! test -f ${ALT_JAF_DROP_ZIP} ; then
       AC_MSG_ERROR([Invalid JAF drop zip specified: ${ALT_JAF_DROP_ZIP}])
     fi
   ],
@@ -1199,7 +1219,9 @@
               [AS_HELP_STRING(--with-jaxws-drop-zip=PATH,specify the location of the JAXWS drop zip)],
   [
     ALT_JAXWS_DROP_ZIP=${withval}
-    if ! test -f ${ALT_JAXWS_DROP_ZIP} ; then
+    if test "x${ALT_JAXWS_DROP_ZIP}" = "xno"; then
+      ALT_JAXWS_DROP_ZIP="not specified"
+    elif ! test -f ${ALT_JAXWS_DROP_ZIP} ; then
       AC_MSG_ERROR([Invalid JAXWS drop zip specified: ${ALT_JAXWS_DROP_ZIP}])
     fi
   ],
@@ -2008,7 +2030,9 @@
 	      [AS_HELP_STRING(--with-jamvm-src-zip,specify the location of the JamVM source zip)],
   [
     ALT_JAMVM_SRC_ZIP=${withval}
-    if ! test -f ${ALT_JAMVM_SRC_ZIP} ; then
+    if test "x${ALT_JAMVM_SRC_ZIP}" = "xno"; then
+      ALT_JAMVM_SRC_ZIP="not specified"
+    elif ! test -f ${ALT_JAMVM_SRC_ZIP} ; then
       AC_MSG_ERROR([Invalid JamVM source zip specified: ${ALT_JAMVM_SRC_ZIP}])
     fi
   ],