Hi John,

Just a thought, are you running autoreconf in the top directory?  I just
did a fresh checkout here (redhat 9.0) and got the following:

[steven@localhost csound]$ autoreconf -i
configure.ac: installing `./install-sh'
configure.ac: installing `./mkinstalldirs'
configure.ac: installing `./missing'
Makefile.am: installing `./INSTALL'
anal/adsyn/Makefile.am: installing `./depcomp'
csound/Makefile.am: installing `./compile'
doc/Makefile.am:1: installing `doc/mdate-sh'
doc/Makefile.am:1: installing `doc/texinfo.tex'
[steven@localhost csound]$ autoreconf -f
[steven@localhost csound]$ ls
aclocal.m4      config.sub      CsoundVST     jfpp.mk        OSC-Kit
anal            configure       CsoundVSTWin  ltmain.sh      pyrun
AUTHORS         configure.ac    CVS           Makefile.am    README
autom4te.cache  COPYING         depcomp       Makefile.in    soundfonts
ChangeLog       cscofils        doc           missing        util1
compile         csound          INSTALL       mkinstalldirs  util2
config.guess    csound.spec.in  install-sh    NEWS
[steven@localhost csound]$ autoreconf -V
autoreconf (GNU Autoconf) 2.57
Written by David J. MacKenzie and Akim Demaille.
 
Copyright 2002 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is
NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE.
[steven@localhost csound]$

I recently had troubles using 2.59 of the GNU Autotools.  Maybe the
version of autoreconf/autoconf/etc. you're using might be a problem?

steven



On Sat, 2004-01-17 at 14:28, jpff@codemist.co.uk wrote:
> I have just d/loaded csound(4) onto a fresh machine -- Debian.  I see
> from README that as there is no INSTALL file that I should go
>      autoreconf -i
>      autoreconf -f
> and then ./configure
> My problem is that there is no ./configure file to run.  No comment
> from the other two commands.  What am I supposed to do next?
> 
> ==John ffitch
>   Glad I kept my running sources on another machine
> 
> 

I have just d/loaded csound(4) onto a fresh machine -- Debian.  I see
from README that as there is no INSTALL file that I should go
     autoreconf -i
     autoreconf -f
and then ./configure
My problem is that there is no ./configure file to run.  No comment
from the other two commands.  What am I supposed to do next?

==John ffitch
  Glad I kept my running sources on another machine

I was certainly in the csound directory.  This is a just updated debian 
system and so it has whatever Debian stable gives.  autoreconf -i and 0f 
gave no output at all.
==John ff

Version 2.13

On Sat, 17 Jan 2004, John ffitch wrote:

> I was certainly in the csound directory.  This is a just updated debian 
> system and so it has whatever Debian stable gives.  autoreconf -i and 0f 
> gave no output at all.
> ==John ff
> 
> 
> 
> 

John,

I so happy to hear you're trying the GBS version of Csound, but
remember, if the GBS version of Csound fails you for any reason, you
should be able to build with the original makefiles.  Just cd into the
csound directory and you should find Makefile.lnx.  This should allow
you to build a system as you have always done.  If this is broken,
let's fix it soon.  One of the reasons I made sure the original
makefiles continued to work is because of questions with Debian
systems.

But back to the GBS version.  I have been led to believe that Debian
provides a modern version of autoconf, but an old version of
automake.  Please send the version of autoconf, automake, and libtoolize
that is available on your machine.  On RH9, the versions are:

$ autoconf --version
-autoconf (GNU Autoconf) 2.57
Written by David J. MacKenzie and Akim Demaille.
 
Copyright 2002 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There
is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE.
$ automake --version
automake (GNU automake) 1.6.3
Written by Tom Tromey .
 
Copyright 2002 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There
is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE.
$ libtoolize --version
libtoolize (GNU libtool) 1.4.3
$

In any event, you should be able to download and build
csound-4.23f09gbs.1.tar.gz from the wxcsound package and build csound
on Debian without worrying about the GNU build system tools version
numbers. 

Remember to do a "cvs up -d" soon.

