diff -ur scilab-4.0_ori/routines/console/dynamic_menus.c scilab-4.0/routines/console/dynamic_menus.c --- scilab-4.0_ori/routines/console/dynamic_menus.c 2005-10-22 20:53:10.000000000 +0200 +++ scilab-4.0/routines/console/dynamic_menus.c 2006-06-18 11:30:09.000000000 +0200 @@ -3,6 +3,9 @@ * jpc@cermics.enpc.fr * Changed: steer, jpc 2004 *--------------------------------------------------------------------------*/ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include #include diff -ur scilab-4.0_ori/routines/interf/intinterp.c scilab-4.0/routines/interf/intinterp.c --- scilab-4.0_ori/routines/interf/intinterp.c 2005-11-05 22:19:15.000000000 +0100 +++ scilab-4.0/routines/interf/intinterp.c 2006-06-18 11:25:57.000000000 +0200 @@ -10,6 +10,9 @@ #if WIN32 #include #endif +#ifdef __APPLE__ +#include +#endif #include diff -ur scilab-4.0_ori/routines/os_specific/link_SYSV.c scilab-4.0/routines/os_specific/link_SYSV.c --- scilab-4.0_ori/routines/os_specific/link_SYSV.c 2003-02-04 22:16:08.000000000 +0100 +++ scilab-4.0/routines/os_specific/link_SYSV.c 2006-06-18 11:27:24.000000000 +0200 @@ -34,7 +34,7 @@ #endif -#if defined(linux) || defined(netbsd) || defined(freebsd) +#if defined(linux) || defined(netbsd) || defined(freebsd) || defined(__APPLE__) #include #include #endif diff -ur scilab-4.0_ori/routines/scicos/matscicos.c scilab-4.0/routines/scicos/matscicos.c --- scilab-4.0_ori/routines/scicos/matscicos.c 2005-11-05 22:19:15.000000000 +0100 +++ scilab-4.0/routines/scicos/matscicos.c 2006-06-18 11:34:24.000000000 +0200 @@ -3,6 +3,9 @@ /* INRIA 2005 */ /* Allan CORNET */ /*-----------------------------------------------------------------------------------*/ +#ifdef __APPLE__ +#include +#endif #if WIN32 #include #include "../os_specific/win_mem_alloc.h" diff -ur scilab-4.0_ori/routines/wintools/intOEMconvert.h scilab-4.0/routines/wintools/intOEMconvert.h --- scilab-4.0_ori/routines/wintools/intOEMconvert.h 2005-05-10 16:52:08.000000000 +0200 +++ scilab-4.0/routines/wintools/intOEMconvert.h 2006-06-18 11:39:18.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef __INTOEMCONVERT__ #define __INTOEMCONVERT__ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include #endif diff -ur scilab-4.0_ori/routines/wintools/intabout.h scilab-4.0/routines/wintools/intabout.h --- scilab-4.0_ori/routines/wintools/intabout.h 2005-03-02 16:47:56.000000000 +0100 +++ scilab-4.0/routines/wintools/intabout.h 2006-06-18 11:40:02.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef __INTABOUT__ #define __INTABOUT__ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include #endif diff -ur scilab-4.0_ori/routines/wintools/intconsoledos.h scilab-4.0/routines/wintools/intconsoledos.h --- scilab-4.0_ori/routines/wintools/intconsoledos.h 2005-03-02 16:47:56.000000000 +0100 +++ scilab-4.0/routines/wintools/intconsoledos.h 2006-06-18 11:40:34.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef __INTCONSOLEDOS__ #define __INTCONSOLEDOS__ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include #endif diff -ur scilab-4.0_ori/routines/wintools/intfileassociationbox.h scilab-4.0/routines/wintools/intfileassociationbox.h --- scilab-4.0_ori/routines/wintools/intfileassociationbox.h 2005-09-18 21:18:49.000000000 +0200 +++ scilab-4.0/routines/wintools/intfileassociationbox.h 2006-06-18 11:44:52.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef __INTFILEASSOCIATIONBOX__ #define __INTFILEASSOCIATIONBOX__ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include "../wsci/FilesAssociationBox.h" #include "../wsci/wgnuplib.h" diff -ur scilab-4.0_ori/routines/wintools/intihmcolor.h scilab-4.0/routines/wintools/intihmcolor.h --- scilab-4.0_ori/routines/wintools/intihmcolor.h 2005-08-05 23:26:44.000000000 +0200 +++ scilab-4.0/routines/wintools/intihmcolor.h 2006-06-18 11:44:21.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef __INTIHMCOLOR__ #define __INTIHMCOLOR__ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include #endif diff -ur scilab-4.0_ori/routines/wintools/intmcisendstring.h scilab-4.0/routines/wintools/intmcisendstring.h --- scilab-4.0_ori/routines/wintools/intmcisendstring.h 2005-05-02 20:35:23.000000000 +0200 +++ scilab-4.0/routines/wintools/intmcisendstring.h 2006-06-18 11:38:30.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef __INTMCISENDSTRING__ #define __INTMCISENDSTRING__ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include #endif diff -ur scilab-4.0_ori/routines/wintools/intpathname.h scilab-4.0/routines/wintools/intpathname.h --- scilab-4.0_ori/routines/wintools/intpathname.h 2005-03-02 16:47:56.000000000 +0100 +++ scilab-4.0/routines/wintools/intpathname.h 2006-06-18 11:41:38.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef __INTPATHNAME__ #define __INTPATHNAME__ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include #endif diff -ur scilab-4.0_ori/routines/wintools/intprintbox.h scilab-4.0/routines/wintools/intprintbox.h --- scilab-4.0_ori/routines/wintools/intprintbox.h 2005-08-03 15:26:51.000000000 +0200 +++ scilab-4.0/routines/wintools/intprintbox.h 2006-06-18 11:43:35.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef __INTPRINTBOX__ #define __INTPRINTBOX__ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include #endif diff -ur scilab-4.0_ori/routines/wintools/intsetlanguagemenu.h scilab-4.0/routines/wintools/intsetlanguagemenu.h --- scilab-4.0_ori/routines/wintools/intsetlanguagemenu.h 2005-03-02 16:47:56.000000000 +0100 +++ scilab-4.0/routines/wintools/intsetlanguagemenu.h 2006-06-18 11:42:12.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef __INTSETLANGUAGEMENU__ #define __INTSETLANGUAGEMENU__ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include #endif diff -ur scilab-4.0_ori/routines/wintools/inttoolbar.h scilab-4.0/routines/wintools/inttoolbar.h --- scilab-4.0_ori/routines/wintools/inttoolbar.h 2005-03-02 16:47:56.000000000 +0100 +++ scilab-4.0/routines/wintools/inttoolbar.h 2006-06-18 11:42:36.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef __INTTOOLBAR__ #define __INTTOOLBAR__ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include #endif diff -ur scilab-4.0_ori/routines/wintools/inttoprint.h scilab-4.0/routines/wintools/inttoprint.h --- scilab-4.0_ori/routines/wintools/inttoprint.h 2005-08-04 14:12:02.000000000 +0200 +++ scilab-4.0/routines/wintools/inttoprint.h 2006-06-18 11:43:56.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef __INTTOPRINT__ #define __INTTOPRINT__ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include #endif diff -ur scilab-4.0_ori/routines/wintools/intwinopen.h scilab-4.0/routines/wintools/intwinopen.h --- scilab-4.0_ori/routines/wintools/intwinopen.h 2005-03-02 16:47:56.000000000 +0100 +++ scilab-4.0/routines/wintools/intwinopen.h 2006-06-18 11:43:00.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef __INTWINOPEN__ #define __INTWINOPEN__ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include #endif diff -ur scilab-4.0_ori/routines/wintools/intwintools.h scilab-4.0/routines/wintools/intwintools.h --- scilab-4.0_ori/routines/wintools/intwintools.h 2005-03-02 16:47:56.000000000 +0100 +++ scilab-4.0/routines/wintools/intwintools.h 2006-06-18 11:37:20.000000000 +0200 @@ -5,6 +5,9 @@ #ifndef __INTWINTOOLS__ #define __INTWINTOOLS__ +#ifdef __APPLE__ +#include +#endif #ifdef WIN32 #include #include --- scilab-4.0/routines/interf/matelm.f~ 2006-01-23 18:12:31.000000000 +0100 +++ scilab-4.0/routines/interf/matelm.f 2006-06-18 12:33:47.000000000 +0200 @@ -5080,7 +5080,7 @@ tiniest = dlamch('u') if ( tiniest/b .ne. 0.d0 ) then c denormalised number are used - do i = 1, dlamch('n') - 1 + do i = 1, int(dlamch('n')) - 1 tiniest = tiniest / b enddo endif --- scilab-4.0/routines/interf/matdes.c~ 2006-02-01 15:25:08.000000000 +0100 +++ scilab-4.0/routines/interf/matdes.c 2006-06-18 14:41:02.000000000 +0200 @@ -5166,7 +5166,7 @@ /*-----------------------------------------------------------------------------------*/ -int move(char *fname,unsigned long fname_len) +int scimove(char *fname,unsigned long fname_len) { long hdl; integer m1,n1,l1,m2,n2,l2,m3,n3,l3,n; --- scilab-4.0/routines/interf/intgraphics.c~ 2005-12-05 11:18:49.000000000 +0100 +++ scilab-4.0/routines/interf/intgraphics.c 2006-06-18 14:41:26.000000000 +0200 @@ -84,7 +84,7 @@ extern int sci_delete _PARAMS((char *fname, unsigned long fname_len)); extern int addcb _PARAMS((char *fname, unsigned long fname_len)); extern int copy _PARAMS((char *fname, unsigned long subwinparenttarget)); -extern int move _PARAMS((char *fname, unsigned long fname_len)); +extern int scimove _PARAMS((char *fname, unsigned long fname_len)); extern int glue _PARAMS((char *fname, unsigned long fname_len)); extern int unglue _PARAMS((char *fname, unsigned long fname_len)); extern int drawnow _PARAMS((char *fname, unsigned long fname_len)); @@ -181,7 +181,7 @@ {sci_delete,"delete"}, {addcb,"addcb"}, {copy,"copy"}, - {move,"move"}, + {scimove,"move"}, {glue,"glue"}, {unglue,"unglue"}, {drawnow,"drawnow"}, --- scilab/configure.orig 2007-09-10 04:46:20.000000000 -0400 +++ scilab/configure 2012-04-17 16:11:32.000000000 -0400 @@ -24928,19 +24928,19 @@ PERIX11NOPT=periX11 GCC=yes CC=gcc - CC_OPTIONS='-no-cpp-precomp -O2 -DNDEBUG -I/sw/include -L/sw/lib' - CC_LDFLAGS='-L/sw/lib' + CC_OPTIONS='-no-cpp-precomp -O2 -DNDEBUG -I@PREFIX@/include -L@PREFIX@/lib' + CC_LDFLAGS='-L@PREFIX@/lib' CC_PICFLAGS='-fPIC' # script shell f77 have bugs, get ours - FC=g77 + FC=gfortran FC_OPTIONS='-O2' FC_OPTIONS_O0= - FC_LDFLAGS='-L/sw/lib -ldl -lcc_dynamic' + FC_LDFLAGS='-L@PREFIX@/lib -ldl' FC_PICFLAGS='-fPIC' LD=ld LD_LDFLAGS= if test "$enable_debug" = yes; then - CC_OPTIONS='-g -I/sw/include ' + CC_OPTIONS='-g -I@PREFIX@/include ' FC_OPTIONS=-g fi if test "$WITH_G77" = yes; then @@ -28227,7 +28227,7 @@ # Check for tcl header file { echo "$as_me:$LINENO: checking for header file tcl.h" >&5 echo $ECHO_N "checking for header file tcl.h... $ECHO_C" >&6; } - dirs="$USER_TCL_INC_PATH /include /usr/include /usr/include/tcl /usr/include/tcl8.* /usr/local/include /usr/local/include/tcl /usr/local/include/tcl8.* /usr/X11/include/tcl /usr/X11/include/tcl8.* /usr/include/X11 /usr/include/X11/tcl /usr/include/X11/tcl8.* ../include ../../include /usr/tcl /usr/local/tcl /usr/local/tcl/include /usr/tcl/include /sw/include" + dirs="$USER_TCL_INC_PATH /include /usr/include /usr/include/tcl /usr/include/tcl8.* /usr/local/include /usr/local/include/tcl /usr/local/include/tcl8.* /usr/X11/include/tcl /usr/X11/include/tcl8.* /usr/include/X11 /usr/include/X11/tcl /usr/include/X11/tcl8.* ../include ../../include /usr/tcl /usr/local/tcl /usr/local/tcl/include /usr/tcl/include @PREFIX@/include" for i in $dirs ; do if test -r $i/tcl.h; then { echo "$as_me:$LINENO: result: found in $i " >&5 @@ -28381,7 +28381,7 @@ TCL_LIB_OK=0 { echo "$as_me:$LINENO: checking for tcl library tcl$TCL_MAJOR_VERSION.$TCL_MINOR_VERSION" >&5 echo $ECHO_N "checking for tcl library tcl$TCL_MAJOR_VERSION.$TCL_MINOR_VERSION... $ECHO_C" >&6; } -dirs="$USER_TCL_LIB_PATH /lib /usr/lib /usr/lib/tcl /usr/lib/tcl8.* /shlib /shlib/tcl /shlib/tcl8.* /usr/shlib /shlib/tcl /usr//shlib/tcl8.* /usr/local/lib /usr/local/lib/tcl /usr/local/lib/tcl8.* /usr/local/shlib /usr/X11/lib/tcl /usr/X11/lib/tcl8.* /usr/lib/X11 /usr/lib/X11/tcl /usr/lib/X11/tcl8.* ../lib ../../lib /usr/local/tcl /usr/tcl /usr/tcl/lib /usr/local/tcl/lib /sw/lib/ ." +dirs="$USER_TCL_LIB_PATH /lib /usr/lib /usr/lib/tcl /usr/lib/tcl8.* /shlib /shlib/tcl /shlib/tcl8.* /usr/shlib /shlib/tcl /usr//shlib/tcl8.* /usr/local/lib /usr/local/lib/tcl /usr/local/lib/tcl8.* /usr/local/shlib /usr/X11/lib/tcl /usr/X11/lib/tcl8.* /usr/lib/X11 /usr/lib/X11/tcl /usr/lib/X11/tcl8.* ../lib ../../lib /usr/local/tcl /usr/tcl /usr/tcl/lib /usr/local/tcl/lib @PREFIX@/lib/ ." libexts="so so.1.0 sl dylib a" libnames="tcl$CHK_TCL_MAJ.$CHK_TCL_MIN tcl.$CHK_TCL_MAJ.$CHK_TCL_MIN tcl$CHK_TCL_MAJ$CHK_TCL_MIN tcl.$CHK_TCL_MAJ$CHK_TCL_MIN" for e in $libexts; do @@ -28588,7 +28588,7 @@ echo $ECHO_N "checking for header file tk.h... $ECHO_C" >&6; } TK_LIB_OK=0 TK_INCLUDE_OK=0 - dirs="$USER_TK_INC_PATH /include /usr/include /usr/include/tk /usr/include/tk8.* /usr/local/include /usr/local/include/tk /usr/local/include/tk8.* /usr/X11/include/tk /usr/X11/include/tk8.* /usr/include/X11 /usr/include/X11/tk /usr/include/X11/tk8.* ../include ../../include /usr/tk /usr/local/tk /usr/local/tk/include /usr/tk/include /usr/local/tcl /usr/tcl /usr/tcl/include /usr/local/tcl/include /sw/include /usr/include/tcl8.*" + dirs="$USER_TK_INC_PATH /include /usr/include /usr/include/tk /usr/include/tk8.* /usr/local/include /usr/local/include/tk /usr/local/include/tk8.* /usr/X11/include/tk /usr/X11/include/tk8.* /usr/include/X11 /usr/include/X11/tk /usr/include/X11/tk8.* ../include ../../include /usr/tk /usr/local/tk /usr/local/tk/include /usr/tk/include /usr/local/tcl /usr/tcl /usr/tcl/include /usr/local/tcl/include @PREFIX@/include /usr/include/tcl8.*" for i in $dirs ; do if test -r $i/tk.h; then { echo "$as_me:$LINENO: result: found in $i " >&5 @@ -28698,7 +28698,7 @@ { echo "$as_me:$LINENO: checking for tk library tk$TK_MAJOR_VERSION.$TK_MINOR_VERSION" >&5 echo $ECHO_N "checking for tk library tk$TK_MAJOR_VERSION.$TK_MINOR_VERSION... $ECHO_C" >&6; } -dirs="$USER_TK_LIB_PATH /lib /usr/lib /usr/lib/tk /usr/lib/tk8.* /shlib /shlib/tk /shlib/tk8.* /usr/shlib /shlib/tk /usr/shlib/tk8.* /usr/local/lib /usr/local/lib/tk /usr/local/lib/tk8.* /usr/local/shlib /usr/X11/lib/tk /usr/X11/lib/tk8.* /usr/lib/X11 /usr/lib/X11/tk /usr/lib/X11/tk8.* ../lib ../../lib /usr/tk /usr/local/tk /usr/local/tk/lib /usr/tk/lib /usr/local/tcl /usr/tcl /usr/local/tcl/lib /usr/tcl/lib /sw/lib " +dirs="$USER_TK_LIB_PATH /lib /usr/lib /usr/lib/tk /usr/lib/tk8.* /shlib /shlib/tk /shlib/tk8.* /usr/shlib /shlib/tk /usr/shlib/tk8.* /usr/local/lib /usr/local/lib/tk /usr/local/lib/tk8.* /usr/local/shlib /usr/X11/lib/tk /usr/X11/lib/tk8.* /usr/lib/X11 /usr/lib/X11/tk /usr/lib/X11/tk8.* ../lib ../../lib /usr/tk /usr/local/tk /usr/local/tk/lib /usr/tk/lib /usr/local/tcl /usr/tcl /usr/local/tcl/lib /usr/tcl/lib @PREFIX@/lib " libexts="so so.1.0 sl dylib a" libnames="tk$CHK_TK_MAJ.$CHK_TK_MIN tk.$CHK_TK_MAJ.$CHK_TK_MIN tk$CHK_TK_MAJ$CHK_TK_MIN tk.$CHK_TK_MAJ$CHK_TK_MIN" @@ -28949,7 +28949,7 @@ case "$host" in *-*-darwin*) - GETLIBTK=/sw/lib/libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.dylib + GETLIBTK=@PREFIX@/lib/libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.dylib ;; *-*-cygwin* | *-*-mingw32*) GETLIBTK=tk$TK_MAJOR_VERSION$TK_MINOR_VERSION.dll