From: Hans-Bernhard B. <br...@us...> - 2006-09-30 17:31:20
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18761 Modified Files: ChangeLog aclocal.m4 configure configure.in Log Message: Keep and distribute lex and yacc output files. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.162 retrieving revision 1.163 diff -C2 -r1.162 -r1.163 *** ChangeLog 30 Sep 2006 16:51:44 -0000 1.162 --- ChangeLog 30 Sep 2006 17:31:14 -0000 1.163 *************** *** 1,4 **** --- 1,11 ---- 2006-09-30 Hans-Bernhard Broeker <br...@ph...> + * src/Makefile.am (CLEANFILES, dist-hook): Commented out, to + reduce number of user reports from people without lex. + + * configure.in: Change from AC_PROG_LEX to AM_PROG_LEX. + + * src/Makefile.am (cscope_SOURCES): Added alloc.h. Reindented. + * src/invlib.c (invnewterm): Correct loop test to account for maxback being unsigned (SF bug #1559495). Index: aclocal.m4 =================================================================== RCS file: /cvsroot/cscope/cscope/aclocal.m4,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** aclocal.m4 30 Sep 2006 16:51:45 -0000 1.7 --- aclocal.m4 30 Sep 2006 17:31:14 -0000 1.8 *************** *** 490,493 **** --- 490,514 ---- AC_SUBST([am__leading_dot])]) + # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # serial 5 + + # AM_PROG_LEX + # ----------- + # Autoconf leaves LEX=: if lex or flex can't be found. Change that to a + # "missing" invocation, for better error output. + AC_DEFUN([AM_PROG_LEX], + [AC_PREREQ(2.50)dnl + AC_REQUIRE([AM_MISSING_HAS_RUN])dnl + AC_REQUIRE([AC_PROG_LEX])dnl + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi]) + # Check to see how 'make' treats includes. -*- Autoconf -*- Index: configure =================================================================== RCS file: /cvsroot/cscope/cscope/configure,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -r1.28 -r1.29 *** configure 30 Sep 2006 16:51:45 -0000 1.28 --- configure 30 Sep 2006 17:31:14 -0000 1.29 *************** *** 3265,3268 **** --- 3265,3271 ---- fi + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi *************** *** 3993,3997 **** ncurses_version=unknown cat > conftest.$ac_ext <<EOF ! #line 3995 "configure" #include "confdefs.h" #ifdef RENAMED_NCURSES --- 3996,4000 ---- ncurses_version=unknown cat > conftest.$ac_ext <<EOF ! #line 3998 "configure" #include "confdefs.h" #ifdef RENAMED_NCURSES Index: configure.in =================================================================== RCS file: /cvsroot/cscope/cscope/configure.in,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** configure.in 30 Sep 2006 16:51:45 -0000 1.33 --- configure.in 30 Sep 2006 17:31:14 -0000 1.34 *************** *** 16,20 **** AC_PROG_CC AC_EXEEXT ! AC_PROG_LEX AM_CONDITIONAL(USING_LEX, test "x$LEX" = "xlex") if test "x$LEX" = "xlex" ; then AC_DEFINE(USING_LEX, 1, --- 16,20 ---- AC_PROG_CC AC_EXEEXT ! AM_PROG_LEX AM_CONDITIONAL(USING_LEX, test "x$LEX" = "xlex") if test "x$LEX" = "xlex" ; then AC_DEFINE(USING_LEX, 1, |