John

> But back to the GBS version.  I have been led to believe that Debian
> provides a modern version of autoconf, but an old version of
> automake.

I've also been told that Debian systems have a program called appget
for pulling down new packages, and updating old ones.  You should be
able to quickly update automake, or whatever, with that program.

John

...but I updated everything immediately before I called cvs (including a 
new cvs).....

GBS?

Longer report.  Debian Stable has autoconf 2.53 but the build says it 
needs 2.59 or later.  I have fiddled to get a more recent version of 
autoconf from the testing/unstable world and after only 1 hr of 
reinstalling and uninstalling packages it is compiling, albeit with many 
warnings which used not to be there.  Some of these come from the autoconf 
stuff, but some comes from C (like non declaration of strrchr in 
getstring.c which does not happen on my working system).  I dislike this 
kind of departure from ANSI C.  I will not take the CVS system seriously 
for csound4 in thsi state.
==John ff

John D. Ramsdell wrote:

>I've also been told that Debian systems have a program called appget
>for pulling down new packages, and updating old ones.  You should be
>able to quickly update automake, or whatever, with that program.
>  
>
Hi all:

  Just a quick note regarding the apt system. I use it for both my 
Planet CCRMA (Red Hat) and Demudi (Debian) systems, and I must admit 
I've come to love it. It is great for updating old packages and 
installing new ones, very easy to use and very effective, particularly 
with regards to maintaining system stability. Good stuff... Btw, the 
actual term is "apt-get"...

Best,

== dp

...and more.  The make fails as winX11.o does not exist when it creates 
someting called libanalutils.a whatever that it for.  Seems even more 
broken that I thought!

I do hope that the Csound5 tree is not in this state.

==John ff

Greetings:

  Another short note. I retrieved CVS trees for both Csound4 and Csound5 
two days ago. As stated in a previous note, I compiled both under GCC 
3.2.2 from Planet CCRMA's Red Hat 9.0. I made almost no changes to the 
sources, only switching some -malign-loops and -malign-jumps compiler 
directives to -falign-loops and -falign-jumps to get rid of the warnings 
(as per the compiler messages). Following jpff's suggestion I installed 
PortAudio 18.1 and Csound5 also compiled without other errors. Alas, I 
have not had time to check either version for performance, but with 
John's metro plugin (Thank you, John!) I'll get back to work on 
ImproSculpt and can test it against both versions. I should have a 
report by Tuesday.

Best regards,

== dp



John ffitch wrote:

>...and more.  The make fails as winX11.o does not exist when it creates 
>someting called libanalutils.a whatever that it for.  Seems even more 
>broken that I thought!
>
>I do hope that the Csound5 tree is not in this state.
>
>==John ff
>
>
>  
>

John ffitch  writes:

> ...and more.  The make fails as winX11.o does not exist when it creates 
> someting called libanalutils.a whatever that it for.  Seems even more 
> broken that I thought!

Where you able to build the system by renaming Makefile.lnx to
Makefile and typing make in the csound directory?  This should allow
you to build a system just as you have always done.

John

Dave Phillips  writes:

> Greetings:
> 
>   Another short note. I retrieved CVS trees for both Csound4 and
> Csound5 two days ago. As stated in a previous note, I compiled both
> under GCC 3.2.2 from Planet CCRMA's Red Hat 9.0. I made almost no
> changes to the sources, only switching some -malign-loops and
> -malign-jumps compiler directives to -falign-loops and -falign-jumps
> to get rid of the warnings (as per the compiler messages).

Dave,

Did you use the GNU Build System or csound/Makefile.lnx to build
Csound 4?  If you used csound/Makefile.lnx please check to see it
works on Debian.  If it works on Debian, this would be the quick way
to get jpff up and running.

John

>>>>> "John" == John D Ramsdell  writes:

 John> John ffitch  writes:
 >> ...and more.  The make fails as winX11.o does not exist when it creates 
 >> someting called libanalutils.a whatever that it for.  Seems even more 
 >> broken that I thought!

 John> Where you able to build the system by renaming Makefile.lnx to
 John> Makefile and typing make in the csound directory?  This should allow
 John> you to build a system just as you have always done.

