From ab71006c986efb39298cf0b9e5eed3988e8e2a74 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Wed, 24 Aug 2016 23:42:02 -0400
Subject: [PATCH] ctdlsh configure script is now awesomer than gnu autotools.

---
 ctdlsh/Makefile  |  7 +++++--
 ctdlsh/configure | 44 ++++++++++++++++++++++++++++++++++++++++++--
 ctdlsh/main.c    |  1 +
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/ctdlsh/Makefile b/ctdlsh/Makefile
index a74b7394e..f8ec41b1f 100644
--- a/ctdlsh/Makefile
+++ b/ctdlsh/Makefile
@@ -15,7 +15,7 @@ ctdlsh: $(OBJS) config.mk
 
 # compile and generate dependency info
 %.o: %.c
-	gcc -c $(CFLAGS) $*.c -o $*.o
+	gcc -c $(CFLAGS) -DCTDLDIR=\"$(CTDLDIR)\" $*.c -o $*.o
 	gcc -MM $(CFLAGS) $*.c > $*.d
 
 config.mk:
@@ -28,4 +28,7 @@ distclean: clean
 	rm -f config.mk
 
 install: ctdlsh
-	echo Not yet
+	install ctdlsh $(BINDIR)/ctdlsh
+
+uninstall:
+	rm -vf $(BINDIR)/ctdlsh
diff --git a/ctdlsh/configure b/ctdlsh/configure
index 7f32d3294..46ee9f403 100755
--- a/ctdlsh/configure
+++ b/ctdlsh/configure
@@ -5,12 +5,52 @@ echo
 echo Running the configure script to create config.mk
 echo
 
-CFLAGS='-ggdb'
-LDFLAGS=''
+# Parse the command line arguments
+for x in $*
+do
+	a=$1
+	k=`echo $a | awk -F= ' { print $1 } '`
+	v=`echo $a | awk -F= ' { print $2 } '`
+
+	case $k in
+		--prefix)
+			PREFIX=$v
+		;;
+		--bindir)
+			BINDIR=$v
+		;;
+		--ctdldir)
+			CTDLDIR=$v
+		;;
+		*)
+			echo $0 : unknown option $k
+			echo
+			echo Valid options are:
+			echo '	--prefix=PREFIX		Install files in PREFIX [/usr/local]'
+			echo '	--bindir=DIR		Install executables in DIR [PREFIX/bin]'
+			echo '	--ctdldir=DIR		Look for Citadel server in DIR [/usr/local/citadel]'
+			exit 1
+		;;
+	esac
+	shift
+done
+
+# Set any missing values
+
+[ "$PREFIX" = "" ] 	&& PREFIX=/usr/local
+[ "$BINDIR" = "" ]	&& BINDIR=${PREFIX}/bin
+[ "$CTDLDIR" = "" ]	&& CTDLDIR=/usr/local/citadel
+[ "$CFLAGS" = "" ]	&& CFLAGS='-ggdb'
+[ "$LDFLAGS" = "" ]	&& LDFLAGS=''
+
+# Output the config.mk
 
 (
 	echo "CFLAGS := ${CFLAGS}"
 	echo "LDFLAGS := ${LDFLAGS}"
+	echo "PREFIX := ${PREFIX}"
+	echo "BINDIR := ${BINDIR}"
+	echo "CTDLDIR := ${CTDLDIR}"
 ) >config.mk
 
 cat config.mk
diff --git a/ctdlsh/main.c b/ctdlsh/main.c
index 93cbaefda..6fc29315c 100644
--- a/ctdlsh/main.c
+++ b/ctdlsh/main.c
@@ -170,6 +170,7 @@ int main(int argc, char **argv)
 
 	sock_getln(server_socket, buf, sizeof buf);
 	if (buf[0] == '2') {
+		printf("Connected: %s\n", buf);
 		do_main_loop(server_socket);
 	}
 
-- 
2.30.2