From 3aa6de21774758f46691c205641f72db330dcfb2 Mon Sep 17 00:00:00 2001
From: Jonathan Wright <jonathan@quag.geek.nz>
Date: Sat, 5 Jan 2008 11:06:06 +1300
Subject: [PATCH] Removed left over editline detection from build

---
 Makefile                          |    5 ----
 libs/iovm/Makefile                |    5 ----
 tools/editlib_test/Makefile       |   18 -------------
 tools/editlib_test/editlib_test.c |   49 -------------------------------------
 4 files changed, 0 insertions(+), 77 deletions(-)
 delete mode 100644 tools/editlib_test/Makefile
 delete mode 100644 tools/editlib_test/editlib_test.c

diff --git a/Makefile b/Makefile
index 2236dd5..fb70f15 100755
--- a/Makefile
+++ b/Makefile
@@ -76,8 +76,6 @@ testaddon:
 	./_build/binaries/io_static$(BINARY_SUFFIX) addons/$(addon)/tests/run.io
 
 vm:
-	$(MAKE) -C tools/editlib_test clean
-	$(MAKE) -C tools/editlib_test || true
 	for dir in $(libs); do INSTALL_PREFIX=$(INSTALL_PREFIX) $(MAKE) -C libs/$$dir; done
 	$(MAKE) vmlib
 	cd tools; $(MAKE)
@@ -89,11 +87,9 @@ ifneq (,$(findstring Windows,$(SYS)))
 endif
 	mkdir -p _build/binaries || true
 	cp tools/_build/binaries/* _build/binaries
-	@$(MAKE) -s -C tools/editlib_test warn
 
 addons: vm
 	./_build/binaries/io_static$(BINARY_SUFFIX) build.io
-	@$(MAKE) -s -C tools/editlib_test warn
 	@if [ -f errors ]; then cat errors; echo; echo "Note: addons do not to build when libs or headers are missing"; echo; rm errors; fi
 
 vmlib:
@@ -168,7 +164,6 @@ clean:
 	-rm -rf projects/osx/build
 	-rm -rf projects/osxvm/build
 	$(MAKE) -C tools clean
-	$(MAKE) -C tools/editlib_test clean
 
 testvm:
 	cd tools; make test
diff --git a/libs/iovm/Makefile b/libs/iovm/Makefile
index 63c33f9..0db7fa3 100644
--- a/libs/iovm/Makefile
+++ b/libs/iovm/Makefile
@@ -1,7 +1,2 @@
 include ../../Makefile.lib
 CFLAGS += -DBUILDING_IOVM_DLL $(IOVMALLFLAGS)
-
-#hasEditLib := $(wildcard ../../tools/editlib_test/editlib_test)
-#ifneq ($(strip $(hasEditLib)),)
-#CFLAGS += -DIO_HAS_EDITLIB
-#endif
diff --git a/tools/editlib_test/Makefile b/tools/editlib_test/Makefile
deleted file mode 100644
index f1d2754..0000000
--- a/tools/editlib_test/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-LDFLAGS=-ledit
-editlib_test: editlib_test.c
-
-clean:
-	$(RM) editlib_test
-
-hasEditLib := $(wildcard editlib_test)
-ifeq ($(strip $(hasEditLib)),)
-warn:
-	@echo
-	@echo "Compiling libedit test                [FAILED]"
-	@echo "  - Command line history disabled"
-	@echo
-else
-warn:
-endif
-
-.PHONY: clean warn
diff --git a/tools/editlib_test/editlib_test.c b/tools/editlib_test/editlib_test.c
deleted file mode 100644
index aa4ed59..0000000
--- a/tools/editlib_test/editlib_test.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-  Copyright Jonathan Wright 2007
-  License: BSD revised
-*/
-
-#include <stdio.h>
-#include <histedit.h>
-
-char prompt[] = "test> ";
-
-char *promptCallback(EditLine *e)
-{
-	return prompt;
-}
-
-int main()
-{
-	History *h = history_init();
-	EditLine *e = el_init("edittest", stdin, stdout, stderr);
-	el_set(e, EL_PROMPT, promptCallback);
-	el_set(e, EL_HIST, history, h);
-	el_set(e, EL_SIGNAL, 1);
-	el_set(e, EL_EDITOR, "emacs");
-
-	{
-		HistEvent ev;
-		history(h, &ev, H_SETSIZE, 1024);
-	}
-
-	for (;;)
-	{
-		int count = 0;
-		const char *str = el_gets(e, &count);
-
-		if (!str || count <= 0)
-			break;
-
-		puts(str);
-
-		{
-			HistEvent ev;
-			history(h, &ev, H_ENTER, str);
-		}
-	}
-
-	el_end(e);
-	history_end(h);
-	return 0;
-}
-- 
1.5.3.7.8.g8e742