From: Chris Hanson Date: Mon, 21 Jul 2003 03:52:08 +0000 (+0000) Subject: Change configuration files to use autoconf 2.5x. X-Git-Tag: 20090517-FFI~1866 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=69b9a35c45d4dde0d5a7b84c6bf4d4ba24f5c486;p=mit-scheme.git Change configuration files to use autoconf 2.5x. --- diff --git a/v7/src/microcode/acconfig.h b/v7/src/microcode/acconfig.h deleted file mode 100644 index 9ae28ba68..000000000 --- a/v7/src/microcode/acconfig.h +++ /dev/null @@ -1,166 +0,0 @@ -/* -*-C-*- - -$Id: acconfig.h,v 11.8 2003/06/06 19:14:16 cph Exp $ - -Copyright 2002,2001,2003 Massachusetts Institute of Technology - -This file is part of MIT/GNU Scheme. - -MIT/GNU Scheme is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. - -MIT/GNU Scheme is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -USA. - -*/ - -#ifndef SCM_CONFIG_H -#define SCM_CONFIG_H -@TOP@ - -/* Define if RETSIGTYPE is `void'. */ -#undef VOID_SIGNAL_HANDLERS - -/* Define to `short' if doesn't define. */ -#undef nlink_t - -/* Define to `unsigned long' if doesn't define. */ -#undef clock_t - -/* Define to `long' if doesn't define. */ -#undef time_t - -/* Define to `int' if doesn't define. */ -#undef socklen_t - -/* Define to `unsigned char' if doesn't define. */ -#undef cc_t - -/* Define to `short' if doesn't define. */ -#undef speed_t - -/* Define if `struct ltchars' is defined in . */ -#undef HAVE_STRUCT_LTCHARS - -/* Define if `struct sigcontext' is defined in . */ -#undef HAVE_STRUCT_SIGCONTEXT - -/* Define if `struct hostent' has the `h_addr_list' member. */ -#undef HAVE_HOSTENT_H_ADDR_LIST - -/* Define if `struct tm' has the `tm_gmtoff' member. */ -#undef HAVE_TM_GMTOFF - -/* Define to name of `tm_gmtoff' member if HAVE_TM_GMTOFF defined. */ -#undef TM_GMTOFF - -/* Define if global timezone variable is available. */ -#undef HAVE_TIMEZONE - -/* Define to name of global timezone variable if HAVE_TIMEZONE defined. */ -#undef TIMEZONE - -/* Define if architecture has native-code compiler support. */ -#undef HAS_COMPILER_SUPPORT - -/* Define if blowfish library is present. */ -#undef HAVE_LIBBLOWFISH - -/* Define if OpenSSL crypto library is present. */ -#undef HAVE_LIBCRYPTO - -/* Define if curses library is present. */ -#undef HAVE_LIBCURSES - -/* Define if dl library is present. */ -#undef HAVE_LIBDL - -/* Define if gdbm library is present. */ -#undef HAVE_LIBGDBM - -/* Define if md5 library is present. */ -#undef HAVE_LIBMD5 - -/* Define if mcrypt library is present. */ -#undef HAVE_LIBMCRYPT - -/* Define if mhash library is present. */ -#undef HAVE_LIBMHASH - -/* Define if ncurses library is present. */ -#undef HAVE_LIBNCURSES - -/* Define if ncurses library defines `tparam'. */ -#undef LIBNCURSES_DEFINES_TPARAM - -/* Define if termcap library is present. */ -#undef HAVE_LIBTERMCAP - -/* Define if PostgreSQL library is present. */ -#undef HAVE_LIBPQ - -@BOTTOM@ - -#ifndef __unix__ -# define __unix__ -#endif - -#if defined(_IRIX) || defined(_IRIX4) || defined(_IRIX6) -# define __IRIX__ -#endif - -#if defined(__hpux) || defined(hpux) -# define __HPUX__ -#endif - -/* If we're running under GNU libc, turn on all the features. - Otherwise this should be harmless. */ -#define _GNU_SOURCE - -#include - -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -#ifdef HAVE_TERMIOS_H -# include -#else -# ifdef HAVE_TERMIO_H -# include -# endif -#endif - -#ifdef HAVE_SYS_MMAN_H -# include -#endif - -#ifdef HAVE_MMAP -# if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) -# define MAP_ANONYMOUS MAP_ANON -# endif -# ifdef MAP_ANONYMOUS -# define USE_MMAP_HEAP_MALLOC -# endif -#endif - -/* Include the shared configuration header. */ -#include "confshared.h" - -#endif /* SCM_CONFIG_H */ diff --git a/v7/src/microcode/configure.in b/v7/src/microcode/configure.ac similarity index 59% rename from v7/src/microcode/configure.in rename to v7/src/microcode/configure.ac index 52ac923e6..331fe7f75 100644 --- a/v7/src/microcode/configure.in +++ b/v7/src/microcode/configure.ac @@ -1,43 +1,131 @@ dnl Process this file with autoconf to produce a configure script. -dnl Copyright 2000,2002,2003 Massachusetts Institute of Technology -dnl -dnl This file is part of MIT/GNU Scheme. -dnl -dnl MIT/GNU Scheme is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU General Public License as -dnl published by the Free Software Foundation; either version 2 of the -dnl License, or (at your option) any later version. -dnl -dnl MIT/GNU Scheme is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with MIT/GNU Scheme; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -dnl 02111-1307, USA. - -AC_REVISION([$Id: configure.in,v 11.24 2003/06/06 19:14:19 cph Exp $]) -AC_INIT(boot.c) -AC_CONFIG_HEADER(config.h) +AC_INIT([MIT/GNU Scheme], [14.11], [bug-mit-scheme@gnu.org], [mit-scheme]) +AC_REVISION([$Id: configure.ac,v 1.1 2003/07/21 03:52:08 cph Exp $]) +AC_CONFIG_SRCDIR([boot.c]) +AC_CONFIG_HEADERS([config.h]) +AC_PROG_MAKE_SET + +AC_COPYRIGHT( +[Copyright 2000,2002,2003 Massachusetts Institute of Technology + +This file is part of MIT/GNU Scheme. + +MIT/GNU Scheme is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or (at +your option) any later version. + +MIT/GNU Scheme is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with MIT/GNU Scheme; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +USA. +]) + +AH_TOP([/* + +Copyright 2000,2002,2003 Massachusetts Institute of Technology + +This file is part of MIT/GNU Scheme. + +MIT/GNU Scheme is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or (at +your option) any later version. + +MIT/GNU Scheme is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with MIT/GNU Scheme; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +USA. + +*/ + +#ifndef SCM_CONFIG_H +#define SCM_CONFIG_H]) + +AH_BOTTOM( +[#ifndef __unix__ +# define __unix__ +#endif + +#if defined(_IRIX) || defined(_IRIX4) || defined(_IRIX6) +# define __IRIX__ +#endif + +#if defined(__hpux) || defined(hpux) +# define __HPUX__ +#endif + +/* If we're running under GNU libc, turn on all the features. + Otherwise this should be harmless. */ +#define _GNU_SOURCE + +#include + +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + +#ifdef HAVE_TERMIOS_H +# include +#else +# ifdef HAVE_TERMIO_H +# include +# endif +#endif + +#ifdef HAVE_SYS_MMAN_H +# include +#endif + +#ifdef HAVE_MMAP +# if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) +# define MAP_ANONYMOUS MAP_ANON +# endif +# ifdef MAP_ANONYMOUS +# define USE_MMAP_HEAP_MALLOC +# endif +#endif + +/* Include the shared configuration header. */ +#include "confshared.h" + +#endif /* SCM_CONFIG_H */]) dnl Feature options. -AC_ARG_ENABLE(static-libs, -[ --enable-static-libs Link some libraries statically [no]]) -AC_ARG_ENABLE(dynamic-crypto, -[ --enable-dynamic-crypto Link crypto primitives dynamically [yes]]) -AC_ARG_ENABLE(valgrind-mode, -[ --enable-valgrind-mode Support running under valgrind [no]]) -AC_ARG_WITH(openssl, -[ --with-openssl Use the OpenSSL crypto library if available [yes]]) -AC_ARG_WITH(mhash, -[ --with-mhash Use the mhash library if available [yes]]) -AC_ARG_WITH(mcrypt, -[ --with-mcrypt Use the mcrypt library if available [yes]]) -AC_ARG_WITH(libpq, -[ --with-libpq Use the PostgreSQL libpq library if available [yes]]) +AC_ARG_ENABLE([static-libs], +[[ --enable-static-libs Link some libraries statically [no]]]) +AC_ARG_ENABLE([dynamic-modules], +[[ --enable-dynamic-modules Link some primitives dynamically [yes]]]) +AC_ARG_ENABLE([valgrind-mode], +[[ --enable-valgrind-mode Support running under valgrind [no]]]) +AC_ARG_WITH([openssl], +[[ --with-openssl Use OpenSSL crypto library if available [yes]]]) +AC_ARG_WITH([mhash], +[[ --with-mhash Use mhash library if available [yes]]]) +AC_ARG_WITH([mcrypt], +[[ --with-mcrypt Use mcrypt library if available [yes]]]) +AC_ARG_WITH([gdbm], +[[ --with-gdbm Use gdbm library if available [yes]]]) +AC_ARG_WITH([libpq], +[[ --with-libpq Use PostgreSQL libpq library if available [yes]]]) dnl Substitution variables to be filled in below. AS_FLAGS= @@ -74,41 +162,41 @@ then fi dnl Checks for libraries. -AC_CHECK_LIB(dl, dlopen) -AC_CHECK_LIB(m, exp) +AC_CHECK_LIB([dl], [dlopen]) +AC_CHECK_LIB([m], [exp]) -AC_CHECK_LIB(crypto, BF_set_key, +AC_CHECK_LIB([crypto], [BF_set_key], [scheme_cv_lib_crypto=yes], [scheme_cv_lib_crypto=no]) -AC_CHECK_LIB(mhash, mhash_count, +AC_CHECK_LIB([mhash], [mhash_count], [scheme_cv_lib_mhash=yes], [scheme_cv_lib_mhash=no]) -AC_CHECK_LIB(mcrypt, mcrypt_generic_init, +AC_CHECK_LIB([mcrypt], [mcrypt_generic_init], [scheme_cv_lib_mcrypt=yes], [scheme_cv_lib_mcrypt=no], [-lltdl]) -AC_CHECK_LIB(blowfish, BF_set_key, +AC_CHECK_LIB([blowfish], [BF_set_key], [scheme_cv_lib_blowfish=yes], [scheme_cv_lib_blowfish=no]) -AC_CHECK_LIB(md5, MD5Init, +AC_CHECK_LIB([md5], [MD5Init], [scheme_cv_lib_md5=yes], [scheme_cv_lib_md5=no]) -AC_CHECK_LIB(gdbm, gdbm_open, +AC_CHECK_LIB([gdbm], [gdbm_open], [scheme_cv_lib_gdbm=yes], [scheme_cv_lib_gdbm=no]) -AC_CHECK_LIB(ncurses, tparm, +AC_CHECK_LIB([ncurses], [tparm], [scheme_cv_lib_ncurses=yes], [scheme_cv_lib_ncurses=no]) -AC_CHECK_LIB(ncurses, tparam, +AC_CHECK_LIB([ncurses], [tparam], [scheme_cv_lib_ncurses_defines_tparam=yes], [scheme_cv_lib_ncurses_defines_tparam=no]) -AC_CHECK_LIB(curses, tparm, +AC_CHECK_LIB([curses], [tparm], [scheme_cv_lib_curses=yes], [scheme_cv_lib_curses=no]) -AC_CHECK_LIB(termcap, tparam, +AC_CHECK_LIB([termcap], [tparam], [scheme_cv_lib_termcap=yes], [scheme_cv_lib_termcap=no]) -AC_CHECK_LIB(pq, PQconnectdb, +AC_CHECK_LIB([pq], [PQconnectdb], [scheme_cv_lib_pq=yes], [scheme_cv_lib_pq=no]) @@ -117,13 +205,13 @@ AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_TIME -AC_CHECK_HEADERS(bsdtty.h fcntl.h limits.h malloc.h sgtty.h stropts.h time.h) -AC_CHECK_HEADERS(sys/file.h sys/ioctl.h sys/mount.h sys/param.h sys/poll.h) -AC_CHECK_HEADERS(sys/ptyio.h sys/socket.h sys/time.h sys/un.h sys/vfs.h) -AC_CHECK_HEADERS(stdbool.h termio.h termios.h unistd.h utime.h) -AC_CHECK_HEADERS(openssl/blowfish.h openssl/md5.h blowfish.h md5.h) -AC_CHECK_HEADERS(mhash.h mcrypt.h gdbm.h curses.h term.h dlfcn.h sys/mman.h) -AC_CHECK_HEADERS(postgresql/libpq-fe.h) +AC_CHECK_HEADERS([bsdtty.h fcntl.h limits.h malloc.h sgtty.h stropts.h time.h]) +AC_CHECK_HEADERS([sys/file.h sys/ioctl.h sys/mount.h sys/param.h sys/poll.h]) +AC_CHECK_HEADERS([sys/ptyio.h sys/socket.h sys/time.h sys/un.h sys/vfs.h]) +AC_CHECK_HEADERS([stdbool.h termio.h termios.h unistd.h utime.h]) +AC_CHECK_HEADERS([openssl/blowfish.h openssl/md5.h blowfish.h md5.h]) +AC_CHECK_HEADERS([mhash.h mcrypt.h gdbm.h curses.h term.h dlfcn.h sys/mman.h]) +AC_CHECK_HEADERS([postgresql/libpq-fe.h]) dnl Checks for typedefs AC_TYPE_MODE_T @@ -132,7 +220,7 @@ AC_TYPE_PID_T AC_TYPE_SIGNAL AC_TYPE_SIZE_T AC_TYPE_UID_T -AC_CHECK_TYPE(nlink_t, short) +AC_CHECK_TYPE([nlink_t], [short]) AC_MSG_CHECKING([for clock_t]) AC_TRY_COMPILE([ @@ -151,7 +239,8 @@ AC_TRY_COMPILE([ [scheme_cv_type_clock_t=no]) AC_MSG_RESULT(${scheme_cv_type_clock_t}) if test "${scheme_cv_type_clock_t}" = "no"; then - AC_DEFINE(clock_t, unsigned long) + AC_DEFINE([clock_t], [unsigned long], + [Define to `unsigned long' if doesn't define.]) fi AC_MSG_CHECKING([for time_t]) @@ -171,7 +260,8 @@ AC_TRY_COMPILE([ [scheme_cv_type_time_t=no]) AC_MSG_RESULT(${scheme_cv_type_time_t}) if test "${scheme_cv_type_time_t}" = "no"; then - AC_DEFINE(time_t, long) + AC_DEFINE([time_t], [long], + [Define to `long' if doesn't define.]) fi if test "${ac_cv_header_sys_socket_h}" = "yes"; then @@ -184,7 +274,8 @@ if test "${ac_cv_header_sys_socket_h}" = "yes"; then [scheme_cv_type_socklen_t=no]) AC_MSG_RESULT(${scheme_cv_type_socklen_t}) if test "${scheme_cv_type_socklen_t}" = "no"; then - AC_DEFINE(socklen_t, int) + AC_DEFINE([socklen_t], [int], + [Define to `int' if doesn't define.]) fi fi @@ -202,7 +293,8 @@ AC_TRY_COMPILE([ [scheme_cv_type_cc_t=no]) AC_MSG_RESULT(${scheme_cv_type_cc_t}) if test "${scheme_cv_type_cc_t}" = "no"; then - AC_DEFINE(cc_t, unsigned char) + AC_DEFINE([cc_t], [unsigned char], + [Define to `unsigned char' if doesn't define.]) fi AC_MSG_CHECKING([for speed_t]) @@ -219,7 +311,8 @@ AC_TRY_COMPILE([ [scheme_cv_type_speed_t=no]) AC_MSG_RESULT(${scheme_cv_type_speed_t}) if test "${scheme_cv_type_speed_t}" = "no"; then - AC_DEFINE(speed_t, short) + AC_DEFINE([speed_t], [short], + [Define to `short' if doesn't define.]) fi dnl Checks for structures. @@ -239,8 +332,10 @@ if test "${have_timezone_info}" = "no"; then [scheme_cv_struct_tm_gmtoff=no]) AC_MSG_RESULT(${scheme_cv_struct_tm_gmtoff}) if test "${scheme_cv_struct_tm_gmtoff}" = "yes"; then - AC_DEFINE(HAVE_TM_GMTOFF) - AC_DEFINE(TM_GMTOFF, tm_gmtoff) + AC_DEFINE([HAVE_TM_GMTOFF], [1], + [Define if `struct tm' has the `tm_gmtoff' member.]) + AC_DEFINE([TM_GMTOFF], [tm_gmtoff], + [Define to name of `tm_gmtoff' member if available.]) have_timezone_info=yes fi fi @@ -254,8 +349,10 @@ if test "${have_timezone_info}" = "no"; then [scheme_cv_struct___tm_gmtoff=no]) AC_MSG_RESULT(${scheme_cv_struct___tm_gmtoff}) if test "${scheme_cv_struct___tm_gmtoff}" = "yes"; then - AC_DEFINE(HAVE_TM_GMTOFF) - AC_DEFINE(TM_GMTOFF, __tm_gmtoff) + AC_DEFINE([HAVE_TM_GMTOFF], [1], + [Define if `struct tm' has the `tm_gmtoff' member.]) + AC_DEFINE([TM_GMTOFF], [__tm_gmtoff], + [Define to name of `tm_gmtoff' member if available.]) have_timezone_info=yes fi fi @@ -278,8 +375,10 @@ if test "${have_timezone_info}" = "no"; then [scheme_cv_var___timezone=no]) AC_MSG_RESULT(${scheme_cv_var___timezone}) if test "${scheme_cv_var___timezone}" = "yes"; then - AC_DEFINE(HAVE_TIMEZONE) - AC_DEFINE(TIMEZONE, __timezone) + AC_DEFINE([HAVE_TIMEZONE], [1], + [Define if timezone variable is available.]) + AC_DEFINE([TIMEZONE], [__timezone], + [Define to name of timezone variable if available.]) have_timezone_info=yes fi fi @@ -302,8 +401,10 @@ if test "${have_timezone_info}" = "no"; then [scheme_cv_var__timezone=no]) AC_MSG_RESULT(${scheme_cv_var__timezone}) if test "${scheme_cv_var__timezone}" = "yes"; then - AC_DEFINE(HAVE_TIMEZONE) - AC_DEFINE(TIMEZONE, _timezone) + AC_DEFINE([HAVE_TIMEZONE], [1], + [Define if timezone variable is available.]) + AC_DEFINE([TIMEZONE], [_timezone], + [Define to name of timezone variable if available.]) have_timezone_info=yes fi fi @@ -326,8 +427,10 @@ if test "${have_timezone_info}" = "no"; then [scheme_cv_var_timezone=no]) AC_MSG_RESULT(${scheme_cv_var_timezone}) if test "${scheme_cv_var_timezone}" = "yes"; then - AC_DEFINE(HAVE_TIMEZONE) - AC_DEFINE(TIMEZONE, timezone) + AC_DEFINE([HAVE_TIMEZONE], [1], + [Define if timezone variable is available.]) + AC_DEFINE([TIMEZONE], [timezone], + [Define to name of timezone variable if available.]) have_timezone_info=yes fi fi @@ -341,7 +444,8 @@ if test "${ac_cv_header_bsdtty_h}" = "yes"; then [scheme_cv_struct_ltchars=no]) AC_MSG_RESULT(${scheme_cv_struct_ltchars}) if test "${scheme_cv_struct_ltchars}" = "yes"; then - AC_DEFINE(HAVE_STRUCT_LTCHARS) + AC_DEFINE([HAVE_STRUCT_LTCHARS], [1], + [Define if `struct ltchars' is defined in .]) fi fi @@ -353,7 +457,8 @@ AC_TRY_COMPILE( [scheme_cv_struct_hostent_h_addr_list=no]) AC_MSG_RESULT(${scheme_cv_struct_hostent_h_addr_list}) if test "${scheme_cv_struct_hostent_h_addr_list}" = "yes"; then - AC_DEFINE(HAVE_HOSTENT_H_ADDR_LIST) + AC_DEFINE([HAVE_HOSTENT_H_ADDR_LIST], [1], + [Define if `struct hostent' has the `h_addr_list' member.]) fi AC_MSG_CHECKING([for struct sigcontext]) @@ -364,14 +469,15 @@ AC_TRY_COMPILE( [scheme_cv_struct_sigcontext=no]) AC_MSG_RESULT(${scheme_cv_struct_sigcontext}) if test "${scheme_cv_struct_sigcontext}" = "yes"; then - AC_DEFINE(HAVE_STRUCT_SIGCONTEXT) + AC_DEFINE([HAVE_STRUCT_SIGCONTEXT], [1], + [Define if `struct sigcontext' is defined in .]) fi dnl Checks for compiler characteristics. AC_C_BIGENDIAN AC_C_CHAR_UNSIGNED AC_C_CONST -AC_CHECK_SIZEOF(unsigned long) +AC_CHECK_SIZEOF([unsigned long]) dnl Checks for C library functions. AC_FUNC_GETPGRP @@ -383,26 +489,27 @@ AC_FUNC_UTIME_NULL AC_FUNC_VFORK AC_FUNC_VPRINTF AC_FUNC_WAIT3 -AC_CHECK_FUNCS(ctermid) -AC_CHECK_FUNCS(dup2) -AC_CHECK_FUNCS(fcntl floor fpathconf frexp ftruncate) -AC_CHECK_FUNCS(getcwd gethostbyname gethostname getlogin getpagesize getpgrp) -AC_CHECK_FUNCS(gettimeofday getwd grantpt) -AC_CHECK_FUNCS(kill) -AC_CHECK_FUNCS(lockf) -AC_CHECK_FUNCS(memcpy mkdir mktime modf) -AC_CHECK_FUNCS(nice) -AC_CHECK_FUNCS(poll prealloc) -AC_CHECK_FUNCS(rename rmdir) -AC_CHECK_FUNCS(select setitimer setpgrp setpgrp2 shmat sigaction) -AC_CHECK_FUNCS(sighold socket statfs strchr strerror strstr strtol) -AC_CHECK_FUNCS(strtoul symlink sysconf) -AC_CHECK_FUNCS(times truncate) -AC_CHECK_FUNCS(uname utime) -AC_CHECK_FUNCS(waitpid) +AC_CHECK_FUNCS([ctermid]) +AC_CHECK_FUNCS([dup2]) +AC_CHECK_FUNCS([fcntl floor fpathconf frexp ftruncate]) +AC_CHECK_FUNCS([getcwd gethostbyname gethostname getlogin getpagesize getpgrp]) +AC_CHECK_FUNCS([gettimeofday getwd grantpt]) +AC_CHECK_FUNCS([kill]) +AC_CHECK_FUNCS([lockf]) +AC_CHECK_FUNCS([memcpy mkdir mktime modf]) +AC_CHECK_FUNCS([nice]) +AC_CHECK_FUNCS([poll prealloc]) +AC_CHECK_FUNCS([rename rmdir]) +AC_CHECK_FUNCS([select setitimer setpgrp setpgrp2 shmat sigaction]) +AC_CHECK_FUNCS([sighold socket statfs strchr strerror strstr strtol]) +AC_CHECK_FUNCS([strtoul symlink sysconf]) +AC_CHECK_FUNCS([times truncate]) +AC_CHECK_FUNCS([uname utime]) +AC_CHECK_FUNCS([waitpid]) if test "${ac_cv_type_signal}" = "void"; then - AC_DEFINE(VOID_SIGNAL_HANDLERS) + AC_DEFINE([VOID_SIGNAL_HANDLERS], [1], + [Define if RETSIGTYPE is `void'.]) fi dnl Checks for system characteristics. @@ -411,20 +518,21 @@ AC_PATH_XTRA AC_SYS_LONG_FILE_NAMES AC_SYS_RESTARTABLE_SYSCALLS -dnl OK, now some complex logic to handle the crypto stuff. - if test "${ac_cv_lib_dl_dlopen}" = "yes"; then OPTIONAL_BASES="${OPTIONAL_BASES} pruxdld" - enable_dynamic_crypto="${enable_dynamic_crypto:-yes}" + enable_dynamic_modules="${enable_dynamic_modules:-yes}" else - enable_dynamic_crypto="no" + enable_dynamic_modules="no" fi dnl Handle options to enable/disable use of some libraries. -test "${with_openssl:-yes}" = "no" && scheme_cv_lib_crypto="no" -test "${with_mhash:-yes}" = "no" && scheme_cv_lib_mhash="no" -test "${with_mcrypt:-yes}" = "no" && scheme_cv_lib_mcrypt="no" -test "${with_libpq:-yes}" = "no" && scheme_cv_lib_pq="no" +test "${with_openssl:-yes}" = "yes" || scheme_cv_lib_crypto="no" +test "${with_mhash:-yes}" = "yes" || scheme_cv_lib_mhash="no" +test "${with_mcrypt:-yes}" = "yes" || scheme_cv_lib_mcrypt="no" +test "${with_gdbm:-yes}" = "yes" || scheme_cv_lib_gdbm="no" +test "${with_libpq:-yes}" = "yes" || scheme_cv_lib_pq="no" + +dnl OK, now some complex logic to handle the crypto stuff. dnl Next, we decide which libraries to use. We mostly want support dnl for Blowfish and MD5, each of which can come from multiple libraries. @@ -433,10 +541,11 @@ HAVE_MD5="no" dnl The OpenSSL crypto library provides support for both, and is preferred. if test "${scheme_cv_lib_crypto}" = "yes"; then - AC_DEFINE(HAVE_LIBCRYPTO) + AC_DEFINE([HAVE_LIBCRYPTO], [1], + [Define if OpenSSL crypto library is present.]) if test "${ac_cv_header_openssl_blowfish_h}" = "yes" \ || test "${ac_cv_header_blowfish_h}" = "yes"; then - if test "${enable_dynamic_crypto}" = "yes"; then + if test "${enable_dynamic_modules}" = "yes"; then MODULE_BASES="${MODULE_BASES} prbfish" PRBFISH_LIBS="-lcrypto" else @@ -446,7 +555,7 @@ if test "${scheme_cv_lib_crypto}" = "yes"; then fi if test "${ac_cv_header_openssl_md5_h}" = "yes" \ || test "${ac_cv_header_md5_h}" = "yes"; then - if test "${enable_dynamic_crypto}" = "yes"; then + if test "${enable_dynamic_modules}" = "yes"; then MODULE_BASES="${MODULE_BASES} prmd5" PRMD5_LIBS="-lcrypto" else @@ -454,7 +563,7 @@ if test "${scheme_cv_lib_crypto}" = "yes"; then fi HAVE_MD5="yes" fi - if test "${enable_dynamic_crypto}" = "no"; then + if test "${enable_dynamic_modules}" != "yes"; then if test "${HAVE_BLOWFISH}" = "yes" || test "${HAVE_MD5}" = "yes"; then QUASI_STATIC_LIBS="${QUASI_STATIC_LIBS} -lcrypto" fi @@ -464,9 +573,10 @@ fi dnl The mhash library provides md5 support. It can be loaded in addition dnl to other MD5 libraries and provides a rich set of hashes. if test "${scheme_cv_lib_mhash}" = "yes"; then - AC_DEFINE(HAVE_LIBMHASH) + AC_DEFINE([HAVE_LIBMHASH], [1], + [Define if mhash library is present.]) if test "${ac_cv_header_mhash_h}" = "yes"; then - if test "${enable_dynamic_crypto}" = "yes"; then + if test "${enable_dynamic_modules}" = "yes"; then MODULE_BASES="${MODULE_BASES} prmhash" else QUASI_STATIC_LIBS="${QUASI_STATIC_LIBS} -lmhash" @@ -480,9 +590,10 @@ dnl The mcrypt library provides blowfish, but its CFB mode is 8 bit. dnl We have been using 64-bit CFB, so this isn't really compatible. dnl But mcrypt provides many ciphers and can be loaded in addition. if test "${scheme_cv_lib_mcrypt}" = "yes"; then - AC_DEFINE(HAVE_LIBMCRYPT) + AC_DEFINE([HAVE_LIBMCRYPT], [1], + [Define if mcrypt library is present.]) if test "${ac_cv_header_mcrypt_h}" = "yes"; then - if test "${enable_dynamic_crypto}" = "yes"; then + if test "${enable_dynamic_modules}" = "yes"; then MODULE_BASES="${MODULE_BASES} prmcrypt" else QUASI_STATIC_LIBS="${QUASI_STATIC_LIBS} -lmcrypt -lltdl" @@ -496,9 +607,10 @@ dnl seems to be code that was extracted from OpenSSL long ago. We dnl used this for a long time but no longer do. if test "${HAVE_BLOWFISH}" = "no"; then if test "${scheme_cv_lib_blowfish}" = "yes"; then - AC_DEFINE(HAVE_LIBBLOWFISH) + AC_DEFINE([HAVE_LIBBLOWFISH], [1], + [Define if blowfish library is present.]) if test "${ac_cv_header_blowfish_h}" = "yes"; then - if test "${enable_dynamic_crypto}" = "yes"; then + if test "${enable_dynamic_modules}" = "yes"; then MODULE_BASES="${MODULE_BASES} prbfish" PRBFISH_LIBS="-lblowfish" else @@ -514,9 +626,10 @@ dnl This is Phil Karn's MD5 implementation, which seems to have nearly dnl the same interface as that of OpenSSL. if test "${HAVE_MD5}" = "no"; then if test "${scheme_cv_lib_md5}" = "yes"; then - AC_DEFINE(HAVE_LIBMD5) + AC_DEFINE([HAVE_LIBMD5], [1], + [Define if md5 library is present.]) if test "${ac_cv_header_md5_h}" = "yes"; then - if test "${enable_dynamic_crypto}" = "yes"; then + if test "${enable_dynamic_modules}" = "yes"; then MODULE_BASES="${MODULE_BASES} prmd5" PRMD5_LIBS="-lmd5" else @@ -530,33 +643,42 @@ fi dnl gdbm support. if test "${scheme_cv_lib_gdbm}" = "yes"; then - AC_DEFINE(HAVE_LIBGDBM) + AC_DEFINE([HAVE_LIBGDBM], [1], + [Define if gdbm library is present.]) if test "${ac_cv_header_gdbm_h}" = "yes"; then - QUASI_STATIC_LIBS="${QUASI_STATIC_LIBS} -lgdbm" - OPTIONAL_BASES="${OPTIONAL_BASES} prgdbm" + if test "${enable_dynamic_modules}" = "yes"; then + MODULE_BASES="${MODULE_BASES} prgdbm" + else + QUASI_STATIC_LIBS="${QUASI_STATIC_LIBS} -lgdbm" + OPTIONAL_BASES="${OPTIONAL_BASES} prgdbm" + fi fi fi dnl curses/termcap/terminfo support. if test "${scheme_cv_lib_ncurses}" = "yes"; then - AC_DEFINE(HAVE_LIBNCURSES) + AC_DEFINE([HAVE_LIBNCURSES], [1], + [Define if ncurses library is present.]) if test "${ac_cv_header_curses_h}" = "yes" \ && test "${ac_cv_header_term_h}" = "yes"; then QUASI_STATIC_LIBS="${QUASI_STATIC_LIBS} -lncurses" if test "${scheme_cv_lib_ncurses_defines_tparam}" = "yes"; then - AC_DEFINE(LIBNCURSES_DEFINES_TPARAM) + AC_DEFINE([LIBNCURSES_DEFINES_TPARAM], [1], + [Define if ncurses library defines `tparam'.]) else OPTIONAL_BASES="${OPTIONAL_BASES} terminfo" fi fi else if test "${scheme_cv_lib_curses}" = "yes"; then - AC_DEFINE(HAVE_LIBCURSES) + AC_DEFINE([HAVE_LIBCURSES], [1], + [Define if curses library is present.]) QUASI_STATIC_LIBS="${QUASI_STATIC_LIBS} -lcurses" OPTIONAL_BASES="${OPTIONAL_BASES} terminfo" else if test "${scheme_cv_lib_termcap}" = "yes"; then - AC_DEFINE(HAVE_LIBTERMCAP) + AC_DEFINE([HAVE_LIBTERMCAP], [1], + [Define if termcap library is present.]) QUASI_STATIC_LIBS="${QUASI_STATIC_LIBS} -ltermcap" OPTIONAL_BASES="${OPTIONAL_BASES} tparam" else @@ -567,10 +689,15 @@ fi dnl PostgreSQL support. if test "${scheme_cv_lib_pq}" = "yes"; then - AC_DEFINE(HAVE_LIBPQ) + AC_DEFINE([HAVE_LIBPQ], [1], + [Define if PostgreSQL libpq library is present.]) if test "${ac_cv_header_postgresql_libpq_fe_h}" = "yes"; then - QUASI_STATIC_LIBS="${QUASI_STATIC_LIBS} -lpq" - OPTIONAL_BASES="${OPTIONAL_BASES} prpgsql" + if test "${enable_dynamic_modules}" = "yes"; then + MODULE_BASES="${MODULE_BASES} prpgsql" + else + QUASI_STATIC_LIBS="${QUASI_STATIC_LIBS} -lpq" + OPTIONAL_BASES="${OPTIONAL_BASES} prpgsql" + fi fi fi @@ -664,11 +791,10 @@ vax) ;; esac if test "${scheme_arch}" != ""; then - AC_DEFINE(HAS_COMPILER_SUPPORT) - test -f cmpauxmd.m4 \ - || ${ac_cv_prog_LN_S} cmpauxmd/${scheme_arch}.m4 cmpauxmd.m4 - test -f cmpintmd.h \ - || ${ac_cv_prog_LN_S} cmpintmd/${scheme_arch}.h cmpintmd.h + AC_DEFINE([HAS_COMPILER_SUPPORT], [1], + [Define if architecture has native-code compiler support.]) + test -f cmpauxmd.m4 || ${LN_S} cmpauxmd/${scheme_arch}.m4 cmpauxmd.m4 + test -f cmpintmd.h || ${LN_S} cmpintmd/${scheme_arch}.h cmpintmd.h OPTIONAL_SOURCES="${OPTIONAL_SOURCES} cmpauxmd.m4" OPTIONAL_OBJECTS="${OPTIONAL_OBJECTS} cmpauxmd.o" GC_HEAD_FILES="${GC_HEAD_FILES} cmpintmd.h" @@ -679,7 +805,6 @@ for base in ${OPTIONAL_BASES}; do OPTIONAL_OBJECTS="${OPTIONAL_OBJECTS} ${base}.o" done - MODULE_TARGETS= if test "${MODULE_BASES}" = ""; then MODULE_RULES="/dev/null" @@ -694,25 +819,26 @@ else done fi -AC_SUBST(AS_FLAGS) -AC_SUBST(GC_HEAD_FILES) -AC_SUBST(LIB_X11) -AC_SUBST(M4_FLAGS) -AC_SUBST(OPTIONAL_OBJECTS) -AC_SUBST(OPTIONAL_SOURCES) -AC_SUBST(STATIC_LIBS) -AC_SUBST(STATIC_PREFIX) -AC_SUBST(STATIC_SUFFIX) -AC_SUBST(PRBFISH_LIBS) -AC_SUBST(PRMD5_LIBS) -AC_SUBST(SCHEME_DEFS) -AC_SUBST(DLD_LDFLAGS) -AC_SUBST(MODULE_TARGETS) -AC_SUBST_FILE(MODULE_RULES) -AC_SUBST(MODULE_CFLAGS) -AC_SUBST(MODULE_LDFLAGS) - -AC_OUTPUT(Makefile) +AC_SUBST([AS_FLAGS]) +AC_SUBST([GC_HEAD_FILES]) +AC_SUBST([LIB_X11]) +AC_SUBST([M4_FLAGS]) +AC_SUBST([OPTIONAL_OBJECTS]) +AC_SUBST([OPTIONAL_SOURCES]) +AC_SUBST([STATIC_LIBS]) +AC_SUBST([STATIC_PREFIX]) +AC_SUBST([STATIC_SUFFIX]) +AC_SUBST([PRBFISH_LIBS]) +AC_SUBST([PRMD5_LIBS]) +AC_SUBST([SCHEME_DEFS]) +AC_SUBST([DLD_LDFLAGS]) +AC_SUBST([MODULE_TARGETS]) +AC_SUBST_FILE([MODULE_RULES]) +AC_SUBST([MODULE_CFLAGS]) +AC_SUBST([MODULE_LDFLAGS]) + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT if test "${MODULE_RULES}" != "/dev/null"; then rm -f "${MODULE_RULES}" diff --git a/v7/src/microcode/makegen/Makefile.in.in b/v7/src/microcode/makegen/Makefile.in.in index e38458ec3..cac0ab222 100644 --- a/v7/src/microcode/makegen/Makefile.in.in +++ b/v7/src/microcode/makegen/Makefile.in.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in.in,v 1.22 2003/02/14 18:28:31 cph Exp $ +# $Id: Makefile.in.in,v 1.23 2003/07/21 03:52:08 cph Exp $ # -# Copyright (c) 2000-2002 Massachusetts Institute of Technology +# Copyright 2000,2001,2002,2003 Massachusetts Institute of Technology # # This file is part of MIT/GNU Scheme. # @@ -244,6 +244,12 @@ prmhash.so: prmhash.o prmcrypt.so: prmcrypt.o $(LINK_MODULE) $^ -lmcrypt -lltdl $(MODULE_LIBS) +prgdbm.so: prgdbm.o + $(LINK_MODULE) $^ -lgdbm $(MODULE_LIBS) + +prpgsql.so: prpgsql.o + $(LINK_MODULE) $^ -lpq $(MODULE_LIBS) + @MODULE_RULES@ tags: TAGS @@ -261,6 +267,7 @@ distclean: clean maintainer-clean: distclean -rm -f $(MAINTAINER_CLEAN_FILES) + -rm -rf autom4te.cache ( cd cmpauxmd && $(MAKE) $@ ) install: install-binPROGRAMS install-auxPROGRAMS install-auxLIBS \