mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-10 05:50:26 +02:00
completing changes to gh_repl and uniform array stuff
This commit is contained in:
Mark Galassi
parent
ef5d3ae175
commit
5aadf8c195
7 changed files with 693 additions and 225 deletions
194
aclocal.m4
vendored
194
aclocal.m4
vendored
|
|
@ -1,4 +1,14 @@
|
|||
dnl aclocal.m4 generated automatically by aclocal 1.2
|
||||
dnl aclocal.m4 generated automatically by aclocal 1.2c
|
||||
|
||||
dnl Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
|
||||
dnl This Makefile.in is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
||||
dnl This program is distributed in the hope that it will be useful,
|
||||
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
||||
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
dnl PARTICULAR PURPOSE.
|
||||
|
||||
dnl On the NeXT, #including <utime.h> doesn't give you a definition for
|
||||
dnl struct utime, unless you #define _POSIX_SOURCE.
|
||||
|
|
@ -136,7 +146,8 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY);
|
|||
if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
|
||||
if(ptr1 && !ptr2) exit(0); } exit(1); }
|
||||
], [guile_cv_dlsym_adds_uscore=yes
|
||||
AC_DEFINE(DLSYM_ADDS_USCORE) ], guile_cv_dlsym_adds_uscore=no))
|
||||
AC_DEFINE(DLSYM_ADDS_USCORE) ], guile_cv_dlsym_adds_uscore=no,
|
||||
guile_cv_dlsym_adds_uscore=no))
|
||||
|
||||
AC_MSG_RESULT($guile_cv_dlsym_adds_uscore)
|
||||
fi
|
||||
|
|
@ -201,7 +212,7 @@ echo timestamp > conftestfile
|
|||
# directory).
|
||||
if (
|
||||
set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
|
||||
if test "$@" = "X"; then
|
||||
if test "[$]*" = "X"; then
|
||||
# -L didn't work.
|
||||
set X `ls -t $srcdir/configure conftestfile`
|
||||
fi
|
||||
|
|
@ -279,6 +290,179 @@ for am_file in <<$1>>; do
|
|||
done<<>>dnl>>)
|
||||
changequote([,]))])
|
||||
|
||||
|
||||
# serial 14 AM_PROG_LIBTOOL
|
||||
AC_DEFUN(AM_PROG_LIBTOOL,
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
AC_REQUIRE([AC_PROG_RANLIB])
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
AC_REQUIRE([AM_PROG_LD])
|
||||
AC_REQUIRE([AM_PROG_NM])
|
||||
AC_REQUIRE([AC_PROG_LN_S])
|
||||
|
||||
# Always use our own libtool.
|
||||
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
AC_SUBST(LIBTOOL)
|
||||
|
||||
dnl Allow the --disable-shared flag to stop us from building shared libs.
|
||||
AC_ARG_ENABLE(shared,
|
||||
[ --enable-shared build shared libraries [default=yes]],
|
||||
[if test "$enableval" = no; then
|
||||
enable_shared=no
|
||||
else
|
||||
enable_shared=yes
|
||||
fi])
|
||||
libtool_shared=
|
||||
test "$enable_shared" = no && libtool_shared=" --disable-shared"
|
||||
|
||||
dnl Allow the --disable-static flag to stop us from building static libs.
|
||||
AC_ARG_ENABLE(static,
|
||||
[ --enable-static build static libraries [default=yes]],
|
||||
[if test "$enableval" = no; then
|
||||
enable_static=no
|
||||
else
|
||||
enable_static=yes
|
||||
fi])
|
||||
libtool_static=
|
||||
test "$enable_static" = no && libtool_static=" --disable-static"
|
||||
|
||||
libtool_flags="$libtool_shared$libtool_static"
|
||||
test "$silent" = yes && libtool_flags="$libtool_flags --silent"
|
||||
test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
|
||||
test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
|
||||
|
||||
# Some flags need to be propagated to the compiler or linker for good
|
||||
# libtool support.
|
||||
[case "$host" in
|
||||
*-*-irix6*)
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
# -n32 always needs to be added to the linker when using GCC.
|
||||
test "$ac_cv_prog_gcc" = yes && CFLAGS="$CFLAGS -n32"
|
||||
for f in '-32' '-64' '-cckr' '-n32' '-mips1' '-mips2' '-mips3' '-mips4'; do
|
||||
if echo " $CC $CFLAGS " | egrep -e "[ ]$f[ ]" > /dev/null; then
|
||||
LD="${LD-ld} $f"
|
||||
fi
|
||||
done
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
;;
|
||||
|
||||
*-*-sco3.2v5*)
|
||||
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
|
||||
CFLAGS="$CFLAGS -belf"
|
||||
;;
|
||||
esac]
|
||||
|
||||
# Actually configure libtool. ac_aux_dir is where install-sh is found.
|
||||
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
|
||||
LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
|
||||
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
|
||||
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|
||||
|| AC_MSG_ERROR([libtool configure failed])
|
||||
])
|
||||
|
||||
# AM_PROG_LD - find the path to the GNU or non-GNU linker
|
||||
AC_DEFUN(AM_PROG_LD,
|
||||
[AC_ARG_WITH(gnu-ld,
|
||||
[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
|
||||
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
ac_prog=ld
|
||||
if test "$ac_cv_prog_gcc" = yes; then
|
||||
# Check if gcc -print-prog-name=ld gives a path.
|
||||
AC_MSG_CHECKING([for ld used by GCC])
|
||||
ac_prog=`($CC -print-prog-name=ld) 2>&5`
|
||||
case "$ac_prog" in
|
||||
# Accept absolute paths.
|
||||
/*) ;;
|
||||
"")
|
||||
# If it fails, then pretend we aren't using GCC.
|
||||
ac_prog=ld
|
||||
;;
|
||||
*)
|
||||
# If it is relative, then search for the first ld in PATH.
|
||||
with_gnu_ld=unknown
|
||||
;;
|
||||
esac
|
||||
elif test "$with_gnu_ld" = yes; then
|
||||
AC_MSG_CHECKING([for GNU ld])
|
||||
else
|
||||
AC_MSG_CHECKING([for non-GNU ld])
|
||||
fi
|
||||
AC_CACHE_VAL(ac_cv_path_LD,
|
||||
[if test -z "$LD"; then
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
||||
for ac_dir in $PATH; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f "$ac_dir/$ac_prog"; then
|
||||
ac_cv_path_LD="$ac_dir/$ac_prog"
|
||||
# Check to see if the program is GNU ld. I'd rather use --version,
|
||||
# but apparently some GNU ld's only accept -v.
|
||||
# Break only if it was the GNU/non-GNU ld that we prefer.
|
||||
if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
|
||||
test "$with_gnu_ld" != no && break
|
||||
else
|
||||
test "$with_gnu_ld" != yes && break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
else
|
||||
ac_cv_path_LD="$LD" # Let the user override the test with a path.
|
||||
fi])
|
||||
LD="$ac_cv_path_LD"
|
||||
if test -n "$LD"; then
|
||||
AC_MSG_RESULT($LD)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
||||
AC_SUBST(LD)
|
||||
AM_PROG_LD_GNU
|
||||
])
|
||||
|
||||
AC_DEFUN(AM_PROG_LD_GNU,
|
||||
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
|
||||
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
||||
if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
|
||||
ac_cv_prog_gnu_ld=yes
|
||||
else
|
||||
ac_cv_prog_gnu_ld=no
|
||||
fi])
|
||||
])
|
||||
|
||||
# AM_PROG_NM - find the path to a BSD-compatible name lister
|
||||
AC_DEFUN(AM_PROG_NM,
|
||||
[AC_MSG_CHECKING([for BSD-compatible nm])
|
||||
AC_CACHE_VAL(ac_cv_path_NM,
|
||||
[case "$NM" in
|
||||
/*)
|
||||
ac_cv_path_NM="$NM" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
||||
for ac_dir in /usr/ucb $PATH /bin; do
|
||||
test -z "$ac_dir" && dir=.
|
||||
if test -f $ac_dir/nm; then
|
||||
# Check to see if the nm accepts a BSD-compat flag.
|
||||
if ($ac_dir/nm -B /dev/null 2>&1; exit 0) | grep /dev/null >/dev/null; then
|
||||
ac_cv_path_NM="$ac_dir/nm -B"
|
||||
elif ($ac_dir/nm -p /dev/null 2>&1; exit 0) | grep /dev/null >/dev/null; then
|
||||
ac_cv_path_NM="$ac_dir/nm -p"
|
||||
else
|
||||
ac_cv_path_NM="$ac_dir/nm"
|
||||
fi
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
|
||||
;;
|
||||
esac])
|
||||
NM="$ac_cv_path_NM"
|
||||
AC_MSG_RESULT([$NM])
|
||||
AC_SUBST(NM)
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl CY_AC_WITH_THREADS determines which thread library the user intends
|
||||
dnl to put underneath guile. Pass it the path to find the guile top-level
|
||||
|
|
@ -306,14 +490,14 @@ dnl
|
|||
qtsrcdir="`(cd $srcdir; pwd)`/qt"
|
||||
threads_package=COOP
|
||||
cy_cv_threads_cflags="-I$qtsrcdir -I../qt"
|
||||
cy_cv_threads_libs="../qt/libqt.a"
|
||||
cy_cv_threads_libs="../qt/libqthreads.a"
|
||||
fi
|
||||
else
|
||||
if test -f $use_threads/qt.c; then
|
||||
# FIXME seems as though we should try to use an installed qt here.
|
||||
threads_package=COOP
|
||||
cy_cv_threads_cflags="-I$use_threads -I../qt"
|
||||
cy_cv_threads_libs="../qt/libqt.a"
|
||||
cy_cv_threads_libs="../qt/libqthreads.a"
|
||||
fi
|
||||
fi
|
||||
if test "$use_threads" = pthreads; then
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
1997-11-25 Mark Galassi <rosalia@cygnus.com>
|
||||
|
||||
* gh_test_repl.c (main_prog): changed invocation of gh_repl() to
|
||||
gh_repl (argc, argv).
|
||||
|
||||
1997-11-24 Mark Galassi <rosalia@nis.lanl.gov>
|
||||
|
||||
* gh_init.c (gh_repl): modified gh_repl() to accept argc and argv
|
||||
|
|
@ -6,6 +11,11 @@
|
|||
since it is probably best to let the user control that. In fact,
|
||||
gh_repl() now invokes scm_shell() which does that.
|
||||
|
||||
1997-11-23 Mark Galassi <rosalia@cygnus.com>
|
||||
|
||||
* gh_test_repl.c (main_prog): added argc and argv to the gh_repl()
|
||||
invocation.
|
||||
|
||||
1997-11-22 Tim Pierce <twp@twp.tezcat.com>
|
||||
|
||||
* dynl-dl.c (sysdep_dynl_func): Fix memory leak created by
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
#endif /* __GNUC__ */
|
||||
|
||||
void gh_enter(int argc, char *argv[], void (*c_main_prog)());
|
||||
void gh_repl();
|
||||
void gh_repl(int argc, char *argv[]);
|
||||
SCM gh_catch(SCM tag, scm_catch_body_t body, void *body_data,
|
||||
scm_catch_handler_t handler, void *handler_data);
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ gh_launch_pad (void *closure, int argc, char **argv)
|
|||
exit (0);
|
||||
}
|
||||
|
||||
|
||||
/* starts up the Scheme interpreter, and stays in it. c_main_prog()
|
||||
is the address of the user's main program, since gh_enter() never
|
||||
returns. */
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ c_vector_test (SCM s_length)
|
|||
/* create a vector filled witth 0.0 entries */
|
||||
xvec = gh_make_vector (s_length, gh_double2scm (0.0));
|
||||
/* set the second element in it to some floating point value */
|
||||
gh_vector_set (xvec, gh_int2scm(2), gh_double2scm (1.9));
|
||||
gh_vector_set_x (xvec, gh_int2scm(2), gh_double2scm (1.9));
|
||||
|
||||
/* I think I can use == because Scheme's doubles should be the same
|
||||
as C doubles, with no operations in between */
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ main_prog (int argc, char *argv[])
|
|||
gh_procedure_p (cf), gh_vector_p (cf));
|
||||
gh_eval_str("(c-vector-test 200)");
|
||||
|
||||
gh_repl ();
|
||||
gh_repl (argc, argv);
|
||||
}
|
||||
|
||||
int
|
||||
|
|
@ -151,7 +151,7 @@ c_vector_test (SCM s_length)
|
|||
/* create a vector filled witth 0.0 entries */
|
||||
xvec = gh_make_vector (s_length, gh_double2scm (0.0));
|
||||
/* set the second element in it to some floating point value */
|
||||
gh_vector_set (xvec, gh_int2scm(2), gh_double2scm (1.9));
|
||||
gh_vector_set_x (xvec, gh_int2scm(2), gh_double2scm (1.9));
|
||||
|
||||
/* I think I can use == because Scheme's doubles should be the same
|
||||
as C doubles, with no operations in between */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue