diff --git a/autogen.sh b/autogen.sh
index c2892bf3..29f4384a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -103,8 +103,8 @@ do
 	echo "Running libtoolize..."
 	libtoolize --force --copy
       fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
+      echo "Running aclocal -I . $aclocalinclude ..."
+      aclocal -I . $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
 	echo "Running autoheader..."
 	autoheader
diff --git a/configure.ac b/configure.ac
index 2cabf3b1..243f3dde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,14 @@
-AC_REVISION([$Id: configure.ac,v 1.2 2003/03/29 17:32:00 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.3 2003/03/30 01:11:56 rocky Exp $])dnl
 AC_INIT(lib/cdio.c)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(libcdio, 0.1)
      
 AM_SANITY_CHECK
 
+AC_ARG_WITH(cdinfo,
+	[  --without-cdinfo  enable cli frontend (enabled by default)], 
+	enable_cdinfo="${withval}", enable_cdinfo=yes)
+
 dnl Checks for programs.
 AC_PROG_CC
 
@@ -37,7 +41,7 @@ dnl We use a perl for documentation and regression tests
 AC_PATH_PROG(PERL, perl, no)
 AC_SUBST(PERL)dnl
 
-dnl AM_PATH_LIBPOPT(, [enable_cli_fe=no; enable_xml_fe=no])
+AM_PATH_LIBPOPT(, [enable_cdinfo=no])
 
 dnl headers
 
@@ -118,6 +122,7 @@ LIBS="$LIBS -lm"
 CFLAGS="$CFLAGS $WARN_CFLAGS"
 
 AM_CONDITIONAL(CYGWIN, test "x$CYGWIN" = "xyes")
+AM_CONDITIONAL(BUILD_CDINFO, test "x$enable_cdinfo" = "xyes")
 AM_CONDITIONAL(BUILD_CDINFO_LINUX, test "x$enable_cdinfo_linux" = "xyes")
 AM_CONDITIONAL(BUILD_CDIOTEST, test "x$enable_cdiotest" = "xyes")
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b50db17..49793598 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.2 2003/03/29 17:32:00 rocky Exp $
+#   $Id: Makefile.am,v 1.3 2003/03/30 01:11:56 rocky Exp $
 #
 #    Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
 #
@@ -19,22 +19,20 @@
 ####################################################
 # Things to make the sample/test programs
 ####################################################
+if BUILD_CDINFO
+cdinfo_SOURCES = cdinfo.c
+cdinfo_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS)
 if BUILD_CDINFO_LINUX
-bin_PROGRAMS = cdinfo cdinfo-linux
 cdinfo_linux_SOURCES = cdinfo-linux.c
-cdinfo_linux_LDADD = $(LIBCDIO_LIBS) -lpopt
+cdinfo_linux_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS)
+bin_PROGRAMS = cdinfo cdinfo-linux
 else
-EXTRA_DIST = cdinfo-linux.c
-if BUILD_CDIOTEST
-bin_PROGRAMS = cdinfo cdiotest
-cdiotest_SOURCES = cdiotest.c
-cdiotest_LDADD = $(LIBCDIO_LIBS)
-else 
 bin_PROGRAMS = cdinfo
+EXTRA_DIST = cdinfo-linux.c
 endif
+else 
+EXTRA_DIST = cdinfo-linux.c cdinfo.c
 endif
 
 INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)
 
-cdinfo_SOURCES = cdinfo.c
-cdinfo_LDADD = $(LIBCDIO_LIBS) -lpopt