Index: icedtea-2.1/configure.ac
===================================================================
--- icedtea-2.1.orig/configure.ac
+++ icedtea-2.1/configure.ac
@@ -171,71 +171,19 @@ IT_CHECK_FOR_LCMS
 IT_CHECK_FOR_GTK
 IT_CHECK_FOR_GIO
 IT_CHECK_FOR_FONTCONFIG
-IT_CHECK_FOR_CUPS
 IT_CHECK_FOR_SYSCALLS
 AC_CONFIG_FILES([remove-intree-libraries.sh])
 
-dnl Check for Xproto headers and libraries.
-PKG_CHECK_MODULES(XPROTO, xproto,[XPROTO_FOUND=yes],[XPROTO_FOUND=no])
-if test "x${XPROTO_FOUND}" = xno
-then
-  AC_MSG_ERROR([Could not find Xproto headers - \
-  Try installing xorg-x11-proto-devel.])
-fi
-AC_SUBST(XT_CFLAGS)
-AC_SUBST(XT_LIBS)
-
-dnl Check for libXt headers and libraries.
-PKG_CHECK_MODULES(XT, xt,[XT_FOUND=yes],[XT_FOUND=no])
-if test "x${XT_FOUND}" = xno
-then
-  AC_MSG_ERROR([Could not find Xt - \
-  Try installing libXt-devel.])
-fi
-AC_SUBST(XT_CFLAGS)
-AC_SUBST(XT_LIBS)
-
-dnl Check for libXp headers and libraries.
-PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no])
-if test "x${XP_FOUND}" = xno
-then
-  AC_MSG_ERROR([Could not find Xp - \
-  Try installing libXp-devel.])
-fi
-AC_SUBST(XP_CFLAGS)
-AC_SUBST(XP_LIBS)
-
 dnl Check for libX11 headers and libraries.
 PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no])
 if test "x${X11_FOUND}" = xno
 then
-  AC_MSG_ERROR([Could not find x11 - \
-  Try installing libX11-devel.])
+   AC_MSG_ERROR([Could not find x11 - \
+   Try installing libX11-devel.])
 fi
 AC_SUBST(X11_CFLAGS)
 AC_SUBST(X11_LIBS)
 
-dnl Check for libXinerama headers and libraries.
-PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes]
-	,[XINERAMA_FOUND=no])
-if test "x${XINERAMA_FOUND}" = xno
-then
-  AC_MSG_ERROR([Could not find Xinerama - \
-  Try installing libXinerama-devel.])
-fi
-AC_SUBST(XINERAMA_CFLAGS)
-AC_SUBST(XINERAMA_LIBS)
-
-if test "x${ENABLE_XRENDER}" = "xyes"
-then
-  PKG_CHECK_MODULES(XRENDER, xrender, [XRENDER_FOUND=yes], [XRENDER_FOUND=no])
-  if test "x${XRENDER_FOUND}" = xno
-  then
-    AC_MSG_ERROR([Could not find Xrender extension - \
-Try installing libXrender-devel or configure --disable-xrender.])
-  fi
-fi
-
 if test "x${ENABLE_SYSTEMTAP}" = xyes; then
 AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'],
                 [SDT_H_FOUND='no';
@@ -297,16 +245,6 @@ public:
   AC_CONFIG_FILES([tapset/jstack.stp])
 fi
 
-dnl Check for libXtst headers and libraries.
-PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no])
-if test "x${XTST_FOUND}" = xno
-then
-  AC_MSG_ERROR([Could not find Xtst - \
-  Try installing libXtst-devel.])
-fi
-AC_SUBST(XTST_CFLAGS)
-AC_SUBST(XTST_LIBS)
-
 dnl Check for freetype2 headers and libraries.
 PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes]
 	,[FREETYPE2_FOUND=no])
@@ -318,19 +256,6 @@ fi
 AC_SUBST(FREETYPE2_CFLAGS)
 AC_SUBST(FREETYPE2_LIBS)
 
-dnl Check for alsa headers and libraries (only required for Linux).
-if test "x${BUILD_OS_DIR}" = "xlinux"
-then
-  PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no])
-  if test "x${ALSA_FOUND}" = xno
-  then
-    AC_MSG_ERROR([Could not find alsa - \
-    Try installing alsa-lib-devel.])
-  fi
-AC_SUBST(ALSA_CFLAGS)
-AC_SUBST(ALSA_LIBS)
-fi
-
 if test "x${enable_pulse_java}" = "xyes"
 then
   dnl Check for pulseaudio libraries.