/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 8972093fe4f7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8972093fe4f7
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 18 20:14:00 2010 +0000

	Use AC_LANG_PUSH/AC_LANG_POP rather than deprecated SAVE/RESTORE
	macros.

	2010-01-18 Andrew John Hughes <ahughes at redhat.com>

	 * configure.ac: Use AC_LANG_PUSH and AC_LANG_POP
	instead of deprecated SAVE and RESTORE macros.


changeset 10d4e6ddaac9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=10d4e6ddaac9
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 18 20:12:25 2010 +0000

	PR icedtea/416: Don't use hardcoded tarball names.

	2010-01-18 Andrew John Hughes <ahughes at redhat.com>

	 PR icedtea/416:
		* Makefile.am: Use $(OPENJDK_SRC_ZIP) and $(HOTSPOT_SRC_ZIP)
	to determine names of tarballs rather than hardcoding
	openjdk.tar.gz and hotspot.tar.gz


diffstat:

3 files changed, 21 insertions(+), 6 deletions(-)
ChangeLog    |   14 ++++++++++++++
Makefile.am  |    6 ++++--
configure.ac |    7 +++----

diffs (65 lines):

diff -r 83256d3211dd -r 10d4e6ddaac9 ChangeLog
--- a/ChangeLog	Sun Jan 17 00:37:57 2010 +0100
+++ b/ChangeLog	Mon Jan 18 20:12:25 2010 +0000
@@ -1,3 +1,17 @@ 2010-01-17  Matthias Klose  <doko at ubuntu
+2010-01-18 Andrew John Hughes  <ahughes at redhat.com>
+
+	* configure.ac:
+	Use AC_LANG_PUSH and AC_LANG_POP instead
+	of deprecated SAVE and RESTORE macros.
+	
+2010-01-18 Andrew John Hughes  <ahughes at redhat.com>
+
+	PR icedtea/416:
+	* Makefile.am:
+	Use $(OPENJDK_SRC_ZIP) and $(HOTSPOT_SRC_ZIP)
+	to determine names of tarballs rather than
+	hardcoding openjdk.tar.gz and hotspot.tar.gz
+	
 2010-01-17  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/icedtea-sparc-trapsfix.patch: Merged sparc headers
diff -r 83256d3211dd -r 10d4e6ddaac9 Makefile.am
--- a/Makefile.am	Sun Jan 17 00:37:57 2010 +0100
+++ b/Makefile.am	Mon Jan 18 20:12:25 2010 +0000
@@ -1795,8 +1795,10 @@ ADD_ZERO_CONFIGURE_ARGS += \
 			'--with-rmic=% '--with-additional-vms=% \
 			'--with-openjdk '--with-openjdk=% , \
 		$(CONFIGURE_ARGS)) \
-	$(foreach i, openjdk hotspot, \
-	  $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.gz))
+	$(if $(findstring --with-openjdk-src-zip=, $(CONFIGURE_ARGS)),, \
+	  --with-openjdk-src-zip=$(abs_top_builddir)/$(OPENJDK_SRC_ZIP)) \
+	$(if $(findstring --with-hotspot-src-zip=, $(CONFIGURE_ARGS)),, \
+	  --with-hotspot-src-zip=$(abs_top_builddir)/$(HOTSPOT_SRC_ZIP))
 
 ADD_ZERO_EXTRA_BUILD_ENV = \
 	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \
diff -r 83256d3211dd -r 10d4e6ddaac9 configure.ac
--- a/configure.ac	Sun Jan 17 00:37:57 2010 +0100
+++ b/configure.ac	Mon Jan 18 20:12:25 2010 +0000
@@ -1,4 +1,4 @@ AC_INIT([icedtea6], [1.8pre], [distro-pk
-AC_INIT([icedtea6], [1.8pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.8pre],[distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
@@ -320,8 +320,7 @@ AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUN
                    AC_MSG_ERROR([systemtap support needs sys/sdt.h header])])
 
  AC_MSG_CHECKING([working sys/sdt.h and g++ support])
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG_PUSH([C++])
  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/sdt.h>
 class ProbeClass
@@ -354,7 +353,7 @@ public:
   ProbeClass inst = ProbeClass(i, "call");
   inst.method(24);
 ]])], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([systemtap sdt.h or g++ too old])])
-  AC_LANG_RESTORE
+  AC_LANG_POP([C++])
 
   AC_MSG_CHECKING([for absolute java home install dir])
   AC_ARG_WITH([abs-install-dir],