From 6193f32c3991001521db45e8975ba5e0acbd3619 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 26 Sep 2003 16:21:24 +0000 Subject: [PATCH] * We run r4rstest.scm after having built elk. git-svn-id: svn://svn.zoy.org/elk/trunk@203 55e467fa-43c5-0310-a8a2-de718669efc6 --- configure.ac | 7 ++++--- examples/Makefile.am | 1 + examples/tests/Makefile.am | 14 ++++++++++++++ examples/tests/r4rstest.scm | 1 + 4 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 examples/tests/Makefile.am diff --git a/configure.ac b/configure.ac index 84ca84f..f51bdcd 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_C_INLINE AC_TYPE_SIZE_T # Check whether we are doing a native build -AM_CONDITIONAL(NATIVE_BUILD, test "${cross_compile}" = "no") +AM_CONDITIONAL(NATIVE_BUILD, test "${cross_compiling}" = "no") AC_CHECK_HEADERS(inttypes.h, [STDINT_HEADER=""], @@ -462,7 +462,7 @@ AC_CHECK_LIB(Xmu, XmuDrawLogo, [xmu_libraries=""], [[-lXt -lSM -lICE -lXext -lX11 -L${x_libraries}]]) -if test "${cross_compile}" = "no"; then +if test "${cross_compiling}" = "no"; then AC_CHECK_LIB(Xaw, XawTextSearch, [ac_cv_my_have_xaw=yes XAW_CFLAGS="-I${x_includes}" @@ -476,7 +476,7 @@ AM_CONDITIONAL(HAVE_XAW, test "${ac_cv_my_have_xaw}" = "yes") AC_SUBST(XAW_CFLAGS) AC_SUBST(XAW_LIBS) -if test "${cross_compile}" = "no"; then +if test "${cross_compiling}" = "no"; then AC_CHECK_LIB(Xm, XmStringConcat, [ac_cv_my_have_motif=yes MOTIF_CFLAGS="-I${x_includes} -I/usr/include/Xm" @@ -533,6 +533,7 @@ AC_OUTPUT([ doc/xlib/Makefile doc/xt/Makefile examples/Makefile + examples/tests/Makefile include/Makefile lib/Makefile lib/misc/Makefile diff --git a/examples/Makefile.am b/examples/Makefile.am index 12b6cfa..6a14977 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,5 +1,6 @@ NULL = +SUBDIRS = tests EXTRA_DIST = $(DATA) examplesdir = $(datadir)/doc/@PACKAGE@/examples diff --git a/examples/tests/Makefile.am b/examples/tests/Makefile.am new file mode 100644 index 0000000..7fa004a --- /dev/null +++ b/examples/tests/Makefile.am @@ -0,0 +1,14 @@ + +CLEANFILES = $(allstamps) tmp1 tmp2 tmp3 + +allstamps = stamp-r4rs + +if NATIVE_BUILD +all-local: $(allstamps) +endif + +stamp-r4rs: + -$(top_builddir)/src/elk -p .:$(top_srcdir)/scm -l r4rstest.scm + rm -f tmp1 tmp2 tmp3 + touch $@ + diff --git a/examples/tests/r4rstest.scm b/examples/tests/r4rstest.scm index 56e94ef..49a3c07 100644 --- a/examples/tests/r4rstest.scm +++ b/examples/tests/r4rstest.scm @@ -1226,4 +1226,5 @@ (newline) (display "(test-cont) (test-sc4) (test-delay)") (newline) +(test-cont) (test-sc4) (test-delay) "last item in file"