I thought the whole point of the autoconf stuff was to write a correct
makefile.   No I have not tried that as i was acting like a user, nit
a developer.  I followed the CVS rules to down load what it gave me,
and read the README file.  Surely I am not the only person in the
universe using Debian stable?  This is not my usual platform, but i
was experimenting with Debian in preparation for the loss of Redhat.
If Csound does not build on a freshly installed and upgraded system
then something is very wrong.  Sure I could transfer by working tree,
but there is little point in that.

==John ffitch

.... I did
cd csound
make winX11.o
cd ..

and then make is running.

I am still seeing a distressing number of undeclared functions -- I
have Csound so there were no such warnings -- but what does "-I
../[csound" mean as a option to gcc?]

I am also rather at a loss as to whu configure asks if bzero (for
example) exists as this not an ANSI C function and Csound should not
care a d*mn whether it does or not.  That suggests some fundamental
errors in the configuration mechyanism to me.

==John ffitch

jpff@codemist.co.uk writes:

> I thought the whole point of the autoconf stuff was to write a
> correct makefile.  No I have not tried that as i was acting like a
> user, nit a developer.

Let me explain my take on the contents of the csound module.  I think
this is a situation in which I've made most of these points, but they
have been scattered in various messages.

I have been following the rule that the csound module is different
than the csound5 module in that it must retain the capability of being
built using the original makefiles.  Furthermore, it must not contain
the results of any of the GNU build system tools.  In particular, the
module should not have a copy of configure in its top-level directory.

If you export the contents of the csound module, you will obtain a
system with a README that starts with:

    If your distribution has a file named ./configure, build using the
    instructions in INSTALL, otherwise, find a Makefile that matches
    your system in the csound directory.  Rename it to Makefile, and
    then edit it following the instructions in its comments.

Since the exported version of csound does not contain a file named
./configure, the user is directed to build a system following the same
procedure that was used when Csound did not have an open source
license.

Here is another important point to make: there is no reason the GNU
build system tools must be available on every platform used to build
csound.  They only need to be available on the platforms used to build
a distribution.  To satisfy Micheal's request that a distribution be
capable of building DLLs on Cygwin, I've been using the GNU build
system tools on Cygwin.  I've found that the current tools on Red Hat
Linux do not write a libtool script that recognizes Windows DLLs.

The csound5 module can include the results of running GNU build system
tools.  I imagine that the tools will be run on Cygwin, but testing
will tell the best platform.  In any event, it looks like they will
not be run on Debian in the immediate future unless someone figures
out how to update the tools on Debian.  This is no problem because
Debian users will simply get the results of running the tools when the
sources are checked out of the csound5 module.

John

jpff@codemist.co.uk writes:

> I am still seeing a distressing number of undeclared functions

... and there are other distressing messages too.  I've seen this
whenever I specify -Wall with GCC.  I think you get them when using
the original makefiles too, but I could be wrong.

The ChangeLog records that I fixed the worst of the distressing
messages in October.

2003-10-13  John D. Ramsdell  

	* uggab.c (anterpol): Made loop expression unambiguous.

	* ugens4.c: Int constants changed to unsigned long, as they do not
	fit as ints.

John

Greetings:

  I used the GNU build tools for both 4 and 5.

  I'll test Makefile.lnx under AGNULA Demudi this afternoon.

Best,

== dp


John D. Ramsdell wrote:

>Dave Phillips  writes:
>
>  
>
>>Greetings:
>>
>>  Another short note. I retrieved CVS trees for both Csound4 and
>>Csound5 two days ago. As stated in a previous note, I compiled both
>>under GCC 3.2.2 from Planet CCRMA's Red Hat 9.0. I made almost no
>>changes to the sources, only switching some -malign-loops and
>>-malign-jumps compiler directives to -falign-loops and -falign-jumps
>>to get rid of the warnings (as per the compiler messages).
>>    
>>
>
>Dave,
>
>Did you use the GNU Build System or csound/Makefile.lnx to build
>Csound 4?  If you used csound/Makefile.lnx please check to see it
>works on Debian.  If it works on Debian, this would be the quick way
>to get jpff up and running.
>
>John
>
>
>  
>

Dave Phillips  writes:

> Greetings:
> 
>   I used the GNU build tools for both 4 and 5.
> 
>   I'll test Makefile.lnx under AGNULA Demudi this afternoon.

Thank you so much.  If it is not too much trouble, on a Debian system,
would you try building the sources in the csound-4.23f09gbs.1.tar.gz
from the wxcsound package version 1.02 from the csound project on
SourceForge?

    http://sf.net/projects/csound

John

Greetings:

  I finally got around to upgrading my AGNULA system to Demudi 1.1.0. 
This system is based on a Debian 3.0 distribution,
with fairly current ALSA and other components.

  Results were not so good. Trying to unpack 4-23f09gbs resulted in this 
failure :

dlphilp@localhost:~$ tar xzvf Csound_423f09.tar.gz
csound_4.23f09/
csound_4.23f09/3Dug.h
tar: Skipping to next header
tar: Archive contains obsolescent base-64 headers

gzip: stdin: invalid compressed data--format violated
tar: Child returned status 1
tar: Error exit delayed from previous errors


  I tried to build 4.23f08 instead and got this far :

dlphilp@localhost:~/csound$ make
cc -Wall -O2 -malign-loops=4 -malign-jumps=4 -ffast-math 
-fomit-frame-pointer -finline-functions -funroll-loops -DWITHx87  
-DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DTCLTK 
-DIV_SCHED -DHAVE_FLTK -c main.c -o main.o
cc1: warning: -malign-loops is obsolete, use -falign-loops
cc1: warning: -malign-jumps is obsolete, use -falign-jumps
In file included from main.c:24:
cs.h:31:24: autoheader.h: No such file or directory
In file included from cs.h:36,
                 from main.c:24:
sysdep.h:24:24: autoheader.h: No such file or directory
make: *** [main.o] Error 1

  Which leads me to believe I'm missing a system component (very likely: 
I had some trouble with the upgrade).

  I don't know if any of this is helpful, but there you have it. Btw, 
the csound that comes with Demudi works fine.

Best regards,

Dave Phillips





John D. Ramsdell wrote:

>Dave Phillips  writes:
>
>  
>
>>Greetings:
>>
>>  I used the GNU build tools for both 4 and 5.
>>
>>  I'll test Makefile.lnx under AGNULA Demudi this afternoon.
>>    
>>
>
>Thank you so much.  If it is not too much trouble, on a Debian system,
>would you try building the sources in the csound-4.23f09gbs.1.tar.gz
>from the wxcsound package version 1.02 from the csound project on
>SourceForge?
>
>    http://sf.net/projects/csound
>
>John
>
>
>  
>

Dave Phillips  writes:

>   Results were not so good. Trying to unpack 4-23f09gbs resulted in
> this failure :
> 
> dlphilp@localhost:~$ tar xzvf Csound_423f09.tar.gz

This suggests that you got the sources from the csound package of the
csound project on SourceForge.  I would like you to try the sources
from the wxcsound package version 1.02.  The Csound sources are in the
following file:

csound-4.23f09gbs.1.tar.gz

John

Greetings:

  Sorry, I thought I'd done it right but it was late, I was tired, I was 
abducted by aliens...

  So I logged back into my Demudi partition, got the correct sources, 
and ran './configure --with-fltk'. Unfortunately Demudi
seems to have an incomplete installation of FLTK (no fltk-config) so the 
configure script politely declined to compile in FLTK
support. No problem, I ran 'make', things move along all right until here :

