diff --git a/.gitignore b/.gitignore
index cace9f63b..20f2d2f21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,7 @@ getl
 lemon_prepared
 lrim
 mlr-[0-9.]*.tar.*
+test_argparse
 test_byte_readers
 test_join_bucket_keeper
 test_lrec
diff --git a/c/cli/Makefile.am b/c/cli/Makefile.am
index 179af57db..091f94333 100644
--- a/c/cli/Makefile.am
+++ b/c/cli/Makefile.am
@@ -4,6 +4,9 @@ libcli_la_SOURCES=	\
 			argparse.h \
 			mlrcli.c \
 			mlrcli.h
+libcli_la_LIBADD=	\
+			../lib/libmlr.la
+			../containers/libcontainers.la
 
 # TODO: causes circular dependency
 #noinst_PROGRAMS=	ap
@@ -11,5 +14,13 @@ libcli_la_SOURCES=	\
 #ap_LDADD=		../containers/libcontainers.la ../lib/libmlr.la
 #ap_SOURCES=		argparse.c
 
-AM_CFLAGS=	-std=gnu99
+TESTS=	$(check_PROGRAMS)
+check_PROGRAMS=	test_argparse
+
+test_argparse_CPPFLAGS=	-D__TEST_ARGPARSE_MAIN__ ${AM_CPPFLAGS}
+test_argparse_LDADD=	../lib/libmlr.la \
+			../containers/libcontainers.la \
+			libcli.la
+
 AM_CPPFLAGS=	-I${srcdir}/../
+AM_CFLAGS=	-std=gnu99
diff --git a/c/todo.txt b/c/todo.txt
index 1aab7fd3f..6e1096cbd 100644
--- a/c/todo.txt
+++ b/c/todo.txt
@@ -22,27 +22,28 @@ MAJOR: autoconfig
     ./dsls/filter_dsl_wrapper.c
     ./dsls/put_dsl_wrapper.c
 
-w merge the pull request from wiz
+! travis use autoconf
 
+LEVELS:
+* figure out a2x/xml/...
+* manpage
+* poki
+* ... what else ...
+
+DOC:
 * separate mlrdoc build notes for build-a-release (autoreconf, xmllint, etc.)
   vs. install-a-release (./configure)
-
 * separate dependency lists (long & short)
-
 * makefile.orig w/ notes (simpler to debug in the non-happy case, faster compiles)
   along w/ mlrdoc note
-
-* include lemon-generated .c/.h or not
-
-* figure out a2x/xml/...
-
-! Makefile.orig x 2 w/ notes in-tree & @ mlrdoc
-
 * notes-to-self re new files: incl. test-files in c/test/Makefile.am
+! Makefile.orig x 2 w/ notes in-tree & @ mlrdoc
+* mlrvers.h <-> config.h; also ci a stub config.h for noac build
 
+TO-DO:
+* include lemon-generated .c/.h or not
 * lemon in-dir -- cf wiz note
 
-* mlrvers.h <-> config.h; also ci a stub config.h for noac build
 
 ----------------------------------------------------------------
 MAJOR: multi-char separators