Menu
▾
▴
[Squeak-Commits] squeak/platforms/unix/config Makefile,1.3,1.3.2.1 acinclude.m4,1.7,1.7.2.1 configure.ac,1.14.2.1,1.14.2.2
|
From: Ned K. <ne...@us...> - 2004-03-30 22:38:20
|
Update of /cvsroot/squeak/squeak/platforms/unix/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11319/platforms/unix/config Modified Files: Tag: ned-branch Makefile acinclude.m4 configure.ac Log Message: Automake 1.7 compatibility changes. Added plugins: - BerkeleyDbPlugin (Stephen Pair) - FT2Plugin (Arjen van Elteren, mods by Ned Konz) - SpreadPlugin (Ned Konz) Added diagnostics and aioDisable for invalid sockets in sqUnixSocket.c Index: Makefile =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/Makefile,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** Makefile 7 Aug 2003 02:44:52 -0000 1.3 --- Makefile 30 Mar 2004 22:26:38 -0000 1.3.2.1 *************** *** 1,5 **** configure : .force ./mkacinc > acplugins.m4 ! aclocal autoconf rm acplugins.m4 --- 1,5 ---- configure : .force ./mkacinc > acplugins.m4 ! aclocal-1.7 autoconf rm acplugins.m4 Index: acinclude.m4 =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/acinclude.m4,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** acinclude.m4 1 Sep 2003 08:31:47 -0000 1.7 --- acinclude.m4 30 Mar 2004 22:26:38 -0000 1.7.2.1 *************** *** 38,42 **** # Last edited: 2003-08-08 15:34:41 by piumarta on emilia.inria.fr ! AC_DEFUN(AC_CHECK_VMM_DIR,[ AC_MSG_CHECKING([sanity of VMMaker src directory]) vmmcheck () { --- 38,42 ---- # Last edited: 2003-08-08 15:34:41 by piumarta on emilia.inria.fr ! AC_DEFUN([AC_CHECK_VMM_DIR],[ AC_MSG_CHECKING([sanity of VMMaker src directory]) vmmcheck () { *************** *** 58,62 **** ! AC_DEFUN(AC_VM_VERSION,[ VM_MAJOR=$1 VM_MINOR=$2 --- 58,62 ---- ! AC_DEFUN([AC_VM_VERSION],[ VM_MAJOR=$1 VM_MINOR=$2 *************** *** 69,73 **** ! AC_DEFUN(AC_CHECK_VERSION,[ gendir="${vmmdir}/vm" version=`${cfgdir}/version ${gendir}/interp.c` --- 69,73 ---- ! AC_DEFUN([AC_CHECK_VERSION],[ gendir="${vmmdir}/vm" version=`${cfgdir}/version ${gendir}/interp.c` *************** *** 80,84 **** AC_SUBST(LD) ! AC_DEFUN(AC_REQUIRE_SIZEOF,[ AC_MSG_CHECKING("size of $1") AC_TRY_RUN([#include <sys/types.h> --- 80,84 ---- AC_SUBST(LD) ! AC_DEFUN([AC_REQUIRE_SIZEOF],[ AC_MSG_CHECKING("size of $1") AC_TRY_RUN([#include <sys/types.h> *************** *** 91,95 **** # NOTE: `long long' is 64 bits in ANSI C99 [ISO/IEC 9899:1999 (E)]. ! AC_DEFUN(AC_CHECK_INT64_T,[ AC_CACHE_CHECK([for 64-bit integer type],ac_cv_int64_t, AC_TRY_RUN([int main(){return(sizeof(long) == 8)?0:1;}], --- 91,95 ---- # NOTE: `long long' is 64 bits in ANSI C99 [ISO/IEC 9899:1999 (E)]. ! AC_DEFUN([AC_CHECK_INT64_T],[ AC_CACHE_CHECK([for 64-bit integer type],ac_cv_int64_t, AC_TRY_RUN([int main(){return(sizeof(long) == 8)?0:1;}], *************** *** 105,109 **** ! AC_DEFUN(AC_NEED_SUNOS_H, [case "$host" in *-sunos*) AC_DEFINE(NEED_SUNOS_H, 1) --- 105,109 ---- ! AC_DEFUN([AC_NEED_SUNOS_H], [case "$host" in *-sunos*) AC_DEFINE(NEED_SUNOS_H, 1) *************** *** 111,120 **** ! AC_DEFUN(AC_PROG_CC_WALL, [AC_PROG_CC test "$GCC" = yes && WFLAGS="-Wall -Wno-unknown-pragmas" AC_SUBST(WFLAGS)]) ! AC_DEFUN(AC_GNU_OPT, [AC_MSG_CHECKING([for $host_cpu optimization flags]) ac_optflags="no" --- 111,120 ---- ! AC_DEFUN([AC_PROG_CC_WALL], [AC_PROG_CC test "$GCC" = yes && WFLAGS="-Wall -Wno-unknown-pragmas" AC_SUBST(WFLAGS)]) ! AC_DEFUN([AC_GNU_OPT], [AC_MSG_CHECKING([for $host_cpu optimization flags]) ac_optflags="no" *************** *** 136,140 **** fi]) ! AC_DEFUN(AC_GNU_INTERP, [INTERP="interp" AC_SUBST(INTERP) --- 136,140 ---- fi]) ! AC_DEFUN([AC_GNU_INTERP], [INTERP="interp" AC_SUBST(INTERP) *************** *** 164,168 **** fi]) ! AC_DEFUN(AC_PROG_AS_GNU, [AC_CHECK_PROG(AS,as,as) AC_MSG_CHECKING(for GNU as) --- 164,168 ---- fi]) ! AC_DEFUN([AC_PROG_AS_GNU], [AC_CHECK_PROG(AS,as,as) AC_MSG_CHECKING(for GNU as) *************** *** 176,180 **** AC_MSG_RESULT($GAS)]) ! AC_DEFUN(AC_CHECK_ATEXIT, [AC_CACHE_CHECK([for atexit or on_exit], ac_cv_atexit, AC_TRY_COMPILE([#include <stdlib.h>],[atexit(0);], ac_cv_atexit="atexit", --- 176,180 ---- AC_MSG_RESULT($GAS)]) ! AC_DEFUN([AC_CHECK_ATEXIT], [AC_CACHE_CHECK([for atexit or on_exit], ac_cv_atexit, AC_TRY_COMPILE([#include <stdlib.h>],[atexit(0);], ac_cv_atexit="atexit", *************** *** 185,189 **** fi]) ! AC_DEFUN(AC_CHECK_SOCKLEN_T, [AC_CACHE_CHECK([for socklen_t in sys/socket.h], ac_cv_socklen_t, AC_TRY_COMPILE([#include <sys/socket.h>],[sizeof(socklen_t);], --- 185,189 ---- fi]) ! AC_DEFUN([AC_CHECK_SOCKLEN_T], [AC_CACHE_CHECK([for socklen_t in sys/socket.h], ac_cv_socklen_t, AC_TRY_COMPILE([#include <sys/socket.h>],[sizeof(socklen_t);], *************** *** 191,195 **** test "$ac_cv_socklen_t" != "yes" && AC_DEFINE(socklen_t, int)]) ! AC_DEFUN(AC_CHECK_TZSET, [AC_CACHE_CHECK([for tzset], ac_cv_tzset, AC_TRY_COMPILE([#include <time.h>],[tzet();], --- 191,195 ---- test "$ac_cv_socklen_t" != "yes" && AC_DEFINE(socklen_t, int)]) ! AC_DEFUN([AC_CHECK_TZSET], [AC_CACHE_CHECK([for tzset], ac_cv_tzset, AC_TRY_COMPILE([#include <time.h>],[tzet();], *************** *** 197,201 **** test "$ac_cv_tzset" != "no" && AC_DEFINE(HAVE_TZSET)]) ! AC_DEFUN(AC_CHECK_GMTOFF, [AC_CACHE_CHECK([for gmtoff in struct tm], ac_cv_tm_gmtoff, AC_TRY_COMPILE([#include <time.h>],[struct tm tm; tm.tm_gmtoff;], --- 197,201 ---- test "$ac_cv_tzset" != "no" && AC_DEFINE(HAVE_TZSET)]) ! AC_DEFUN([AC_CHECK_GMTOFF], [AC_CACHE_CHECK([for gmtoff in struct tm], ac_cv_tm_gmtoff, AC_TRY_COMPILE([#include <time.h>],[struct tm tm; tm.tm_gmtoff;], *************** *** 203,207 **** test "$ac_cv_tm_gmtoff" != "no" && AC_DEFINE(HAVE_TM_GMTOFF)]) ! AC_DEFUN(AC_CHECK_TIMEZONE, [AC_CACHE_CHECK([for timezone and daylight variables], ac_cv_timezone, AC_TRY_COMPILE([extern long timezone; extern int daylight;],[timezone;daylight;], --- 203,207 ---- test "$ac_cv_tm_gmtoff" != "no" && AC_DEFINE(HAVE_TM_GMTOFF)]) ! AC_DEFUN([AC_CHECK_TIMEZONE], [AC_CACHE_CHECK([for timezone and daylight variables], ac_cv_timezone, AC_TRY_COMPILE([extern long timezone; extern int daylight;],[timezone;daylight;], *************** *** 209,213 **** test "$ac_cv_timezone" != "no" && AC_DEFINE(HAVE_TIMEZONE)]) ! AC_DEFUN(AC_CHECK_GETHOSTNAME, [AC_CACHE_CHECK([for gethostname in unistd.h], ac_cv_gethostname_p, AC_TRY_COMPILE([#include <unistd.h>],[return (int)gethostname;], --- 209,213 ---- test "$ac_cv_timezone" != "no" && AC_DEFINE(HAVE_TIMEZONE)]) ! AC_DEFUN([AC_CHECK_GETHOSTNAME], [AC_CACHE_CHECK([for gethostname in unistd.h], ac_cv_gethostname_p, AC_TRY_COMPILE([#include <unistd.h>],[return (int)gethostname;], *************** *** 227,231 **** ! AC_DEFUN(AC_C_BYTEORDER, [AC_C_BIGENDIAN if test $ac_cv_c_bigendian != yes --- 227,231 ---- ! AC_DEFUN([AC_C_BYTEORDER], [AC_C_BIGENDIAN if test $ac_cv_c_bigendian != yes *************** *** 234,238 **** ! AC_DEFUN(AC_C_DOUBLE_ALIGNMENT, [AC_CACHE_CHECK([whether unaligned access to doubles is ok], ac_cv_double_align, AC_TRY_RUN([f(int i){*(double *)i=*(double *)(i+4);} --- 234,238 ---- ! AC_DEFUN([AC_C_DOUBLE_ALIGNMENT], [AC_CACHE_CHECK([whether unaligned access to doubles is ok], ac_cv_double_align, AC_TRY_RUN([f(int i){*(double *)i=*(double *)(i+4);} *************** *** 241,245 **** test "$ac_cv_double_align" = "no" && AC_DEFINE(DOUBLE_WORD_ALIGNMENT)]) ! AC_DEFUN(AC_C_DOUBLE_ORDER, [AC_CACHE_CHECK([whether doubles are stored in Squeak order], ac_cv_double_order, AC_TRY_RUN([union { double d; int i[[2]]; } d; --- 241,245 ---- test "$ac_cv_double_align" = "no" && AC_DEFINE(DOUBLE_WORD_ALIGNMENT)]) ! AC_DEFUN([AC_C_DOUBLE_ORDER], [AC_CACHE_CHECK([whether doubles are stored in Squeak order], ac_cv_double_order, AC_TRY_RUN([union { double d; int i[[2]]; } d; *************** *** 250,254 **** # this assumes that libtool has already been configured and built -- # if not then err on the side of conservatism. ! AC_DEFUN(AC_MODULE_LIB_PREFIX, [AC_CACHE_CHECK([for prefix to use for loadable modules], ac_cv_module_prefix, if test -x ./libtool && --- 250,254 ---- # this assumes that libtool has already been configured and built -- # if not then err on the side of conservatism. ! AC_DEFUN([AC_MODULE_LIB_PREFIX], [AC_CACHE_CHECK([for prefix to use for loadable modules], ac_cv_module_prefix, if test -x ./libtool && *************** *** 260,264 **** test "$ac_cv_module_prefix" = lib && mkfrags_lib_prefix=lib]) ! AC_DEFUN(AC_64BIT_ARCH, [AC_MSG_CHECKING(for compiler flags to force 32-bit addresses) case $host in --- 260,264 ---- test "$ac_cv_module_prefix" = lib && mkfrags_lib_prefix=lib]) ! AC_DEFUN([AC_64BIT_ARCH], [AC_MSG_CHECKING(for compiler flags to force 32-bit addresses) case $host in *************** *** 276,295 **** # AC_PLUGIN_SUBST(varname,value) ! AC_DEFUN(AC_PLUGIN_DISABLE_PLUGIN,[ AC_MSG_RESULT([******** disabling $1]) disabled_plugins="${disabled_plugins} $1"]) ! AC_DEFUN(AC_PLUGIN_DISABLE,[ AC_PLUGIN_DISABLE_PLUGIN(${plugin})]) ! AC_DEFUN(AC_PLUGIN_USE_LIB,[ plibs="${plibs} $1"]) ! AC_DEFUN(AC_PLUGIN_DEFINE_UNQUOTED,[ echo 's%[\['$1'\]]%'$2'%g' >> ${plugin}.sub]) # AC_PLUGIN_SEARCH_LIBS(function,libs...) ! AC_DEFUN(AC_PLUGIN_SEARCH_LIBS,[ AC_SEARCH_LIBS($1,$2,, AC_MSG_RESULT([******** disabling ${plugin} due to missing libraries]) --- 276,295 ---- # AC_PLUGIN_SUBST(varname,value) ! AC_DEFUN([AC_PLUGIN_DISABLE_PLUGIN],[ AC_MSG_RESULT([******** disabling $1]) disabled_plugins="${disabled_plugins} $1"]) ! AC_DEFUN([AC_PLUGIN_DISABLE],[ AC_PLUGIN_DISABLE_PLUGIN(${plugin})]) ! AC_DEFUN([AC_PLUGIN_USE_LIB],[ plibs="${plibs} $1"]) ! AC_DEFUN([AC_PLUGIN_DEFINE_UNQUOTED],[ echo 's%[\['$1'\]]%'$2'%g' >> ${plugin}.sub]) # AC_PLUGIN_SEARCH_LIBS(function,libs...) ! AC_DEFUN([AC_PLUGIN_SEARCH_LIBS],[ AC_SEARCH_LIBS($1,$2,, AC_MSG_RESULT([******** disabling ${plugin} due to missing libraries]) *************** *** 298,302 **** # AC_PLUGIN_CHECK_LIB(lib,func,ok,bad) ! AC_DEFUN(AC_PLUGIN_CHECK_LIB,[ AC_CHECK_LIB($1,$2, plibs="${plibs} $1", --- 298,302 ---- # AC_PLUGIN_CHECK_LIB(lib,func,ok,bad) ! AC_DEFUN([AC_PLUGIN_CHECK_LIB],[ AC_CHECK_LIB($1,$2, plibs="${plibs} $1", Index: configure.ac =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/configure.ac,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -C2 -d -r1.14.2.1 -r1.14.2.2 *** configure.ac 21 Nov 2003 02:40:17 -0000 1.14.2.1 --- configure.ac 30 Mar 2004 22:26:38 -0000 1.14.2.2 *************** *** 40,46 **** # Last edited: 2003-09-16 20:08:09 by piumarta on emilia.inria.fr ! AC_INIT([config.h.in]) ! AC_VM_VERSION(3,6g,2, 3,6g,5420) topdir=`cd ${srcdir}/../../..; pwd` --- 40,47 ---- # Last edited: 2003-09-16 20:08:09 by piumarta on emilia.inria.fr ! AC_INIT([config.h.in],1) ! AM_INIT_AUTOMAKE ! AC_VM_VERSION(3,7a,0, 3,7a,5816) topdir=`cd ${srcdir}/../../..; pwd` |