gcc -I./../../csound -g -O2 -Wall -falign-loops=4 -falign-jumps=4 
-ffast-math -fomit-frame-pointer -finline-functions -funroll-loops -o 
hetro main.o  ../../csound/libanalutils.a -ldl -lm
../../csound/libanalutils.a(libanalutils_a-hetro.o)(.text+0x41f): In 
function `hetro':
/home/dlphilp/csound-4.23f09gbs.1/csound/hetro.c:286: undefined 
reference to `POLL_EVENTS'
../../csound/libanalutils.a(libanalutils_a-hetro.o)(.text+0x531):/home/dlphilp/csound-4.23f09gbs.1/csound/hetro.c:301: 
undefined reference to `POLL_EVENTS'
../../csound/libanalutils.a(libanalutils_a-hetro.o)(.text+0xc7b): In 
function `hetdyn':
/home/dlphilp/csound-4.23f09gbs.1/csound/hetro.c:359: undefined 
reference to `POLL_EVENTS'
../../csound/libanalutils.a(libanalutils_a-hetro.o)(.text+0xda9):/home/dlphilp/csound-4.23f09gbs.1/csound/hetro.c:383: 
undefined reference to `POLL_EVENTS'
../../csound/libanalutils.a(libanalutils_a-hetro.o)(.text+0xe83):/home/dlphilp/csound-4.23f09gbs.1/csound/hetro.c:403: 
undefined reference to `POLL_EVENTS'
collect2: ld returned 1 exit status
make[2]: *** [hetro] Error 1
make[2]: Leaving directory `/home/dlphilp/csound-4.23f09gbs.1/anal/adsyn'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/dlphilp/csound-4.23f09gbs.1/anal'
make: *** [all-recursive] Error 1


dlphilp@localhost:~/csound-4.23f09gbs.1$ gcc --version
gcc (GCC) 3.3.2 (Debian)


  There you have it.

Best regards,

++ dp



John D. Ramsdell wrote:

>>  Results were not so good. Trying to unpack 4-23f09gbs resulted in
>>this failure :
>>
>>dlphilp@localhost:~$ tar xzvf Csound_423f09.tar.gz
>>    
>>
>
>This suggests that you got the sources from the csound package of the
>csound project on SourceForge.  I would like you to try the sources
>from the wxcsound package version 1.02.  The Csound sources are in the
>following file:
>
>csound-4.23f09gbs.1.tar.gz
>
>John
>
>
>  
>

I took the files from an anonymous cvs, but then hit the autoconf
being the wrong version.  I have been given a recipe for allowing
mixing stable/testing/unstable but then apt-get crashs with
insufficient memory in mmap.  I still conclude that at the current
moment, Debian users are lost.
  Yes I could get it going by copying from my working system, but that
is not the point.
==John ffitch

Dave Phillips  writes:

>   So I logged back into my Demudi partition, got the correct sources,
> and ran './configure --with-fltk'. Unfortunately Demudi ...

Darn, I thought Debian support would be easy.  Dave, please create a
fresh unarchive of the sources, cd into csound, and then add the
following text to a file:

./configure --prefix=$HOME/opt/csound
cat config.log
make
make install

Finally, use the file as input to nohup, and send me the generated
nohup.out.  I should be able to figure out what went wrong from that
info.

John

jpff@codemist.co.uk writes:

> I took the files from an anonymous cvs, but then hit the autoconf
> being the wrong version.  ....

Yes, but could you build a system on Debian by folling the
instructions in the README for the case in which no configure file is
present? 

John

There is only one Makefile visible so I tried make as that will use
Makefile.  The result is apparently ok until trying to make
.libs/libcsound.so.0.0.0 (whatever that is for) when it crashes with 
gcc: winX11.lo: No such file or directory
Strange that it should link it without compiling it.  No idea what a
.lo file is so I am stuck again.

==John ffitch

Thanks; adding
APT::Cache-Limit 12582912;
                         ^___________NB
certainly improves things.
==John ffitch

jpff@codemist.co.uk writes:

> There is only one Makefile visible so I tried make as that will use
> Makefile.  

John, please do this:

$ find . -name Makefile.lnx -print

Go to the directory in which that file lives and then do:

$ cp Makefile.lnx Makefile

<< Edit Makefile to your liking >>

$ make

John

