--- a/ChangeLog	Thu Apr 16 03:13:38 2015 +0100
+++ b/ChangeLog	Fri Apr 24 20:39:36 2015 +0100
@@ -1,3 +1,20 @@
+2015-04-24  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	Update build following PR2233 & PR2236.
+	* Makefile.am:
+	(ICEDTEA_ENV): Set SYSTEM_GSETTINGS.
+	(bootstrap-directory-stage1): Update ppc64le
+	workaround for 2.5.x ppc64 -> 2.6.x ppc64le
+	transition rather than 2.4.x ppc64le -> 2.5.x
+	ppc64 transition.
+	* acinclude.m4:
+	(IT_SET_ARCH_SETTINGS): Update powerpc64le
+	to use ppc64le for arch directory.
+	(IT_ENABLE_ZERO_BUILD): Include ppc64le in
+	ZERO_LIBARCH test, as ZERO_LIBARCH is based
+	on INSTALL_ARCH_DIR.
+	(IT_CHECK_FOR_GIO): Make GSettings API optional.
+
 2015-04-16  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* NEWS: Add 2.5.5 release notes.

--- a/Makefile.am	Thu Apr 16 03:13:38 2015 +0100
+++ b/Makefile.am	Fri Apr 24 20:39:36 2015 +0100
@@ -514,6 +514,7 @@
 	GTK_LIBS="${GTK_LIBS}" \
 	GTK_CFLAGS="${GTK_CFLAGS}" \
 	SYSTEM_GIO="${ENABLE_SYSTEM_GIO}" \
+	SYSTEM_GSETTINGS="${ENABLE_SYSTEM_GSETTINGS}" \
 	GIO_LIBS="${GIO_LIBS}" \
 	GIO_CFLAGS="${GIO_CFLAGS}" \
 	SYSTEM_FONTCONFIG="${ENABLE_SYSTEM_FONTCONFIG}" \
@@ -1623,9 +1624,9 @@
 	else \
 	  ln -sfv $(STAGE1_BOOT_RUNTIME) $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
 	fi
-# Workaround some older ppc64le builds installing to 'ppc64le' rather than 'ppc64'
-	if test -d $(SYSTEM_JDK_DIR)/jre/lib/ppc64le ; then \
-	  ln -sfv $(SYSTEM_JDK_DIR)/jre/lib/ppc64le \
+# Workaround some older ppc64le builds installing to 'ppc64' rather than 'ppc64le'
+	if test -d $(SYSTEM_JDK_DIR)/jre/lib/ppc64 ; then \
+	  ln -sfv $(SYSTEM_JDK_DIR)/jre/lib/ppc64 \
 	    $(STAGE1_BOOT_DIR)/jre/lib/$(JRE_ARCH_DIR) ; \
 	else \
 	  ln -sfv $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \

--- a/acinclude.m4	Thu Apr 16 03:13:38 2015 +0100
+++ b/acinclude.m4	Fri Apr 24 20:39:36 2015 +0100
@@ -55,9 +55,9 @@
       ARCHFLAG="-m64"
        ;;
     powerpc64le)
-      BUILD_ARCH_DIR=ppc64
-      INSTALL_ARCH_DIR=ppc64
-      JRE_ARCH_DIR=ppc64
+      BUILD_ARCH_DIR=ppc64le
+      INSTALL_ARCH_DIR=ppc64le
+      JRE_ARCH_DIR=ppc64le
       ARCHFLAG="-m64"
        ;;
     sparc)
@@ -723,7 +723,7 @@
     arm|i386|ppc|s390|sh|sparc)
       ZERO_BITSPERWORD=32
       ;;
-    aarch64|alpha|amd64|ia64|ppc64|s390x|sparcv9)
+    aarch64|alpha|amd64|ia64|ppc64|ppc64le|s390x|sparcv9)
       ZERO_BITSPERWORD=64
       ;;
     *)
@@ -2126,19 +2126,27 @@
   if test x"${ENABLE_SYSTEM_GIO}" = "xyes"; then
     dnl Check for Gio+ headers and libraries.
     PKG_CHECK_MODULES(GIO, gio-2.0,[GIO_FOUND=yes],[GIO_FOUND=no])
+    if test "x${GIO_FOUND}" = xno; then
+      AC_MSG_ERROR([Could not find GIO; install GIO or build with --disable-system-gio to use the in-tree headers.])
+    fi
     OLD_LIBS=${LIBS}
     LIBS="${LIBS} ${GIO_LIBS}"
     AC_CHECK_FUNC([g_settings_new],[GIO_FUNC_FOUND=yes],[GIO_FUNC_FOUND=no])
     LIBS=${OLD_LIBS}
-    if test "x${GIO_FOUND}" = xno -o "x${GIO_FUNC_FOUND}" = xno; then
-      AC_MSG_ERROR([Could not find GIO; install GIO or build with --disable-system-gio to use the in-tree headers.])
+    if test "x${GIO_FUNC_FOUND}" = xno; then
+      AC_MSG_WARN([Could not find GSettings API; native proxy support will use GConf])
+      ENABLE_SYSTEM_GSETTINGS=false
+    else
+      ENABLE_SYSTEM_GSETTINGS=true
     fi
     AC_SUBST(GIO_CFLAGS)
     AC_SUBST(GIO_LIBS)
     ENABLE_SYSTEM_GIO=true
   fi
   AM_CONDITIONAL(USE_SYSTEM_GIO, test x"${ENABLE_SYSTEM_GIO}" = "xtrue")
+  AM_CONDITIONAL(USE_SYSTEM_GSETTINGS, test x"${ENABLE_SYSTEM_GSETTINGS}" = "xtrue")
   AC_SUBST(ENABLE_SYSTEM_GIO)
+  AC_SUBST(ENABLE_SYSTEM_GSETTINGS)
 ])
 
 AC_DEFUN_ONCE([IT_CHECK_FOR_FONTCONFIG],