Index: ChangeLog =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/ChangeLog,v retrieving revision 1.3 diff -u -3 -p -u -r1.3 ChangeLog --- ChangeLog 3 Feb 2005 00:35:49 -0000 1.3 +++ ChangeLog 7 Feb 2005 01:57:36 -0000 @@ -1,3 +1,13 @@ +2005-02-06 Andrew John Hughes + + * acinclude.m4: + (CASHEWS_WITH_ECLIPSE): New function to handle + --with-eclipse. + * configure.ac: Added inclusion of above macro. + * lib/gen-classpath.sh.in: Filter out paths + containing 'eclipse' if --with-eclipse is not + specified. + 2005-02-03 Andrew John Hughes * src/nongnu/cashews/rdf/Graph.java: Index: acinclude.m4 =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/acinclude.m4,v retrieving revision 1.2 diff -u -3 -p -u -r1.2 acinclude.m4 --- acinclude.m4 1 Feb 2005 01:01:08 -0000 1.2 +++ acinclude.m4 7 Feb 2005 01:57:36 -0000 @@ -412,3 +412,17 @@ AC_DEFUN([CLASSPATH_CHECK_ECJ], AC_PATH_PROG(ECJ, "ecj") fi ]) + +dnl ------------------------------------------------------------ +AC_DEFUN([CASHEWS_WITH_ECLIPSE], +[ + AC_ARG_WITH([eclipse], + [AS_HELP_STRING(--with-eclipse,compile the Eclipse plug-in)], + [ + if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then + ECLIPSE="$withval" + AC_SUBST(ECLIPSE) + fi + ]) +]) + Index: configure.ac =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/configure.ac,v retrieving revision 1.1.1.1 diff -u -3 -p -u -r1.1.1.1 configure.ac --- configure.ac 31 Jan 2005 04:02:17 -0000 1.1.1.1 +++ configure.ac 7 Feb 2005 01:57:36 -0000 @@ -25,6 +25,9 @@ CLASSPATH_WITH_GLIBJ dnl Enable API docs? CLASSPATH_WITH_GJDOC +dnl Check for Eclipse path +CASHEWS_WITH_ECLIPSE + dnl Generate classlist and other output AC_CONFIG_FILES([Makefile doc/Makefile Index: lib/gen-classlist.sh.in =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/lib/gen-classlist.sh.in,v retrieving revision 1.1.1.1 diff -u -3 -p -u -r1.1.1.1 gen-classlist.sh.in --- lib/gen-classlist.sh.in 31 Jan 2005 04:02:18 -0000 1.1.1.1 +++ lib/gen-classlist.sh.in 7 Feb 2005 01:57:36 -0000 @@ -2,8 +2,14 @@ # @configure_input@ echo "Adding java source files from srcdir '@top_srcdir@'." address@hidden@ @top_srcdir@/src/nongnu \ +if test @ECLIPSE@; then + @FIND@ @top_srcdir@/src/nongnu \ -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 +else + @FIND@ @top_srcdir@/src/nongnu \ + -follow -type f -print | grep '\.java$' \ + | grep -v 'eclipse' > ${top_builddir}/lib/classes.1 +fi # Only include generated files once. if test ! "${top_builddir}" -ef "@top_srcdir@"; then