Hi John:

  I'm sorry I haven't been able to test your suggestions, I've simply 
been too busy with other projects.

  I must also confess that I'm quite confused regarding the recommended 
source archive for Csound for Linux.
I've tried three source packages recently: the tarball at dream/newest 
at Bath, the public source tarball at SourceForge,
and the CVS sources (for Csound4). Only the last package builds on my 
system. I have already reported the build failures
here. I have also built the sources from your wxcsound package; however, 
I hesitate to recommend them because I'm
trying to stay with the canonical track. Be assured, there's nothing 
wrong with your stuff.

  I'm preparing new materials for Rick Boulanger's site and for the 
Csound profile in my book. I'm currently recommending
the CVS sources and have created a brief page of instructions for 
downloading and building those sources under Linux. I'll
probably have stuff up at cSounds.com within a week or so.

  Btw, I've reworked Oeyvind Brandtsegg's ImproSculpt to run under 
Csound 4.23f08 (CVS). It runs
very nicely, and I wanted to pass my thanks to the Csound developers.

Best,

dp


John D. Ramsdell wrote:

>Dave Phillips  writes:
>
>  
>
>>  So I logged back into my Demudi partition, got the correct sources,
>>and ran './configure --with-fltk'. Unfortunately Demudi ...
>>    
>>
>
>Darn, I thought Debian support would be easy.  Dave, please create a
>fresh unarchive of the sources, cd into csound, and then add the
>following text to a file:
>
>./configure --prefix=$HOME/opt/csound
>cat config.log
>make
>make install
>
>Finally, use the file as input to nohup, and send me the generated
>nohup.out.  I should be able to figure out what went wrong from that
>info.
>
>John
>
>
>  
>

I patched insert.c as requested by jpff and released Csound
4.24f10gbs.0 in the wxcsound package on SourceForge.  I notice
that releasing the GNU Build System version of Csound in the wxcsound
package destroys download statistics, because the version of the
package is determined by wxCsound, and does not change to follow
csoundgbs release numbers.  Perhaps jpff should create a csoundgbs
package for GNU Build System releases so they can reflect accurate
version numbers and download statistics.  Sound like a good idea?

John

divan$ sfcvs csound diff -u -r csound-4_23f09gbs_1
ramsdell@cvs.csound.sourceforge.net's password:

cvs diff: Diffing .
Index: ChangeLog
===================================================================
RCS file: /cvsroot/csound/csound/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.49
diff -u -r1.46 -r1.49
--- ChangeLog	17 Jan 2004 16:36:46 -0000	1.46
+++ ChangeLog	31 Jan 2004 23:13:22 -0000	1.49
@@ -1,3 +1,18 @@
+2004-01-31  John D. Ramsdell  
+
+	* csound/insert.c: Updated as jpff requested.
+
+	* CVS: Tagged as csound-4_23f10gbs_0.
+
+2004-01-26  John D. Ramsdell  
+
+	* csound/Makefile.lnx (CFLAGS): Added proper includes for X11 and
+	FLTK.
+
+2004-01-19  John D. Ramsdell  
+
+	* csound/autoheader.h: Define SYS5 when string.h is detected.
+
 2004-01-17  John D. Ramsdell  
 
 	* CVS: Tagged as csound-4_23f09gbs_1.
Index: configure.ac
===================================================================
RCS file: /cvsroot/csound/csound/configure.ac,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- configure.ac	17 Jan 2004 16:34:11 -0000	1.43
+++ configure.ac	31 Jan 2004 23:39:37 -0000	1.44
@@ -2,7 +2,7 @@
 # This file incorporates ideas from the strace package.
 
 AC_PREREQ(2.57)
-AC_INIT([Csound], [4.23f09gbs.1])
+AC_INIT([Csound], [4.23f10gbs.0])
 
 # Information on the package
 AC_CONFIG_SRCDIR([csound/ccsound.c])
