Menu
▾
▴
[Squeak-Commits] squeak/platforms/unix/config Makefile.in,1.1,1.2 Makefile.install,1.1,1.2 acinclude.m4,1.1,1.2 aclocal.m4,1.1,1.2 config.h.in,1.1,1.2 configure,1.1,1.2 configure.ac,1.1,1.2 gnuify,1.1,1.2 make.cfg.in,1.1,1.2 mkacinc,1.1,1.2 mkconfig.in,1.1,1.2 mkinstalldirs,1.1,1.2 mkmf,1.1,1.2 mktargets,1.1,1.2 vmm.config,1.1,1.2
|
From: Brenda L. <asp...@us...> - 2003-05-13 22:30:23
|
Update of /cvsroot/squeak/squeak/platforms/unix/config In directory sc8-pr-cvs1:/tmp/cvs-serv22148 Modified Files: Makefile.in Makefile.install acinclude.m4 aclocal.m4 config.h.in configure configure.ac gnuify make.cfg.in mkacinc mkconfig.in mkinstalldirs mkmf mktargets vmm.config Log Message: Ian Piumarta's release 3.5-1devel Index: Makefile.in =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 12 May 2003 07:26:14 -0000 1.1 --- Makefile.in 13 May 2003 22:30:08 -0000 1.2 *************** *** 5,8 **** --- 5,12 ---- # All rights reserved. # + # You are NOT ALLOWED to distribute modified versions of this file + # under its original name. If you want to modify it and then make + # your modifications available publicly, rename the file first. + # # This file is part of Unix Squeak. # *************** *** 13,17 **** # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following restrictions: # # 1. The origin of this software must not be misrepresented; you must not --- 17,21 ---- # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following additional restrictions: # # 1. The origin of this software must not be misrepresented; you must not *************** *** 21,25 **** # would be appreciated but is not required. # ! # 2. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak --- 25,32 ---- # would be appreciated but is not required. # ! # 2. You must not distribute (or make publicly available by any ! # means) a modified copy of this file unless you first rename it. ! # ! # 3. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak *************** *** 27,37 **** # directory `platforms/unix/doc' before proceeding with any such use. # - # You are not allowed to distribute a modified version of this file - # under its original name without explicit permission to do so. If - # you change it, rename it. - # # Author: ian...@in... # ! # Last edited: 2003-03-04 06:44:45 by piumarta on emilia.inria.fr @make_cfg@ --- 34,40 ---- # directory `platforms/unix/doc' before proceeding with any such use. # # Author: ian...@in... # ! # Last edited: 2003-03-01 19:27:38 by piumarta on emilia.inria.fr @make_cfg@ *************** *** 43,47 **** PLUGINS_LA = [plugins] ! squeak = squeak$(NOX) all : $(squeak) plugins squeak.1 $(npsqueak) --- 46,50 ---- PLUGINS_LA = [plugins] ! squeak = squeak all : $(squeak) plugins squeak.1 $(npsqueak) *************** *** 50,54 **** $(squeak) : config.sh $(SQLIBS) version.o ! $(LINK) $(squeak) $(SQLIBS) version.o $(LIBS) [plibs] size $(squeak) @echo --- 53,57 ---- $(squeak) : config.sh $(SQLIBS) version.o ! $(LINK) $(squeak) $(SQLIBS) version.o $(LIBS) [plibs] vm/vm.a size $(squeak) @echo *************** *** 87,91 **** @Makefile_dist@ @Makefile_rpm@ - @Makefile_deb@ # VMM configuration changes --- 90,93 ---- Index: Makefile.install =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/Makefile.install,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.install 12 May 2003 07:26:14 -0000 1.1 --- Makefile.install 13 May 2003 22:30:08 -0000 1.2 *************** *** 3,7 **** # Author: ian...@in... # ! # Last edited: Wed Nov 27 19:13:56 2002 by piumarta (Ian Piumarta) on xombul DOCFILES = COPYING COPYRIGHT LICENSE \ --- 3,7 ---- # Author: ian...@in... # ! # Last edited: 2002-12-25 19:48:44 by piumarta on emilia.inria.fr DOCFILES = COPYING COPYRIGHT LICENSE \ Index: acinclude.m4 =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/acinclude.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** acinclude.m4 12 May 2003 07:26:14 -0000 1.1 --- acinclude.m4 13 May 2003 22:30:08 -0000 1.2 *************** *** 5,8 **** --- 5,12 ---- # All rights reserved. # + # You are NOT ALLOWED to distribute modified versions of this file + # under its original name. If you want to modify it and then make + # your modifications available publicly, rename the file first. + # # This file is part of Unix Squeak. # *************** *** 13,17 **** # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following restrictions: # # 1. The origin of this software must not be misrepresented; you must not --- 17,21 ---- # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following additional restrictions: # # 1. The origin of this software must not be misrepresented; you must not *************** *** 21,25 **** # would be appreciated but is not required. # ! # 2. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak --- 25,32 ---- # would be appreciated but is not required. # ! # 2. You must not distribute (or make publicly available by any ! # means) a modified copy of this file unless you first rename it. ! # ! # 3. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak *************** *** 27,37 **** # directory `platforms/unix/doc' before proceeding with any such use. # - # You are not allowed to distribute a modified version of this file - # under its original name without explicit permission to do so. If - # you change it, rename it. - # # Author: Ian...@IN... # ! # Last edited: 2003-02-09 02:40:58 by piumarta on emilia.inria.fr AC_DEFUN(AC_CHECK_VMM_DIR,[ --- 34,40 ---- # directory `platforms/unix/doc' before proceeding with any such use. # # Author: Ian...@IN... # ! # Last edited: 2003-02-11 04:24:23 by piumarta on emilia.inria.fr AC_DEFUN(AC_CHECK_VMM_DIR,[ *************** *** 110,124 **** AC_DEFUN(AC_PROG_CC_WALL, [AC_PROG_CC ! test "$GCC" = yes && WFLAGS="-Wall" AC_SUBST(WFLAGS)]) AC_DEFUN(AC_GNU_OPT, ! [AC_MSG_CHECKING("for optimization flags") ac_optflags="no" if test "$GCC" = yes; then ! case $host in ! i?86-*) ac_optflags="-fomit-frame-pointer" ;; esac fi --- 113,130 ---- 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" if test "$GCC" = yes; then ! case $host_cpu in ! i?86) ac_optflags="-fomit-frame-pointer" ;; + powerpc|ppc) + ac_optflags="-O3 -mcpu=750 -funroll-loops" + ;; esac fi *************** *** 219,276 **** fi fi - - - AC_DEFUN(AC_HAVE_NAS,[AC_MSG_CHECKING([for Network Audio System]) - AC_TRY_COMPILE([#include <audio/audio.h>],[AuElementNotifyKindLowWater;], - ac_cv_nas="yes", ac_cv_nas="no") - AC_MSG_RESULT($ac_cv_nas)]) - - AC_DEFUN(AC_HAVE_OSS,[AC_MSG_CHECKING([for Open Sound System]) - AC_TRY_COMPILE([#include <sys/soundcard.h>],[OPEN_SOUND_SYSTEM;], - ac_cv_oss="yes", ac_cv_oss="no") - AC_MSG_RESULT($ac_cv_oss)]) - - AC_DEFUN(AC_HAVE_SUN,[AC_MSG_CHECKING([for SunOS/Solaris audio]) - AC_TRY_COMPILE([#include <sys/audioio.h>],[AUDIO_SUNVTS;], - ac_cv_sun="yes" - AC_DEFINE_UNQUOTED(HAVE_SYS_AUDIOIO_H,1), - AC_TRY_COMPILE([#include <sun/audioio.h>],[AUDIO_SUNVTS;], - ac_cv_sun="yes" - AC_DEFINE_UNQUOTED(HAVE_SUN_AUDIOIO_H,1), - ac_cv_sun="no")) - AC_MSG_RESULT($ac_cv_sun)]) - - - AC_DEFUN(AC_CHECK_SOUND,[ - use_audio="" - AC_MSG_CHECKING([for audio support]) - AC_MSG_RESULT($with_audio) - if test "$with_audio" = "auto" -o "$with_audio" = "oss"; then - AC_HAVE_OSS - if test "$ac_cv_oss" = "yes"; then use_audio=oss; with_audio=oss; fi - fi - if test "$with_audio" = "auto" -o "$with_audio" = "sun"; then - AC_HAVE_SUN - if test "$ac_cv_sun" = "yes"; then use_audio=sun; with_audio=sun; fi - fi - if test "$with_audio" = "auto" -o "$with_audio" = "nas"; then - AC_HAVE_NAS - if test "$ac_cv_nas" = "yes"; then use_audio=nas; with_audio=nas; fi - fi - if test "$with_audio" = "none"; then use_audio=none; fi - if test "$use_audio" = ""; then - AC_MSG_RESULT([******** AUDIO DISABLED (no support found for: $with_audio)]) - use_audio=none - fi - case $use_audio in - nas) AC_DEFINE(USE_AUDIO_NAS,1) - LIBS="$LIBS -laudio -lXt" ;; - oss) AC_DEFINE(USE_AUDIO_OSS,1) ;; - sun) AC_DEFINE(USE_AUDIO_SUN,1) - AC_HAVE_HEADERS(sys/audioio.h) ;; - none) AC_DEFINE(USE_AUDIO_NONE,1) ;; - *) echo; echo "this cannot happen"; echo; exit 1 ;; - esac - ]) --- 225,228 ---- Index: aclocal.m4 =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/aclocal.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** aclocal.m4 12 May 2003 07:26:14 -0000 1.1 --- aclocal.m4 13 May 2003 22:30:08 -0000 1.2 *************** *** 18,21 **** --- 18,25 ---- # All rights reserved. # + # You are NOT ALLOWED to distribute modified versions of this file + # under its original name. If you want to modify it and then make + # your modifications available publicly, rename the file first. + # # This file is part of Unix Squeak. # *************** *** 26,30 **** # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following restrictions: # # 1. The origin of this software must not be misrepresented; you must not --- 30,34 ---- # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following additional restrictions: # # 1. The origin of this software must not be misrepresented; you must not *************** *** 34,38 **** # would be appreciated but is not required. # ! # 2. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak --- 38,45 ---- # would be appreciated but is not required. # ! # 2. You must not distribute (or make publicly available by any ! # means) a modified copy of this file unless you first rename it. ! # ! # 3. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak *************** *** 40,50 **** # directory `platforms/unix/doc' before proceeding with any such use. # - # You are not allowed to distribute a modified version of this file - # under its original name without explicit permission to do so. If - # you change it, rename it. - # # Author: Ian...@IN... # ! # Last edited: 2003-02-09 02:40:58 by piumarta on emilia.inria.fr AC_DEFUN(AC_CHECK_VMM_DIR,[ --- 47,53 ---- # directory `platforms/unix/doc' before proceeding with any such use. # # Author: Ian...@IN... # ! # Last edited: 2003-02-11 04:24:23 by piumarta on emilia.inria.fr AC_DEFUN(AC_CHECK_VMM_DIR,[ *************** *** 123,137 **** AC_DEFUN(AC_PROG_CC_WALL, [AC_PROG_CC ! test "$GCC" = yes && WFLAGS="-Wall" AC_SUBST(WFLAGS)]) AC_DEFUN(AC_GNU_OPT, ! [AC_MSG_CHECKING("for optimization flags") ac_optflags="no" if test "$GCC" = yes; then ! case $host in ! i?86-*) ac_optflags="-fomit-frame-pointer" ;; esac fi --- 126,143 ---- 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" if test "$GCC" = yes; then ! case $host_cpu in ! i?86) ac_optflags="-fomit-frame-pointer" ;; + powerpc|ppc) + ac_optflags="-O3 -mcpu=750 -funroll-loops" + ;; esac fi *************** *** 232,289 **** fi fi - - - AC_DEFUN(AC_HAVE_NAS,[AC_MSG_CHECKING([for Network Audio System]) - AC_TRY_COMPILE([#include <audio/audio.h>],[AuElementNotifyKindLowWater;], - ac_cv_nas="yes", ac_cv_nas="no") - AC_MSG_RESULT($ac_cv_nas)]) - - AC_DEFUN(AC_HAVE_OSS,[AC_MSG_CHECKING([for Open Sound System]) - AC_TRY_COMPILE([#include <sys/soundcard.h>],[OPEN_SOUND_SYSTEM;], - ac_cv_oss="yes", ac_cv_oss="no") - AC_MSG_RESULT($ac_cv_oss)]) - - AC_DEFUN(AC_HAVE_SUN,[AC_MSG_CHECKING([for SunOS/Solaris audio]) - AC_TRY_COMPILE([#include <sys/audioio.h>],[AUDIO_SUNVTS;], - ac_cv_sun="yes" - AC_DEFINE_UNQUOTED(HAVE_SYS_AUDIOIO_H,1), - AC_TRY_COMPILE([#include <sun/audioio.h>],[AUDIO_SUNVTS;], - ac_cv_sun="yes" - AC_DEFINE_UNQUOTED(HAVE_SUN_AUDIOIO_H,1), - ac_cv_sun="no")) - AC_MSG_RESULT($ac_cv_sun)]) - - - AC_DEFUN(AC_CHECK_SOUND,[ - use_audio="" - AC_MSG_CHECKING([for audio support]) - AC_MSG_RESULT($with_audio) - if test "$with_audio" = "auto" -o "$with_audio" = "oss"; then - AC_HAVE_OSS - if test "$ac_cv_oss" = "yes"; then use_audio=oss; with_audio=oss; fi - fi - if test "$with_audio" = "auto" -o "$with_audio" = "sun"; then - AC_HAVE_SUN - if test "$ac_cv_sun" = "yes"; then use_audio=sun; with_audio=sun; fi - fi - if test "$with_audio" = "auto" -o "$with_audio" = "nas"; then - AC_HAVE_NAS - if test "$ac_cv_nas" = "yes"; then use_audio=nas; with_audio=nas; fi - fi - if test "$with_audio" = "none"; then use_audio=none; fi - if test "$use_audio" = ""; then - AC_MSG_RESULT([******** AUDIO DISABLED (no support found for: $with_audio)]) - use_audio=none - fi - case $use_audio in - nas) AC_DEFINE(USE_AUDIO_NAS,1) - LIBS="$LIBS -laudio -lXt" ;; - oss) AC_DEFINE(USE_AUDIO_OSS,1) ;; - sun) AC_DEFINE(USE_AUDIO_SUN,1) - AC_HAVE_HEADERS(sys/audioio.h) ;; - none) AC_DEFINE(USE_AUDIO_NONE,1) ;; - *) echo; echo "this cannot happen"; echo; exit 1 ;; - esac - ]) --- 238,241 ---- Index: config.h.in =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/config.h.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config.h.in 12 May 2003 07:26:14 -0000 1.1 --- config.h.in 13 May 2003 22:30:09 -0000 1.2 *************** *** 5,8 **** --- 5,12 ---- * All rights reserved. * + * You are NOT ALLOWED to distribute modified versions of this file + * under its original name. If you want to modify it and then make + * your modifications available publicly, rename the file first. + * * This file is part of Unix Squeak. * *************** *** 13,17 **** * You may use and/or distribute this file ONLY as part of Squeak, under * the terms of the Squeak License as described in `LICENSE' in the base of ! * this distribution, subject to the following restrictions: * * 1. The origin of this software must not be misrepresented; you must not --- 17,21 ---- * You may use and/or distribute this file ONLY as part of Squeak, under * the terms of the Squeak License as described in `LICENSE' in the base of ! * this distribution, subject to the following additional restrictions: * * 1. The origin of this software must not be misrepresented; you must not *************** *** 21,44 **** * would be appreciated but is not required. * ! * 2. This notice must not be removed or altered in any source distribution. * * Using (or modifying this file for use) in any context other than Squeak * changes these copyright conditions. Read the file `COPYING' in the * directory `platforms/unix/doc' before proceeding with any such use. - * - * You are not allowed to distribute a modified version of this file - * under its original name without explicit permission to do so. If - * you change it, rename it. */ /* Author: Ian...@IN... * ! * Last edited: 2002-11-30 16:00:59 by piumarta on calvin.inria.fr */ /* package options */ #undef USE_X11 #undef USE_RFB --- 25,52 ---- * would be appreciated but is not required. * ! * 2. You must not distribute (or make publicly available by any ! * means) a modified copy of this file unless you first rename it. ! * ! * 3. This notice must not be removed or altered in any source distribution. * * Using (or modifying this file for use) in any context other than Squeak * changes these copyright conditions. Read the file `COPYING' in the * directory `platforms/unix/doc' before proceeding with any such use. */ /* Author: Ian...@IN... * ! * Last edited: 2003-03-02 05:26:57 by piumarta on emilia.inria.fr */ + #ifndef __sq_config_h + #define __sq_config_h /* package options */ #undef USE_X11 + #undef USE_X11_GLX + #undef USE_QUARTZ + #undef USE_QUARTZ_CGL #undef USE_RFB *************** *** 48,52 **** --- 56,62 ---- #undef HAVE_LIBXEXT #undef HAVE_LIBDL + #undef HAVE_DYLD #undef HAVE_LIBFFI + #undef HAVE_ICONV #undef USE_AUDIO_NONE *************** *** 54,57 **** --- 64,68 ---- #undef USE_AUDIO_NAS #undef USE_AUDIO_OSS + #undef USE_AUDIO_MACOSX #undef OSS_DEVICE *************** *** 65,70 **** #undef HAVE_SYS_DIR_H #undef HAVE_NDIR_H - #undef HAVE_DLFCN_H #undef HAVE_SYS_TIME_H --- 76,81 ---- #undef HAVE_SYS_DIR_H #undef HAVE_NDIR_H #undef HAVE_DLFCN_H + #undef HAVE_ICONV_H #undef HAVE_SYS_TIME_H *************** *** 80,83 **** --- 91,97 ---- #undef HAVE_STROPTS_H + #undef HAVE_GL_GL_H + #undef HAVE_OPENGL_GL_H + #undef NEED_SUNOS_H *************** *** 94,99 **** --- 108,117 ---- #undef HAVE___SNPRINTF + #undef HAVE_MMAP + #undef HAVE_DYLD + #undef HAVE_LANGINFO_CODESET + /* structures */ *************** *** 136,137 **** --- 154,157 ---- #undef VM_MODULE_PREFIX #undef VM_DLSYM_PREFIX + + #endif /* __sq_config_h */ Index: configure =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/configure,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configure 12 May 2003 07:26:14 -0000 1.1 --- configure 13 May 2003 22:30:09 -0000 1.2 *************** *** 262,265 **** --- 262,301 ---- ac_unique_file="config.h.in" + # Factoring default headers for most tests. + ac_includes_default="\ + #include <stdio.h> + #if HAVE_SYS_TYPES_H + # include <sys/types.h> + #endif + #if HAVE_SYS_STAT_H [...10825 lines suppressed...] { (exit 1); exit 1; }; } --- 12058,12062 ---- else # /dev/null tree ! { { echo "$as_me:12060: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } *************** *** 11382,11386 **** if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then ! { echo "$as_me:11384: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else --- 12175,12179 ---- if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then ! { echo "$as_me:12177: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else Index: configure.ac =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/configure.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configure.ac 12 May 2003 07:26:14 -0000 1.1 --- configure.ac 13 May 2003 22:30:09 -0000 1.2 *************** *** 7,10 **** --- 7,14 ---- # All rights reserved. # + # You are NOT ALLOWED to distribute modified versions of this file + # under its original name. If you want to modify it and then make + # your modifications available publicly, rename the file first. + # # This file is part of Unix Squeak. # *************** *** 15,19 **** # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following restrictions: # # 1. The origin of this software must not be misrepresented; you must not --- 19,23 ---- # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following additional restrictions: # # 1. The origin of this software must not be misrepresented; you must not *************** *** 23,27 **** # would be appreciated but is not required. # ! # 2. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak --- 27,34 ---- # would be appreciated but is not required. # ! # 2. You must not distribute (or make publicly available by any ! # means) a modified copy of this file unless you first rename it. ! # ! # 3. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak *************** *** 29,43 **** # directory `platforms/unix/doc' before proceeding with any such use. # - # You are not allowed to distribute a modified version of this file - # under its original name without explicit permission to do so. If - # you change it, rename it. - # # Author: Ian...@IN... # ! # Last edited: 2003-03-04 06:48:40 by piumarta on emilia.inria.fr AC_INIT([config.h.in]) ! AC_VM_VERSION(3,4,1, 3,4,5170) topdir=`cd ${srcdir}/../../..; pwd` --- 36,46 ---- # directory `platforms/unix/doc' before proceeding with any such use. # # Author: Ian...@IN... # ! # Last edited: 2003-02-10 20:17:06 by piumarta on emilia.inria.fr AC_INIT([config.h.in]) ! AC_VM_VERSION(3,5,1devel, 3,2t,369) topdir=`cd ${srcdir}/../../..; pwd` *************** *** 119,123 **** AC_ARG_WITH(gnu-as, [ --with-gnu-as assume that as is the GNU assembler [default=no]], ! [GAS="$withval"], [GAS="unknown"]) AC_PROG_MAKE_SET --- 122,127 ---- AC_ARG_WITH(gnu-as, [ --with-gnu-as assume that as is the GNU assembler [default=no]], ! [GAS="$withval"], ! [GAS="unknown"]) AC_PROG_MAKE_SET *************** *** 148,176 **** AC_SUBST(INCLUDES) - # Checks for X11 - - AC_ARG_WITH(x, - [ --without-x disable X Window System support [default=enabled]], - [ if test "$withval" = "no"; then have_x="no"; else have_x="yes"; fi ], - [ have_x="yes"] - ) - - if test "$have_x" = "yes"; then - AC_DEFINE(USE_X11,[1]) - NOX="" - AC_PATH_XTRA - LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS $LIBS" - CFLAGS="$X_CFLAGS $CFLAGS" - if test "$x_includes" != ""; then - INCLUDES="${INCLUDES} -I${x_includes}" - fi - else - NOX="-nox" - CFLAGS="$CFLAGS -DHEADLESS" - with_npsqueak=no - fi - - AC_SUBST(NOX) - # Checks for header files. --- 152,155 ---- *************** *** 196,201 **** AC_ARG_WITH(rfb, [ --without-rfb disable Remote FrameBuffer support [default=enabled]], ! [[have_rfb=no]], ! [[have_rfb=yes]]) test $have_rfb = "yes" && AC_DEFINE(USE_RFB,[1]) --- 175,181 ---- AC_ARG_WITH(rfb, [ --without-rfb disable Remote FrameBuffer support [default=enabled]], ! [have_rfb="$withval"], ! [have_rfb="no"]) ! test $have_rfb = "yes" && AC_DEFINE(USE_RFB,[1]) *************** *** 204,225 **** AC_CHECK_LIB(nsl, yp_bind) AC_CHECK_LIB(socket, socket) - - AC_HAVE_HEADERS(dlfcn.h) - AC_CHECK_FUNC(dlopen, - [AC_DEFINE(HAVE_LIBDL,[1])], - [AC_CHECK_LIB(dl, dlopen, - [LIBS="-ldl $LIBS" - AC_DEFINE(HAVE_LIBDL,[1])], - [AC_CHECK_FUNC(_dyld_present,[AC_DEFINE(HAVE_DYLD,[1])])])]) - AC_CHECK_LIB(m, sin) ! if test "$have_x" = "yes"; then ! AC_CHECK_LIB(X11, XOpenDisplay) ! AC_CHECK_LIB(Xext, XShmAttach) ! fi AC_CHECK_FUNCS(snprintf __snprintf,[break]) #AC_ARG_ENABLE(jit, #[ --enable-jit enable J4 support [default=no]], --- 184,207 ---- AC_CHECK_LIB(nsl, yp_bind) AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(m, sin) ! AC_HAVE_HEADERS(dlfcn.h) ! AC_CHECK_FUNC(dlopen, [ ! AC_DEFINE(HAVE_LIBDL,[1]) ! ],[ ! AC_CHECK_LIB(dl, dlopen, [ ! LIBS="-ldl $LIBS" ! AC_DEFINE(HAVE_LIBDL,[1]) ! ],[ ! AC_CHECK_FUNC(_dyld_present, [ ! AC_DEFINE(HAVE_DYLD,[1]) ! ]) ! ]) ! ]) AC_CHECK_FUNCS(snprintf __snprintf,[break]) + AC_FUNC_MMAP + #AC_ARG_ENABLE(jit, #[ --enable-jit enable J4 support [default=no]], *************** *** 229,242 **** #AC_SUBST(J_CFLAGS) - # Checks for sound support. - - AC_ARG_WITH(audio, - [ --with-audio=choice choose audio device [default=auto] - available devices: auto none oss sun nas], - [[]], - [[with_audio=auto]]) - - AC_CHECK_SOUND - # Checks for platform characteristics. --- 211,214 ---- *************** *** 270,275 **** AC_ARG_WITH(npsqueak, [ --without-npsqueak disable browser plugin support [default=enabled]], ! [[with_npsqueak=no]], ! [[with_npsqueak=yes]]) if test "$with_npsqueak" = "no"; then --- 242,247 ---- AC_ARG_WITH(npsqueak, [ --without-npsqueak disable browser plugin support [default=enabled]], ! [with_npsqueak="$withval"], ! [with_npsqueak="yes"]) if test "$with_npsqueak" = "no"; then *************** *** 310,319 **** Makefile_dist=${topdir}/util/Makefile.dist Makefile_rpm=${topdir}/util/Makefile.rpm - Makefile_deb=${topdir}/util/Makefile.deb AC_SUBST_FILE(Makefile_install) AC_SUBST_FILE(Makefile_dist) AC_SUBST_FILE(Makefile_rpm) ! AC_SUBST_FILE(Makefile_deb) # Configure plugins --- 282,297 ---- Makefile_dist=${topdir}/util/Makefile.dist Makefile_rpm=${topdir}/util/Makefile.rpm AC_SUBST_FILE(Makefile_install) AC_SUBST_FILE(Makefile_dist) AC_SUBST_FILE(Makefile_rpm) ! ! # Configure VM modules xxx MAKE INTERNAL WORK ! ! int_modules="vm" ! ext_modules="`cd ${topdir}/platforms/unix; echo vm-*`" ! ! AC_SUBST(int_modules) ! AC_SUBST(ext_modules) # Configure plugins *************** *** 323,329 **** sinclude(acplugins.m4) ! if test "$have_x" = "no"; then ! AC_PLUGIN_DISABLE_PLUGIN(UnixOSProcessPlugin) ! fi if test "${disabled_plugins}" != ""; then --- 301,313 ---- sinclude(acplugins.m4) ! # Plugins not generated by VMM must be listed here... ! int_plugins="" ! ext_plugins="ObjectiveCPlugin" ! AC_SUBST(int_plugins) ! AC_SUBST(ext_plugins) ! ! #if test "$have_x" = "no"; then ! # AC_PLUGIN_DISABLE_PLUGIN(UnixOSProcessPlugin) ! #fi if test "${disabled_plugins}" != ""; then Index: gnuify =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/gnuify,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gnuify 12 May 2003 07:26:14 -0000 1.1 --- gnuify 13 May 2003 22:30:09 -0000 1.2 *************** *** 5,8 **** --- 5,12 ---- # All rights reserved. # + # You are NOT ALLOWED to distribute modified versions of this file + # under its original name. If you want to modify it and then make + # your modifications available publicly, rename the file first. + # # This file is part of Unix Squeak. # *************** *** 13,17 **** # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following restrictions: # # 1. The origin of this software must not be misrepresented; you must not --- 17,21 ---- # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following additional restrictions: # # 1. The origin of this software must not be misrepresented; you must not *************** *** 21,37 **** # would be appreciated but is not required. # ! # 2. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak # changes these copyright conditions. Read the file `COPYING' in the # directory `platforms/unix/doc' before proceeding with any such use. - # - # You are not allowed to distribute a modified version of this file - # under its original name without explicit permission to do so. If - # you change it, rename it. # Author: Ian...@IN... # ! # Last edited: 2002-09-07 03:28:53 by piumarta on emilia.inria.fr # Rewrite the interpreter source in $1 to use GNU C extensions, writing the --- 25,40 ---- # would be appreciated but is not required. # ! # 2. You must not distribute (or make publicly available by any ! # means) a modified copy of this file unless you first rename it. ! # ! # 3. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak # changes these copyright conditions. Read the file `COPYING' in the # directory `platforms/unix/doc' before proceeding with any such use. # Author: Ian...@IN... # ! # Last edited: 2003-02-11 05:06:03 by piumarta on emilia.inria.fr # Rewrite the interpreter source in $1 to use GNU C extensions, writing the *************** *** 76,79 **** --- 79,85 ---- (stage == 1) && /^ char\* localSP;/ { print " register char* localSP SP_REG;"; + print "# ifdef GP_REG"; + print " register struct foo * foo GP_REG= &fum;"; + print "# endif"; next; } *************** *** 87,91 **** print "interpret: adding bytecode dispatch table" > "/dev/stderr"; print " JUMP_TABLE;\n"; - print " register void **jumpTablePtr JP_REG= jumpTable;"; print "interpret: rewriting case labels and outer breaks" > "/dev/stderr"; stage= 2; --- 93,96 ---- Index: make.cfg.in =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/make.cfg.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** make.cfg.in 12 May 2003 07:26:14 -0000 1.1 --- make.cfg.in 13 May 2003 22:30:09 -0000 1.2 *************** *** 5,8 **** --- 5,12 ---- # All rights reserved. # + # You are NOT ALLOWED to distribute modified versions of this file + # under its original name. If you want to modify it and then make + # your modifications available publicly, rename the file first. + # # This file is part of Unix Squeak. # *************** *** 13,17 **** # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following restrictions: # # 1. The origin of this software must not be misrepresented; you must not --- 17,21 ---- # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following additional restrictions: # # 1. The origin of this software must not be misrepresented; you must not *************** *** 21,37 **** # would be appreciated but is not required. # ! # 2. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak # changes these copyright conditions. Read the file `COPYING' in the # directory `platforms/unix/doc' before proceeding with any such use. - # - # You are not allowed to distribute a modified version of this file - # under its original name without explicit permission to do so. If - # you change it, rename it. # Author: Ian...@in... # ! # Last edited: 2002-12-01 09:20:37 by piumarta on calvin.inria.fr MAKEFLAGS= --no-print-directory --- 25,40 ---- # would be appreciated but is not required. # ! # 2. You must not distribute (or make publicly available by any ! # means) a modified copy of this file unless you first rename it. ! # ! # 3. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak # changes these copyright conditions. Read the file `COPYING' in the # directory `platforms/unix/doc' before proceeding with any such use. # Author: Ian...@in... # ! # Last edited: 2003-02-06 03:06:06 by piumarta on emilia.local. MAKEFLAGS= --no-print-directory *************** *** 99,104 **** LIBS= @LIBS@ ! INTERP= @INTERP@ ! NOX= @NOX@ FFI_DIR= @FFI_DIR@ --- 102,108 ---- LIBS= @LIBS@ ! X_CFLAGS= @X_CFLAGS@ ! X_INCLUDES= @X_INCLUDES@ ! X_LIBS= @X_LIBS@ FFI_DIR= @FFI_DIR@ *************** *** 107,110 **** --- 111,115 ---- FFI_O= @FFI_O@ + INTERP= @INTERP@ npsqueak= @npsqueak@ Index: mkacinc =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/mkacinc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mkacinc 12 May 2003 07:26:14 -0000 1.1 --- mkacinc 13 May 2003 22:30:09 -0000 1.2 *************** *** 1,10 **** #!/bin/sh ! includes="`find ../plugins -name acinclude.m4`"; if test "${includes}" != ""; then for i in ${includes}; do echo " + $i" >&2 ! p=`echo $i | sed 's,../plugins/,,;s,/acinclude.m4,,'` cat <<EOF plugin="${p}" --- 1,10 ---- #!/bin/sh ! includes="`echo ../vm*/acinclude.m4 ../plugins/*/acinclude.m4`"; if test "${includes}" != ""; then for i in ${includes}; do echo " + $i" >&2 ! p=`echo $i | sed 's,../,,;s,plugins/,,;s,/acinclude.m4,,'` cat <<EOF plugin="${p}" Index: mkconfig.in =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/mkconfig.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mkconfig.in 12 May 2003 07:26:14 -0000 1.1 --- mkconfig.in 13 May 2003 22:30:09 -0000 1.2 *************** *** 1,10 **** #!/bin/sh ! int_plugins="`tail -1 @vmmdir@/plugins.int | sed 's,.* =,,'`" ! ext_plugins="`tail -1 @vmmdir@/plugins.ext | sed 's,.* =,,'`" if test -f plugins.exc; then nlsp='tr \012\015 \040\040' spnl='tr \040\040 \012\012' int_plugins="`echo ${int_plugins} | $spnl | fgrep -v -f plugins.exc | $nlsp`" ext_plugins="`echo ${ext_plugins} | $spnl | fgrep -v -f plugins.exc | $nlsp`" --- 1,14 ---- #!/bin/sh ! int_modules="@int_modules@" ! ext_modules="@ext_modules@" ! int_plugins="@int_plugins@ `tail -1 @vmmdir@/plugins.int | sed 's,.* =,,'`" ! ext_plugins="@ext_plugins@ `tail -1 @vmmdir@/plugins.ext | sed 's,.* =,,'`" if test -f plugins.exc; then nlsp='tr \012\015 \040\040' spnl='tr \040\040 \012\012' + int_modules="`echo ${int_modules} | $spnl | fgrep -v -f plugins.exc | $nlsp`" + ext_modules="`echo ${ext_modules} | $spnl | fgrep -v -f plugins.exc | $nlsp`" int_plugins="`echo ${int_plugins} | $spnl | fgrep -v -f plugins.exc | $nlsp`" ext_plugins="`echo ${ext_plugins} | $spnl | fgrep -v -f plugins.exc | $nlsp`" *************** *** 29,32 **** --- 33,38 ---- cfgdir="@cfgdir@" + int_modules="${int_modules}" + ext_modules="${ext_modules}" int_plugins="${int_plugins}" ext_plugins="${ext_plugins}" Index: mkinstalldirs =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/mkinstalldirs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: mkmf =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/mkmf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mkmf 12 May 2003 07:26:14 -0000 1.1 --- mkmf 13 May 2003 22:30:09 -0000 1.2 *************** *** 7,10 **** --- 7,14 ---- # All rights reserved. # + # You are NOT ALLOWED to distribute modified versions of this file + # under its original name. If you want to modify it and then make + # your modifications available publicly, rename the file first. + # # This file is part of Unix Squeak. # *************** *** 15,19 **** # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following restrictions: # # 1. The origin of this software must not be misrepresented; you must not --- 19,23 ---- # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following additional restrictions: # # 1. The origin of this software must not be misrepresented; you must not *************** *** 23,27 **** # would be appreciated but is not required. # ! # 2. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak --- 27,34 ---- # would be appreciated but is not required. # ! # 2. You must not distribute (or make publicly available by any ! # means) a modified copy of this file unless you first rename it. ! # ! # 3. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak *************** *** 29,39 **** # directory `platforms/unix/doc' before proceeding with any such use. # - # You are not allowed to distribute a modified version of this file - # under its original name without explicit permission to do so. If - # you change it, rename it. - # # Author: ian...@in... # ! # Last edited: 2002-06-10 23:40:02 by piumarta on emilia.inria.fr . ./config.sh --- 36,42 ---- # directory `platforms/unix/doc' before proceeding with any such use. # # Author: ian...@in... # ! # Last edited: 2003-02-06 03:14:37 by piumarta on emilia.local. . ./config.sh *************** *** 87,92 **** fi srcs="${srcs} `findFiles .c ${dd}`" - srcs="${srcs} `findFiles .s ${dd}`" srcs="${srcs} `findFiles .S ${dd}`" hdrs="${hdrs} `findFiles .h ${dd}`" # override Makefile.in --- 90,95 ---- fi srcs="${srcs} `findFiles .c ${dd}`" srcs="${srcs} `findFiles .S ${dd}`" + srcs="${srcs} `findFiles .m ${dd}`" hdrs="${hdrs} `findFiles .h ${dd}`" # override Makefile.in *************** *** 105,109 **** if test "${srcs}" != ""; then for c in ${srcs}; do ! o=`basename ${c} | sed 's,\.[csS],$o,'` targets="${targets} ${o}" echo >> ${make_targets} --- 108,112 ---- if test "${srcs}" != ""; then for c in ${srcs}; do ! o=`basename ${c} | sed 's,\.c,$o,;s,\.m,$o,;s,\.S,$o,'` targets="${targets} ${o}" echo >> ${make_targets} *************** *** 150,154 **** } ! mkmf int vm ${vmi_dirs} if test "${int_plugins}" != ""; then --- 153,172 ---- } ! if test "${int_modules}" != ""; then ! for p in ${int_modules}; do ! mkmf int ${p} ${vmi_dirs} ! done ! fi ! ! if test "${ext_modules}" != ""; then ! for p in ${ext_modules}; do ! if test -f ${p}.lib; then ! plibs="`cat ${p}.lib`" ! else ! plibs="" ! fi ! mkmf ext ${p} ${vmi_dirs} ! done ! fi if test "${int_plugins}" != ""; then Index: mktargets =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/mktargets,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mktargets 12 May 2003 07:26:14 -0000 1.1 --- mktargets 13 May 2003 22:30:09 -0000 1.2 *************** *** 7,10 **** --- 7,14 ---- # All rights reserved. # + # You are NOT ALLOWED to distribute modified versions of this file + # under its original name. If you want to modify it and then make + # your modifications available publicly, rename the file first. + # # This file is part of Unix Squeak. # *************** *** 15,19 **** # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following restrictions: # # 1. The origin of this software must not be misrepresented; you must not --- 19,23 ---- # You may use and/or distribute this file ONLY as part of Squeak, under # the terms of the Squeak License as described in `LICENSE' in the base of ! # this distribution, subject to the following additional restrictions: # # 1. The origin of this software must not be misrepresented; you must not *************** *** 23,27 **** # would be appreciated but is not required. # ! # 2. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak --- 27,34 ---- # would be appreciated but is not required. # ! # 2. You must not distribute (or make publicly available by any ! # means) a modified copy of this file unless you first rename it. ! # ! # 3. This notice must not be removed or altered in any source distribution. # # Using (or modifying this file for use) in any context other than Squeak *************** *** 29,39 **** # directory `platforms/unix/doc' before proceeding with any such use. # - # You are not allowed to distribute a modified version of this file - # under its original name without explicit permission to do so. If - # you change it, rename it. - # # Author: ian...@in... # ! # Last edited: 2002-06-10 23:40:08 by piumarta on emilia.inria.fr --- 36,42 ---- # directory `platforms/unix/doc' before proceeding with any such use. # # Author: ian...@in... # ! # Last edited: 2003-02-06 03:19:36 by piumarta on emilia.local. *************** *** 48,53 **** plugins="" ! if test "${ext_plugins}" != ""; then ! for p in ${ext_plugins}; do plugins="${plugins} ${p}${la}" done --- 51,56 ---- plugins="" ! if test "${ext_modules}${ext_plugins}" != ""; then ! for p in ${ext_modules} ${ext_plugins}; do plugins="${plugins} ${p}${la}" done *************** *** 59,72 **** plibs="" ! for p in vm ${int_plugins}; do ! targets="${targets} ${p}/${p}$a" ! echo >> ${make_targets} ! echo "${p}/${p}$a : .force" >> ${make_targets} ! echo ' @$(SHELL) -ec '"'cd ${p}; "'$(MAKE) '"${p}$a'" >> ${make_targets} ! test -f ${p}.lib && plibs="${plibs} `cat ${p}.lib`" ! done ! if test "${ext_plugins}" != ""; then ! for p in ${ext_plugins}; do echo >> ${make_targets} echo "${p}${la} :" >> ${make_targets} --- 62,77 ---- plibs="" ! if test "${int_modules}${int_plugins}" != ""; then ! for p in ${int_modules} ${int_plugins}; do ! targets="${targets} ${p}/${p}$a" ! echo >> ${make_targets} ! echo "${p}/${p}$a : .force" >> ${make_targets} ! echo ' @$(SHELL) -ec '"'cd ${p}; "'$(MAKE) '"${p}$a'" >> ${make_targets} ! test -f ${p}.lib && plibs="${plibs} `cat ${p}.lib`" ! done ! fi ! if test "${ext_modules}${ext_plugins}" != ""; then ! for p in ${ext_modules} ${ext_plugins}; do echo >> ${make_targets} echo "${p}${la} :" >> ${make_targets} *************** *** 84,88 **** void *primitiveAddress; } sqExport; ! `for p in ${exc_plugins}; do echo "sqExport ${p}_exports[] = { 0, 0, 0 };"; done` EOF cat >> ${make_targets} <<EOF --- 89,93 ---- void *primitiveAddress; } sqExport; ! `for p in ${exc_plugins}; do echo "sqExport ${p}_exports[] = { 0, 0, 0 };"; done | sed 's/-/_/g'` EOF cat >> ${make_targets} <<EOF Index: vmm.config =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/config/vmm.config,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsUzUekf and /tmp/cvsoVqvok differ |
