--- gforth/configure.in 2008/10/20 11:56:58 1.256 +++ gforth/configure.in 2008/10/27 22:03:12 1.261 @@ -20,12 +20,12 @@ dnl Process this file with autoconf to p dnl We use some automake macros here, dnl but don't use automake for creating Makefile.in -AC_INIT([gforth],[0.6.9-20081006],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth]) +AC_INIT([gforth],[0.6.9-20081026],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth]) AC_PREREQ(2.54) #snapshots have numbers major.minor.release-YYYYMMDD #note that lexicographic ordering must be heeded. #I.e., 0.4.1-YYYYMMDD must not exist before 0.4.1! -UPDATED="October 10, 2008" +UPDATED="October 26, 2008" AC_SUBST(UPDATED) AC_CONFIG_HEADERS(engine/config.h) @@ -197,6 +197,7 @@ AC_CANONICAL_HOST case "$host_cpu" in arm*) machine=arm + $srcdir/mkinstalldirs arch/arm CFLAGS="$CFLAGS -fomit-frame-pointer" if test x$platform = xnxt; then CFLAGS="$CFLAGS -mthumb -mthumb-interwork" @@ -204,18 +205,18 @@ case "$host_cpu" in if test -z $arm_cacheflush; then case "$host_os" in *linux*) - arm_cacheflush=arch/arm/cacheflush-linux + AC_LIBOBJ(../arch/arm/cacheflush-linux) ;; *) no_dynamic_default=1 - arm_cacheflush=arch/arm/cacheflush0 + AC_LIBOBJ(../arch/arm/cacheflush0) AC_MSG_WARN([No I-cache flush code known, disabling dynamic native code generation]) ;; esac + else + AC_LIBOBJ(../$arm_cacheflush) + test $srcdir = . || AC_MSG_WARN([setting arm_cacheflush requires building in the source directory]) fi - AC_LIBSOURCES([../arch/arm/cacheflush0, dnl - ../arch/arm/cacheflush-linux]) - AC_LIBOBJ(../$arm_cacheflush) #longer skipcodes lead to problems on ARM, and it uses #only 4-byte alignment anyway test "$skipcode" || skipcode="nop" @@ -531,7 +532,7 @@ else fi fi -if grep FORCE_REG arch/$machine/machine.h >/dev/null; then +if grep FORCE_REG $srcdir/arch/$machine/machine.h >/dev/null; then OPTS2='' for i in $OPTS; do OPTS2="$OPTS2 $i-reg"; done OPTS="$OPTS2 $OPTS" @@ -625,7 +626,8 @@ AC_MSG_RESULT($M4) # Find installed Gforth AC_MSG_CHECKING([for gforth]) GFORTH="`cd / && which gforth 2>/dev/null`" -(cd / && $GFORTH -e bye >/dev/null 2>/dev/null) || GFORTH="" +#the "$srcdir" = "." test defends agains the "../" bug in gforth-0.6.2 +(cd / && $GFORTH -e bye >/dev/null 2>/dev/null && test "$srcdir" = ".") || GFORTH="" if test -z "$GFORTH"; then PREFORTH='echo "You need to configure with a gforth in \$PATH to build this part" && false' kernel_anti_dependence='' @@ -821,6 +823,14 @@ AC_CHECK_PROGS(TEXI2DVI,texi2dvi4a2ps te dnl MacOS X has a libtool that does something else AC_CHECK_PROGS(GNU_LIBTOOL,glibtool libtool) +if test -n "$GNU_LIBTOOL"; then + build_libcc_named=build-libcc-named +else + build_libcc_named="" +fi +AC_SUBST(build_libcc_named) + + dnl Checks for library functions dnl This check is just for making later checks link with libm. dnl using sin here is no good idea since it is built-into gcc and typechecked @@ -907,6 +917,7 @@ chmod +x vmgen chmod +x build-ec chmod +x preforth test -d kernel||mkdir kernel +if test $srcdir != "."; then ln -sf $srcdir/gforth.el .; fi $srcdir/mkinstalldirs include/gforth/$PACKAGE_VERSION ln -sf ../../../engine/config.h ../../../engine/libcc.h include/gforth/$PACKAGE_VERSION]],[[PACKAGE_VERSION=$PACKAGE_VERSION]]) AC_OUTPUT