cvs diff: Diffing CsoundVST
cvs diff: Diffing CsoundVST/examples
cvs diff: Diffing CsoundVST/index_files
cvs diff: Diffing CsoundVSTWin
cvs diff: Diffing OSC-Kit
cvs diff: Diffing OSC-Kit/send+dump
cvs diff: Diffing anal
cvs diff: Diffing anal/adsyn
cvs diff: Diffing anal/convol
cvs diff: Diffing anal/lpc
cvs diff: Diffing anal/pvoc
cvs diff: Diffing cscofils
cvs diff: Diffing csound
Index: csound/Makefile.lnx
===================================================================
RCS file: /cvsroot/csound/csound/csound/Makefile.lnx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- csound/Makefile.lnx	29 Nov 2003 19:03:19 -0000	1.3
+++ csound/Makefile.lnx	26 Jan 2004 11:41:16 -0000	1.4
@@ -50,7 +50,10 @@
 # (e.g., Linux on SPARC [not tested]), you should also define -
 #       -DLINUX_BE      Linux audio device handler for big-endian samples
 
-CFLAGS = -Wall -O2 -malign-loops=4 -malign-jumps=4 -ffast-math -fomit-frame-pointer -finline-functions -funroll-loops -DWITHx87 $(RPM_OPT_FLAGS) $(DEFINES) -I..
+# CFLAGS = -Wall -O2 -malign-loops=4 -malign-jumps=4 -ffast-math -fomit-frame-pointer -finline-functions -funroll-loops -DWITHx87 $(RPM_OPT_FLAGS) $(DEFINES) -I..
+
+CFLAGS = -Wall -O2 -falign-loops=4 -falign-jumps=4 -ffast-math -fomit-frame-pointer -finline-functions -funroll-loops -DWITHx87 $(RPM_OPT_FLAGS) $(DEFINES) -I.. `fltk-config --cflags`
+
 #	-O		Simple optimisation
 #	-O2		to be more specific about the optimization level
 #	-f		compile single-precision floats (4.3,VAX,DEC-RISC)
@@ -89,7 +92,8 @@
 # uncomment these if HAVE_FLTK was enabled in DEFINES
 #
 CXX = g++
-CXXFLAGS = -fno-exceptions -fno-rtti ${DEFINES}
+#CXXFLAGS = -fno-exceptions -fno-rtti ${DEFINES}
+CXXFLAGS = -fno-exceptions -fno-rtti ${DEFINES} `fltk-config --cxxflags`
 FLTKSRC = widgets.cpp
 FLTKOBJ = widgets.o
 # source and object files for FLTK widgets
@@ -416,9 +420,9 @@
 	../util2/exports/lpc_export.c ../util2/exports/pv_export.c \
 	../util2/exports/pv_import.c ../util2/makef ../util2/mixer/makef \
 	../util2/mixer/mixer.c ../util2/mixer/xtrct.c ../util2/mkgraph/fg.h \
-	../util2/mkgraph/fgdemo.c ../util2/mkgraph/mkgraph.c ../util2/scale.dir/makef \
-	../util2/scale.dir/scale.c ../util2/sndinfo/main.c \
-	../util2/sndinfo/makef ../util2/pvlook.dir/makef winSGI.c winbor.c winwat.c
+	../util2/mkgraph/fgdemo.c ../util2/mkgraph/mkgraph.c ../util2/scale/makef \
+	../util2/scale/scale.c ../util2/sndinfo/main.c \
+	../util2/sndinfo/makef ../util2/pvlook/makef winSGI.c winbor.c winwat.c
 		tar cvf - `cat all_files` | gzip > Csound.tar.gz
 
 distrib:	all Csound.tar.gz
@@ -439,7 +443,7 @@
 	cp MUSIC/csound/util2/exports/lpc_export ~ftp/pub/dream/SGI
 	cp MUSIC/csound/util2/mixer/mixer ~ftp/pub/dream/SGI
 	cp MUSIC/csound/util2/mixer/extractot ~ftp/pub/dream/SGI
-	cp MUSIC/csound/util2/scale.dir/scale ~ftp/pub/dream/SGI
+	cp MUSIC/csound/util2/scale/scale ~ftp/pub/dream/SGI
 	cp MUSIC/csound/util2/sndinfo/sndinfo ~ftp/pub/dream/SGI
 
 depend:
