ctdlsh configure script is now awesomer than gnu autotools.

diff --git a/ctdlsh/Makefile b/ctdlsh/Makefile
index a74b7394e774029958c017658b3d9625e8e92aa0..f8ec41b1fd977bd4bda8e95372a45800ab23bf1f 100644 (file)
--- 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 7f32d3294e62b82102c55580525da89b7906648e..46ee9f40364465c481d88c6e5d4c1dbbfab15c3b 100755 (executable)
--- 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 93cbaefda36888cbb4ecc8c27078468699e01b4e..6fc29315c51ab7d35cc5f1ae3f16297689e7dffe 100644 (file)
--- 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);
        }