--- a/components/gnuplot/Makefile	Wed Jun 15 18:29:34 2016 -0700
+++ b/components/gnuplot/Makefile	Mon Jun 06 06:11:42 2016 -0700
@@ -42,14 +42,6 @@
 
 CXXFLAGS += -std=c++11
 
-# For now we will build against wxWidgets from this workspace and not
-# against the system one (which is older).
-# See also WX_CONFIG setting below.
-WX_PROTO=$(COMPONENT_DIR)/../wxwidgets/build/prototype/$(MACH)
-CXXFLAGS += -I$(WX_PROTO)$(USRLIBDIR64)/wx/include/gtk2-unicode-3.0
-CXXFLAGS += -I$(WX_PROTO)$(USRINCDIR)/wx-3.0
-LDFLAGS += -L$(WX_PROTO)$(USRLIBDIR64)
-
 COMPONENT_BUILD_TARGETS = all info
 
 include $(WS_MAKE_RULES)/common.mk
@@ -58,12 +50,7 @@
 CONFIGURE_OPTIONS  += --sysconfdir=$(ETCDIR)/gnu
 CONFIGURE_OPTIONS  += --infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  += --x-libraries=$(CONFIGURE_LIBDIR.$(BITS))
-CONFIGURE_OPTIONS  += WX_CONFIG="$(WX_PROTO)$(USRLIBDIR64)/wx/config/gtk2-unicode-3.0"
-
-# Ensure that wxWidgets are built first.
-../wxwidgets/build/$(MACH64)/.installed:
-	(cd ../wxwidgets ; $(GMAKE) install)
-$(CONFIGURE_64): ../wxwidgets/build/$(MACH64)/.installed
+CONFIGURE_OPTIONS  += WX_CONFIG="$(USRBINDIR64)/wx-config"
 
 REQUIRED_PACKAGES += image/library/libjpeg
 REQUIRED_PACKAGES += image/library/libpng