Index: csound/autoheader.h
===================================================================
RCS file: /cvsroot/csound/csound/csound/autoheader.h,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -r1.5 -r1.7
--- csound/autoheader.h	8 Dec 2003 11:45:51 -0000	1.5
+++ csound/autoheader.h	19 Jan 2004 23:24:07 -0000	1.7
@@ -28,11 +28,15 @@
 #endif
 
 #if defined LINUX && defined WORDS_BIGENDIAN
-#define BE_LINUX
+#define BE_LINUX 1
 #endif
 
 #if defined WIN32
-#define _CONSOLE
+#define _CONSOLE 1
+#endif
+
+#if defined HAVE_STRING_H
+#define SYS5 1
 #endif
 
 #endif /* defined HAVE_CONFIG_H */
Index: csound/insert.c
===================================================================
RCS file: /cvsroot/csound/csound/csound/insert.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- csound/insert.c	7 Jan 2004 11:53:52 -0000	1.3
+++ csound/insert.c	31 Jan 2004 23:10:09 -0000	1.4
@@ -807,7 +807,8 @@
 /* an 'if-then' variant of 'if-goto' */
 void ingoto(CGOTO *p)
 {
-    if (!*p->cond)
+    /* Make sure we have an i-time conditional */
+    if (p->h.optext->t.intype == 'b' && !*p->cond)
       ids = p->lblblk->prvi;    /* Surely this should be ids/prvi not pds/pvrp */
 }
 
Index: csound/version.h
===================================================================
RCS file: /cvsroot/csound/csound/csound/version.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csound/version.h	4 Jan 2004 00:15:57 -0000	1.2
+++ csound/version.h	31 Jan 2004 23:10:09 -0000	1.3
@@ -26,12 +26,12 @@
 #endif
 # define VERSION (4)
 # define SUBVER  (23)
-# define BUGFIX  ( 8)
+# define BUGFIX  (10)
 #ifdef BETA
-# define VERSIONSTRING  " v4.23f08beta"
+# define VERSIONSTRING  " v4.23f10beta"
 # define PVERSION "\p                                               Csound 4.23f08beta"
 #else
-# define VERSIONSTRING  " v4.23f08"
+# define VERSIONSTRING  " v4.23f10"
 # define PVERSION "\p                                               Csound 4.23f08"
 #endif
 
cvs diff: Diffing doc
cvs diff: Diffing pyrun
cvs diff: Diffing soundfonts
cvs diff: Diffing soundfonts/fluidOpcodes
cvs diff: Diffing util1
cvs diff: Diffing util1/cscore
cvs diff: Diffing util1/scot
cvs diff: Diffing util1/sortex
cvs diff: Diffing util2
cvs diff: Diffing util2/dnoise
cvs diff: Diffing util2/dnoise.dir
cvs diff: Diffing util2/envext
cvs diff: Diffing util2/exports
cvs diff: Diffing util2/mixer
Index: util2/mixer/xtrct.c
===================================================================
RCS file: /cvsroot/csound/csound/util2/mixer/xtrct.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util2/mixer/xtrct.c	29 Nov 2003 18:39:32 -0000	1.2
+++ util2/mixer/xtrct.c	19 Jan 2004 23:12:38 -0000	1.3
@@ -35,12 +35,12 @@
 #include 
 #include 
 #include 
-#ifdef LINUX
-#include 
-#endif
 #include "../../csound/cs.h"
 #include "../../csound/ustub.h"
 #include "../../csound/soundio.h"
+#ifdef LINUX
+#include 
+#endif
 
 /* Constants */
 #define NUMBER_OF_SAMPLES	(4096)
cvs diff: Diffing util2/mkgraph
cvs diff: Diffing util2/pvlook
cvs diff: Diffing util2/pvlook.dir
cvs diff: Diffing util2/scale
cvs diff: Diffing util2/scale.dir
cvs diff: Diffing util2/sndinfo
divan$