[Commit] nickle acinclude.m4,1.1,1.2 autoconfigure.sh,1.5,1.6

[Bart Massey]

Committed by: bart

Update of /local/src/CVS/nickle
In directory home.keithp.com:/tmp/cvs-serv11041

Modified Files:
	acinclude.m4 autoconfigure.sh 
Log Message:
Refuse to quietly live without -lreadline during configuration.
Clean up horrible acinclude.m4 formatting.
Make autoconfigure.sh not tell you to type make if configure fails.



Index: acinclude.m4
===================================================================
RCS file: /local/src/CVS/nickle/acinclude.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- acinclude.m4	17 Apr 2001 09:20:53 -0000	1.1
+++ acinclude.m4	9 Jun 2003 20:49:09 -0000	1.2
@@ -1,38 +1,38 @@
 dnl Check for readline and get termcap lib as well
 AC_DEFUN([AC_LIB_READLINE],[
-doit=yes
-AC_ARG_WITH(readline,
-[  --with-readline=DIR     GNU readline library in DIR],
-doit=$with_readline)
-case $doit in
-no)
-	;;
-*)
-readline_header="readline"
-readline_libdir=""
-case $doit in
-yes)
-	;;
-*)
-	readline_libdir="-L$doit/lib -R$doit/lib"
-	readline_incdir="-I$doit/include"
-	;;
-esac
-AC_CHECK_LIB(ncurses,tparm,TERMLIB=-lncurses,
-AC_CHECK_LIB(termcap,tgetent,TERMLIB=-ltermcap))
-saved_LIBS="$LIBS"
-LIBS="$LIBS $TERMLIB"
-saved_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $readline_libdir"
-saved_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $readline_incdir"
-AC_CHECK_LIB(readline,readline,
-   [AC_CHECK_HEADER(readline/readline.h,
-   LIBS="$saved_LIBS -lreadline $TERMLIB"
-   AC_DEFINE(HAVE_LIBREADLINE,1,[support fancy command line editing]))],
-   LDFLAGS="$saved_LDFLAGS"
-   LIBS="$saved_LIBS"
-   CPPFLAGS="$saved_CPPFLAGS")
-   ;;
+  doit=yes
+  AC_ARG_WITH(readline,
+  [  --with-readline=DIR     GNU readline library in DIR],
+  doit=$with_readline)
+  case $doit in
+  no)
+    ;;
+  *)
+    readline_header="readline"
+    readline_libdir=""
+    case $doit in
+    yes)
+      ;;
+    *)
+      readline_libdir="-L$doit/lib -R$doit/lib"
+      readline_incdir="-I$doit/include"
+      ;;
+    esac
+    AC_CHECK_LIB(ncurses,tparm,TERMLIB=-lncurses,
+      AC_CHECK_LIB(termcap,tgetent,TERMLIB=-ltermcap))
+    saved_LIBS="$LIBS"
+    LIBS="$LIBS $TERMLIB"
+    saved_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $readline_libdir"
+    saved_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $readline_incdir"
+    AC_CHECK_LIB(readline,readline,
+      [ AC_CHECK_HEADER(readline/readline.h,
+          LIBS="$saved_LIBS -lreadline $TERMLIB"
+          AC_DEFINE(HAVE_LIBREADLINE,1,
+            [support fancy command line editing])) ],
+      [ AC_MSG_RESULT([Cannot find readline.  Build with --without-readline or set the readline path appropriately.])
+        exit 1 ])
+      ;;
   esac
 ])

Index: autoconfigure.sh
===================================================================
RCS file: /local/src/CVS/nickle/autoconfigure.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- autoconfigure.sh	7 Jun 2003 18:21:18 -0000	1.5
+++ autoconfigure.sh	9 Jun 2003 20:49:09 -0000	1.6
@@ -4,6 +4,5 @@
 autoconf
 automake -a -c
 echo Running ./configure
-./configure --enable-maintainer-mode "$@"
-echo 
-echo "Now type 'make' to compile $PROJECT."
+./configure --enable-maintainer-mode "$@" &&
+( echo ''; echo "Now type 'make' to compile $PROJECT." )