mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-04 22:40:25 +02:00
*** empty log message ***
This commit is contained in:
Tim Pierce
parent
0113293e54
commit
db1e65d571
1 changed files with 42 additions and 189 deletions
231
aclocal.m4
vendored
231
aclocal.m4
vendored
|
|
@ -1,14 +1,4 @@
|
||||||
dnl aclocal.m4 generated automatically by aclocal 1.2c
|
dnl aclocal.m4 generated automatically by aclocal 1.2
|
||||||
|
|
||||||
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 On the NeXT, #including <utime.h> doesn't give you a definition for
|
||||||
dnl struct utime, unless you #define _POSIX_SOURCE.
|
dnl struct utime, unless you #define _POSIX_SOURCE.
|
||||||
|
|
@ -115,6 +105,44 @@ ifelse([$4], , , [$4
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
dnl Check checks whether dlsym (if present) requires a leading underscore.
|
||||||
|
dnl Written by Dan Hagerty <hag@ai.mit.edu> for scsh-0.5.0.
|
||||||
|
AC_DEFUN(GUILE_DLSYM_USCORE, [
|
||||||
|
AC_MSG_CHECKING(for underscore before symbols)
|
||||||
|
AC_CACHE_VAL(guile_cv_uscore,[
|
||||||
|
echo "main(){int i=1;}
|
||||||
|
fnord(){int i=23; int ltuae=42;}" > conftest.c
|
||||||
|
${CC} conftest.c > /dev/null
|
||||||
|
if (nm a.out | grep _fnord) > /dev/null; then
|
||||||
|
guile_cv_uscore=yes
|
||||||
|
else
|
||||||
|
guile_cv_uscore=no
|
||||||
|
fi])
|
||||||
|
AC_MSG_RESULT($guile_cv_uscore)
|
||||||
|
rm -f conftest.c a.out
|
||||||
|
|
||||||
|
if test $guile_cv_uscore = yes; then
|
||||||
|
AC_DEFINE(USCORE)
|
||||||
|
|
||||||
|
if test $ac_cv_func_dlopen = yes -o $ac_cv_lib_dl_dlopen = yes ; then
|
||||||
|
AC_MSG_CHECKING(whether dlsym always adds an underscore for us)
|
||||||
|
AC_CACHE_VAL(guile_cv_dlsym_adds_uscore,AC_TRY_RUN( [
|
||||||
|
#include <dlfcn.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
fnord() { int i=42;}
|
||||||
|
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_MSG_RESULT($guile_cv_dlsym_adds_uscore)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
# Do all the work for Automake. This macro actually does too much --
|
# Do all the work for Automake. This macro actually does too much --
|
||||||
# some checks are only needed if your package does certain things.
|
# some checks are only needed if your package does certain things.
|
||||||
# But this isn't really a big deal.
|
# But this isn't really a big deal.
|
||||||
|
|
@ -173,7 +201,7 @@ echo timestamp > conftestfile
|
||||||
# directory).
|
# directory).
|
||||||
if (
|
if (
|
||||||
set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
|
set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
|
||||||
if test "[$]*" = "X"; then
|
if test "$@" = "X"; then
|
||||||
# -L didn't work.
|
# -L didn't work.
|
||||||
set X `ls -t $srcdir/configure conftestfile`
|
set X `ls -t $srcdir/configure conftestfile`
|
||||||
fi
|
fi
|
||||||
|
|
@ -251,181 +279,6 @@ for am_file in <<$1>>; do
|
||||||
done<<>>dnl>>)
|
done<<>>dnl>>)
|
||||||
changequote([,]))])
|
changequote([,]))])
|
||||||
|
|
||||||
|
|
||||||
# serial 15 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.
|
|
||||||
/*)
|
|
||||||
test -z "$LD" && LD="$ac_prog"
|
|
||||||
;;
|
|
||||||
"")
|
|
||||||
# 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
|
||||||
dnl CY_AC_WITH_THREADS determines which thread library the user intends
|
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
|
dnl to put underneath guile. Pass it the path to find the guile top-level
|
||||||
|
|
@ -453,14 +306,14 @@ dnl
|
||||||
qtsrcdir="`(cd $srcdir; pwd)`/qt"
|
qtsrcdir="`(cd $srcdir; pwd)`/qt"
|
||||||
threads_package=COOP
|
threads_package=COOP
|
||||||
cy_cv_threads_cflags="-I$qtsrcdir -I../qt"
|
cy_cv_threads_cflags="-I$qtsrcdir -I../qt"
|
||||||
cy_cv_threads_libs="../qt/libqthreads.a"
|
cy_cv_threads_libs="../qt/libqt.a"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if test -f $use_threads/qt.c; then
|
if test -f $use_threads/qt.c; then
|
||||||
# FIXME seems as though we should try to use an installed qt here.
|
# FIXME seems as though we should try to use an installed qt here.
|
||||||
threads_package=COOP
|
threads_package=COOP
|
||||||
cy_cv_threads_cflags="-I$use_threads -I../qt"
|
cy_cv_threads_cflags="-I$use_threads -I../qt"
|
||||||
cy_cv_threads_libs="../qt/libqthreads.a"
|
cy_cv_threads_libs="../qt/libqt.a"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test "$use_threads" = pthreads; then
|
if test "$use_threads" = pthreads; then
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue