Commit Graph

40 Commits

Author SHA1 Message Date
Diane Bruce
007a6e70b8 - Fix configure to use aclocal.m4 here as well.
- Clean up casting in arguments.
- Use <portaudio.h> not "portaudio.h"



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1230 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2009-05-17 01:28:03 +00:00
Diane Bruce
7a8b55014b - Clean up configure to match wsjt/wspr
- Slightly clean up Makefile.in



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1208 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2009-05-13 13:56:15 +00:00
Diane Bruce
eaa540b65b - Set prop svn:eol-style native on files.
- Remove alsa/oss from configure.ac and regenerate configure file.
- Note it is MAP65 not WSJT.
- rfile3a.f90 -> rfile3a.F90 for gfortran preprocessor.
- Comment out compiler option that does not work on gfortran for now.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1151 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2009-04-23 19:02:43 +00:00
Joe Taylor
c750d4d6ee Updated Makefile.in and configure to use installed portaudio library.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1147 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2009-04-23 15:33:19 +00:00
Diane Bruce
b406127ca9 - updated configure so its idea of revision matches wsjt.py
- dummy touch of wsjt.py



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@312 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-09-23 08:37:07 +00:00
Diane Bruce
a8b728e9ed - new portaudio-v19 tries to use alsa if available, but does not
make a static library including alsa definitions. A binary linked
  against a portaudio-v19 library using alsa also has to link against -alsa,
  this is inconvenient to say the least. I do not consider this the
  best "fix", the portaudio.a may not be referencing any alsa libs at all,
  even if it is present; but this should get Harry going.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@260 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-08-11 00:00:23 +00:00
Diane Bruce
2ea5f6eabb - trivial cosmetic change, I had a library duplicated
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@259 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-08-10 22:22:33 +00:00
Diane Bruce
634112986f - Fixed typo that prevented -lrt from being added to build for portaudio
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@258 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-08-10 21:49:40 +00:00
Diane Bruce
d1c8ce7315 - This should fix missing -lrt for those systems that need it
- I've cleaned up the configure a bit more as well



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@256 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-08-10 19:36:41 +00:00
Diane Bruce
9471e22ff2 - first part of update for new portaudio
- fix typo in configure
- point Makefile and new location for portaudio.a
- Still have to import new portaudio over top of this



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@246 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-08-09 19:51:29 +00:00
Diane Bruce
462ffc3c96 - libsamplerate is not being used at all in *nix, I assume it is supposed
to be used for portaudio. The following files enable libsamplerate
  when either Win32 is defined or portaudio is used.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@239 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-08-05 16:53:41 +00:00
Diane Bruce
76e85d911a - Fixed typo that broke portaudio
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@227 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-08-02 10:12:59 +00:00
Diane Bruce
63fafd0137 - oops. stock gfortran is still gfortran41
I was experimenting with gfortran42



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@226 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-08-02 03:47:38 +00:00
Diane Bruce
4f196eb750 - remove jack support for now
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@222 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-08-02 00:13:52 +00:00
Diane Bruce
99cd80593e - Cleaned up portaudio-v19 compile/clean a bit
- Fixed more missing merges, start_threads needs to pass PttPort, devin_name
  devout_name
- start_oss.c needs to use devin_name, devout_name



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@190 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 13:44:34 +00:00
Diane Bruce
019ece987d - move portaudio to portaudio-v19, note portaudio-v19 itself still
has to be imported.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@187 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-05 15:32:17 +00:00
Diane Bruce
a0a3b799dc - This imports the freebsd branch modifications
- This gets rid of the need to configure for parallel or serial port
- The code picks up the device name from WSJT.INI for ComPort (misnamed now)
  which is actually a device name for either a serial port or parallel port.
  ptt_unix.c then uses the appropriate code to "talk" to a parallel or serial
  port.
- audio in/audio out should work the same way on windows as it did before,
  however it is actually now a string name value, which can be used to open
  the appropriate /dev/dsp on OSS or in future, be passed to the ALSA init
  routines or other audio routines as needed. 



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@185 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-05 03:49:02 +00:00
Diane Bruce
680a9194c9 - Add in code to look for portaudio v19 beta as a subdir, if found
compile it if necessary and use the libs from it instead of the system
  library. v19 has a different ABI than portaudio normally installed
  on unix systems. 
  I have come across at least one other program that includes a copy
  of portaudio v19 with it's release package due to this problem.
 


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@184 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-05 03:03:11 +00:00
Diane Bruce
464498eb53 - More refinements on configure for jack
- first (non working) cut at jack support (start_jack.c)



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@175 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-04-17 20:43:21 +00:00
Diane Bruce
f55f7c0dc4 - undoing boo-boo
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@167 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-04-17 00:00:23 +00:00
Diane Bruce
80161a3285 - This adds run time parallel vs. serial PTT detection and use
- Also adds the ability to read a serial or paralle port name from WSJT.INI
- Also removes serial vs. parallel hooks in configure



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@166 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-04-16 22:04:31 +00:00
Diane Bruce
a5cb8fb7a7 - Add more support in configure for jack
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@162 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-04-13 15:13:25 +00:00
Diane Bruce
f23845bac2 - add --enable-g95 and --enable-gfortran hooks
- add start of --enable-jack support



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@161 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-04-13 04:50:00 +00:00
J C Dutton
a39f662b4d Summary: Merge in linux branch
svn+ssh://svn.berlios.de/svnroot/repos/wsjt/WSJT/branches/linux
merged into
svn+ssh://svn.berlios.de/svnroot/repos/wsjt/trunk



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@155 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-04-05 20:07:32 +00:00
Diane Bruce
2ff7ea7516 - Check for missing f2py
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@127 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-02-20 20:46:33 +00:00
Diane Bruce
4b889cdf57 - remove conf.h hence remove conf.h.in as well, and modify
all files previously using conf.h
- pass defs found into the Makefile instead
- add parallel port enable to configure --enable-parallel vs. --enable-serial
- use code (partially contributed by yours truly anyway) from cwdaemon to add
  parallel port support for *nix. 

I've not tested parallel port operation, it should match what cwdaemon
does, which is convenient.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@113 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-16 02:07:25 +00:00
Diane Bruce
e7c229aed5 - fixed ptt_unix.c to work with the non blocking ttyd0 for now (on freebsd)
it was causing my grief with tx testing of OSS 
- fixed configure to fill in just start_oss.c for AUDIO



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@110 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-15 23:32:39 +00:00
Diane Bruce
0cce7ee1b9 - Add AUDIOSRCS in Makefile.in, which will be filled in with the appropriate
source files needed for the audio system chosen. Note in particular
  a2d.f90 no longer needs to be wrapped with a #ifdef PORTAUDIO since
  it is now only compiled and linked when needed.

  Tested on portaudio here, but untested on alsa. Please test that
  I have not screwed it up on alsa or windows. ;-)



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@102 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-14 16:15:50 +00:00
Diane Bruce
36fcb937e3 - change from start_threads.c to start_alsa.c start_portaudio.c etc.
- split start_threads.c into start_alsa.c and start_portaudio.c
- make configure/Makefile add start_alsa or start_portaudio as needed
  instead of start_threads

  Untested on ALSA, works fine with PORTAUDIO



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@100 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-14 15:47:35 +00:00
Diane Bruce
cfc66c91ef - cleaned up the configure a bit more, it will now pick a default audio method
if none given.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@82 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 21:35:37 +00:00
Diane Bruce
2cf6ea1f89 - Added samplerate.h check
- Try to guess at a default between portaudio and alsa for now
- changed "samplerate.h" to <samplerate.h> in resample.c



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@76 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 16:36:04 +00:00
Diane Bruce
7ce8878e3a - I forgot -lsamplerate
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@75 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 05:00:34 +00:00
Diane Bruce
1a7eba8421 - clean up start_threads.c using bob's start_threads.c as template
- always define -pthread
- make sure right libs are passed along



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@74 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 04:30:03 +00:00
Diane Bruce
f504e95c03 - ok, this should enable Bobs portaudio fixes and ALSA depending on
--enable options. 

This will have to be cleaned up a lot more to minimise #ifdef's
a2d_() is needed for portaudio which is needed by both windows and *nix
but only a small piece of start_threads.c is needed for portaudio
the ALSA part is #ifdef'd out when USE_PORTAUDIO is enabled.
audio_init.f90 and a2d.f90 now have #ifdef's on USE_PORTAUDIO
instead of Win32.

Lots to do still.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@73 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 02:43:23 +00:00
Diane Bruce
f95e01d28f - forgot to add -lportaudio
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@71 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 21:35:25 +00:00
Diane Bruce
8a708402af - check correct HAS_ASOUNDLIB_H flag in start_threads.c
- look for alsa/asoundlib.h and set HAS_ASOUNDLIB_H if present
- also rework Makefile to pass proper flags

This should be it for alsa and portaudio.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@70 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 21:30:35 +00:00
Diane Bruce
1f1abc09d3 - cleaned up a few more stupids on configure system
- cleaned up Makefile to use LDFLAGS and CPPFLAGS
- look for asoundlib.h properly



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@69 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 19:18:03 +00:00
Diane Bruce
cc0bd39e85 - A few more cleanups to configure
Note for *now* you will have to expressly state ./configure --enable-alsa
  or --enable-oss etc. I'll fix it later to pick a default.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@61 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-08 01:40:30 +00:00
Diane Bruce
0d0bcdaf58 - more cleanups to configure
- ptt_linux.c is no longer needed (replaced with generic ptt_unix.c)
- Makefile should be created from configure (and Makefile.in)



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@59 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-07 21:24:49 +00:00
Diane Bruce
2c36b84bb5 - Add first rough cut of configure
Note that Makefile should go since it should be rebuilt from Makefile.in
  by configure.
- start_threads now has HAVE_ALSA_ALSASOUND_H
- ptt_unix now uses configure HAVE_SYS_PARAM_H

Initial *non production* commit
I am a little rusty with it, sorry. --db



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@58 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-07 20:14:23 +00:00