AC_TYPE_MODE_T
AC_CHECK_LIB(m, main)
-AC_CHECK_FUNC(gethostbyname)
+AC_CHECK_FUNCS(gethostbyname)
if test $ac_cv_func_gethostbyname = no; then
AC_CHECK_LIB(nsl, gethostbyname)
fi
-AC_CHECK_FUNC(connect)
+AC_CHECK_FUNCS(connect)
if test $ac_cv_func_connect = no; then
AC_CHECK_LIB(socket, connect)
fi
AC_CHECK_LIB(termcap, tgoto)
AC_CHECK_LIB(readline, readline)
+AC_CHECK_FUNCS(rl_getc_function rl_clear_signals rl_cleanup_after_signal)
+if test $ac_cv_lib_readline_readline = yes -a $ac_cv_func_rl_getc_function = no; then
+ echo 'Warning: libreadline is too old on your system. Need >= 2.1.'
+fi
# Checks for dynamic linking
AC_CHECK_LIB(dl,dlopen)
if test "$ac_cv_lib_dl_dlopen" = "yes"; then
- AC_CHECK_FUNC(dlopen)
+ AC_CHECK_FUNCS(dlopen)
AC_DEFINE(DYNAMIC_LINKING)
else
AC_CHECK_LIB(dld,dld_link)
if test "$ac_cv_lib_dld_dld_link" = "yes"; then
AC_DEFINE(DYNAMIC_LINKING)
else
-AC_CHECK_FUNC(shl_load)
+AC_CHECK_FUNCS(shl_load)
if test "$ac_cv_func_shl_load" = "yes"; then
AC_DEFINE(DYNAMIC_LINKING)
else
-AC_CHECK_FUNC(dlopen)
+AC_CHECK_FUNCS(dlopen)
if test "$ac_cv_func_dlopen" = "yes"; then
AC_DEFINE(DYNAMIC_LINKING)
fi
GUILE_DLSYM_USCORE
-AC_CHECK_FUNCS(ctermid ftime getcwd geteuid gethostent gettimeofday lstat mkdir mknod nice readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction strftime strptime symlink sync tcgetpgrp tcsetpgrp times uname waitpid bzero system usleep)
+AC_CHECK_FUNCS(ctermid ftime getcwd geteuid gethostent gettimeofday lstat mkdir mknod nice readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction strftime strptime symlink sync tcgetpgrp tcsetpgrp times uname waitpid bzero strdup system usleep)
# Determine the host we are working on
AC_CANONICAL_HOST
;;
esac
+# On some systems usleep has no return value
+AC_EGREP_HEADER(changequote(<, >)<void[ ][ ]*usleep>changequote([, ]),
+ /usr/include/unistd.h,
+ AC_DEFINE(USLEEP_RETURNS_VOID)
+)
+
+
dnl <GNU-WIN32 hacks>
AC_CHECK_HEADER(sys/un.h, have_sys_un_h=1)
#
#--------------------------------------------------------------------
-CY_AC_WITH_THREADS
-CFLAGS="$CFLAGS $cy_cv_threads_cflags"
-THREAD_LIBS="$cy_cv_threads_libs"
-AC_SUBST(THREAD_LIBS)
+### What thread package has the user asked for?
+AC_ARG_WITH(threads, [ --with-threads thread interface],
+ , with_threads=no)
-dnl
-dnl Set the appropriate flags!
-dnl
-if test "$cy_cv_threads_package" = FSU; then
- AC_DEFINE(USE_FSU_PTHREADS, 1)
- else if test "$cy_cv_threads_package" = COOP; then
- AC_DEFINE(USE_COOP_THREADS, 1)
- else if test "$cy_cv_threads_package" = MIT; then
- AC_DEFINE(USE_MIT_PTHREADS, 1)
- else if test "$cy_cv_threads_package" = PCthreads; then
- AC_DEFINE(USE_PCTHREADS_PTHREADS, 1)
- else if test "$cy_cv_threads_package" = unknown; then
- AC_MSG_ERROR("cannot find threads installation")
- fi
- fi
- fi
- fi
-fi
+### Turn $with_threads into either the name of a threads package, like
+### `qt', or `no', meaning that threads should not be supported.
+AC_MSG_CHECKING(whether to support threads)
+case "$with_threads" in
+ "yes" | "qt" | "coop" | "")
+ with_threads=qt
+ ;;
+ "no" )
+ ;;
+ * )
+ AC_MSG_ERROR(invalid value for --with-threads: $with_threads)
+ ;;
+esac
+AC_MSG_RESULT($with_threads)
+
+## Make sure the threads package we've chosen is actually supported on
+## the present platform.
+case "${with_threads}" in
+ "qt" )
+ ## This configures the QuickThreads package, and sets or clears
+ ## the THREAD_PACKAGE variable if qthreads don't configure
+ ## correctly.
+ QTHREADS_CONFIGURE
+ ;;
+esac
-if test "$cy_cv_threads_package" != ""; then
- AC_DEFINE(USE_THREADS)
- LIBOBJS="$LIBOBJS threads.o"
-fi
+## If we're using threads, bring in some other parts of Guile which
+## work with them.
+if test "${THREAD_PACKAGE}" != "" ; then
+ AC_DEFINE(USE_THREADS, 1)
-#--------------------------------------------------------------------
-#
-# scm_internal_select
-#
-#--------------------------------------------------------------------
+ ## Include the Guile thread interface in the library...
+ LIBOBJS="$LIBOBJS threads.o"
-if test "$cy_cv_threads_package" != "" &&
- test $ac_cv_func_gettimeofday = yes &&
- test $ac_cv_func_select = yes; then
- AC_DEFINE(GUILE_ISELECT, 1)
- LIBOBJS="$LIBOBJS iselect.o"
+ ## ... and tell it which package to talk to.
+ case "${THREAD_PACKAGE}" in
+ "QT" )
+ AC_DEFINE(USE_COOP_THREADS, 1)
+ ;;
+ * )
+ AC_MSG_ERROR(invalid value for THREAD_PACKAGE: ${THREAD_PACKAGE})
+ ;;
+ esac
+
+ ## Bring in scm_internal_select, if appropriate.
+ if test $ac_cv_func_gettimeofday = yes &&
+ test $ac_cv_func_select = yes; then
+ LIBOBJS="$LIBOBJS iselect.o"
+ AC_DEFINE(GUILE_ISELECT, 1)
+ fi
fi
## If we're using GCC, ask for aggressive warnings.
AC_SUBST(GUILE_MAJOR_VERSION)
AC_SUBST(GUILE_MINOR_VERSION)
AC_SUBST(GUILE_VERSION)
-GUILE_LIBS="$LDFLAGS $THREAD_LIBS $LIBS"
+
+dnl Tell build-guile what flags guile users should link against.
+GUILE_LIBS="$LDFLAGS $THREAD_LIBS_INSTALLED $LIBS"
AC_SUBST(GUILE_LIBS)
dnl timestamping the interpreter and scheme libraries:
AC_SUBST(AWK)
AC_SUBST(LIBLOBJS)
-
-dnl ======================================================================
-dnl configuration for the Qt package
-dnl ======================================================================
-
-threads_enabled=false
-if test "$cy_cv_threads_package" = COOP; then
- threads_enabled=true
-fi
-
-# How can we refer to the qt source directory from within the qt build
-# directory? For headers, we can rely on the fact that the qt src
-# directory appears in the #include path.
-
-qtsrcdir="`(cd $srcdir; pwd)`/qt"
-
-changequote(,)dnl We use [ and ] in a regexp in the case
-case "$host" in
-i[3456]86-*-*)
- qtmds_s=$qtsrcdir/md/i386.s
- qtmd_h=md/i386.h
- qtmdc_c=$qtsrcdir/md/null.c
- ;;
-mips-sgi-irix[56]*)
- qtmds_s=$qtsrcdir/md/mips-irix5.s
- qtmd_h=md/mips.h
- qtmdc_c=$qtsrcdir/md/null.c
- qtdmdb_s=$qtsrcdir/md/mips_b.s
- ;;
-mips-*-*)
- qtmds_s=$qtsrcdir/md/mips.s
- qtmd_h=md/mips.h
- qtmdc_c=$qtsrcdir/md/null.c
- qtdmdb_s=$qtsrcdir/md/mips_b.s
- ;;
-sparc-*-sunos*)
- qtmd_h=md/sparc.h
- qtmdc_c=$qtsrcdir/md/null.c
- qtmds_s=$qtsrcdir/md/_sparc.s
- qtdmdb_s=$qtsrcdir/md/_sparc_b.s
- ;;
-sparc-*-*)
- qtmd_h=md/sparc.h
- qtmdc_c=$qtsrcdir/md/null.c
- qtmds_s=$qtsrcdir/md/sparc.s
- qtdmdb_s=$qtsrcdir/md/sparc_b.s
- ;;
-alpha-*-*)
- qtmd_h=md/axp.h
- qtmdc_c=$qtsrcdir/md/null.c
- qtmds_s=$qtsrcdir/md/axp.s
- qtdmdb_s=$qtsrcdir/md/axp_b.s
- ;;
-*)
- echo "Unknown configuration; threads package disabled"
- threads_enabled=false
- ;;
-esac
-changequote([, ])
-
-
-if $threads_enabled; then
- target_libs=libqthreads.a
-else
- target_libs=
-fi
-
-# Give the Makefile the names of the object files that will be
-# generated by compiling $qtmdc_c and $qtmds_s.
-qtmdc_o="`echo ${qtmdc_c} | sed -e 's:^.*/::' | sed -e 's:\.c$:\.o:'`"
-qtmds_o="`echo ${qtmds_s} | sed -e 's:^.*/::' | sed -e 's:\.s$:\.o:'`"
-
-AC_SUBST(target_libs)
-AC_SUBST(qtmd_h)
-AC_SUBST(qtmdc_c)
-AC_SUBST(qtmdc_o)
-AC_SUBST(qtmds_s)
-AC_SUBST(qtmds_o)
-AC_SUBST(qtmdb_s)
-
AC_OUTPUT([Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile build/Makefile], [chmod +x libguile/guile-snarf])
dnl Local Variables:
HCoop / bpt / guile.git / blobdiff