Subject: Re: [linux-audio-user] [OT]Announcement: Demo of Linux Audio in NYC
From: Takashi Iwai (tiwai_AT_suse.de)
Date: Tue Apr 16 2002 - 19:11:36 EEST
Hi,
(i resend this again since it seems that mails with octet attachments
are refused now.)
the patch below will fix the compile problem with jack and fltk.
please give a try.
ciao,
Takashi
--- Makefile.in-dist Sat Mar 23 02:51:50 2002
+++ Makefile.in Wed Apr 10 14:32:41 2002
@@ -11,12 +11,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl -lpng -lpthread
+LIBS = @FLTK_LIBS@ -lm -ldl -lpng -lpthread
MOC = moc
UIC =
--- ./SpiralSound/Plugins/MatrixPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/MatrixPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/OscillatorPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/OscillatorPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/NoteSnapPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/NoteSnapPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/SeqPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/SeqPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/SmoothPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/SmoothPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/WaveTablePlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/WaveTablePlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/SeqSelectorPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/SeqSelectorPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/WaveShaperPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/WaveShaperPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/EchoPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/EchoPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/MixerPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/MixerPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/SVFilterPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/SVFilterPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/OutputPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/OutputPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/SamplerPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/SamplerPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/DelayPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/DelayPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- SpiralSound/Plugins/MidiPlugin/Makefile.in-dist Sat Mar 23 02:54:32 2002
+++ SpiralSound/Plugins/MidiPlugin/Makefile.in Wed Apr 10 14:33:52 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLGK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl -pthread
+LIBS = @FLTK_LIBS@ -lm -ldl -pthread
MOC = moc
UIC =
--- ./SpiralSound/Plugins/AmpPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/AmpPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/EnvFollowerPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/EnvFollowerPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/LADSPAPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/LADSPAPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/SampleHoldPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/SampleHoldPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -10,12 +10,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/StereoMixerPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/StereoMixerPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/RingModPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/RingModPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/StreamPlugin/Makefile.in-dist Mon Feb 4 00:02:59 2002
+++ ./SpiralSound/Plugins/StreamPlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/ScopePlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/ScopePlugin/Makefile.in Mon Feb 4 12:30:49 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/SpiralLoopPlugin/Makefile.in-dist Mon Feb 4 00:01:15 2002
+++ ./SpiralSound/Plugins/SpiralLoopPlugin/Makefile.in Mon Feb 4 12:30:50 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/EnvelopePlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/EnvelopePlugin/Makefile.in Mon Feb 4 12:30:50 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/XFadePlugin/Makefile.in-dist Mon Feb 4 00:04:28 2002
+++ ./SpiralSound/Plugins/XFadePlugin/Makefile.in Mon Feb 4 12:30:50 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/ControllerPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/ControllerPlugin/Makefile.in Mon Feb 4 12:30:50 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/SplitterPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/SplitterPlugin/Makefile.in Mon Feb 4 12:30:50 2002
@@ -10,12 +10,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/FilterPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/FilterPlugin/Makefile.in Mon Feb 4 12:30:50 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- ./SpiralSound/Plugins/MoogFilterPlugin/Makefile.in-dist Sun Feb 3 23:54:24 2002
+++ ./SpiralSound/Plugins/MoogFilterPlugin/Makefile.in Mon Feb 4 12:30:50 2002
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
+LIBS = @FLTK_LIBS@ -lm -ldl
MOC = moc
UIC =
--- configure.in-dist 2002-03-23 00:52:27.000000000 +0000
+++ configure.in 2002-04-11 08:54:10.000000000 +0000
@@ -44,6 +44,7 @@
StereoMixerPlugin WaveTablePlugin SeqSelectorPlugin LADSPAPlugin WaveShaperPlugin \
StreamPlugin XFadePlugin SpiralLoopPlugin PoshSamplerPlugin ComplexEnvelopePlugin"
fi
+echo "$PLUGINLIST" > SpiralSound/PluginList.txt
dnl Checks for library functions.
@@ -55,25 +56,40 @@
dnl AC_CHECK_LIB(X11, XDisplayName)
dnl AC_CHECK_LIB(Xext, main)
-dnl Checks for libraries.
-AC_CHECK_HEADERS(GL/gl.h)
-if test $ac_cv_header_GL_gl_h = "no" ; then
- echo "*** GL headers missing."
- exit
- fi
-AC_CHECK_LIB(GL, glBegin)
-
+AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
+if test "$FLTK_CONFIG" = "no"; then
+ AC_PATH_XTRA
+ LIBGL=""
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ AC_CHECK_HEADERS(GL/gl.h)
+ if test $ac_cv_header_GL_gl_h = "yes" ; then
+ AC_CHECK_LIB(GL, glBegin, LIBGL="-lGL")
+ fi
+ AC_CHECK_HEADERS(FL/Fl.h)
+ if test $ac_cv_header_FL_Fl_h = "no" ; then
+ echo "*** FLTK headers missing."
+ exit 1
+ fi
+ AC_CHECK_LIB(fltk, main)
+ FLTK_CXXFLAGS="$X_CFLAGS"
+ FLTK_CFLAGS="$FLTK_CXXFLAGS"
+ FLTK_LIBS="$X_LIBS -lfltk $LIBGL"
+else
+ FLTK_CXXFLAGS=`$FLTK_CONFIG $fltk_config_args --cxxflags`
+ FLTK_CFLAGS=`$FLTK_CONFIG $fltk_config_args --cxxflags`
+ FLTK_LIBS=`$FLTK_CONFIG $fltk_config_args --ldflags`
+fi
+AC_SUBST(FLTK_CXXFLAGS)
+AC_SUBST(FLTK_CFLAGS)
+AC_SUBST(FLTK_LIBS)
+
+if test $ac_arg_jack = "Y" ; then
+ AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR([*** GLIB >= 1.2.0 not installed]))
+fi
AC_CHECK_HEADERS(dlfcn.h)
AC_CHECK_LIB(dl, dlopen)
-AC_CHECK_HEADERS(FL/Fl.h)
-if test $ac_cv_header_FL_Fl_h = "no" ; then
- echo "*** FLTK headers missing."
- exit
- fi
-
-AC_CHECK_LIB(fltk, main)
AC_CHECK_HEADERS(png.h)
AC_CHECK_LIB(png, png_get_copyright)
--- SpiralSound/Plugins/JackPlugin/Makefile.in-dist 2002-04-11 08:08:46.000000000 +0000
+++ SpiralSound/Plugins/JackPlugin/Makefile.in 2002-04-11 08:10:00.000000000 +0000
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
-CFLAGS = @CFLAGS@
-CXXFLAGS= @CXXFLAGS@
-INCPATH = -I/usr/X11R6/include -I/usr/lib/glib/include/
+CFLAGS = @CFLAGS@ @FLTK_CFLAGS@ @GLIB_CFLAGS@
+CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@ @GLIB_CFLAGS@
+INCPATH =
LINK = g++ -shared
LFLAGS =
-LIBS = -L/usr/X11R6/lib -L/usr/local/lib/ -lfltk -lGL -lXext -lX11 -lm -ldl -ljack -lpthread
+LIBS = @FLTK_LIBS@ -ljack -lm -ldl
MOC = moc
UIC =
This archive was generated by hypermail 2b28 : Tue Apr 16 2002 - 18:58:23 EEST