--- a/components/readline/Makefile	Tue Feb 03 19:24:25 2015 -0800
+++ b/components/readline/Makefile	Wed Feb 04 20:41:10 2015 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -44,18 +44,29 @@
 
 LINT_FLAGS += -I$(PROTO_DIR)/usr/include
 
+CC += $(CC_BITS)
+
 # readline likes to use ld directly and this is the easiest
 # way to get it to add -lc
 LDFLAGS += -lc
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		--enable-shared
-CONFIGURE_OPTIONS  +=		--disable-static
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		LDFLAGS="$(LDFLAGS)"
 
+# Build the readline examples as well.
+COMPONENT_BUILD_TARGETS =	everything
+
+COMPONENT_TEST_DIR =		$(@D)/examples
+COMPONENT_TEST_CMD =		$(CAT) $(SOURCE_DIR)/examples/Inputrc | ./rlcat
+COMPONENT_TEST_TARGETS =
+
+# Master test results are the same for 32-bit and 64-bit, so override
+# here, rather than create multiple identical master files.
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# common targets
 configure:	$(CONFIGURE_32_and_64)
 
 build:		$(BUILD_32_and_64)