From 1c9b9131475909443ac7cb3e6ccf672406915dd6 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 4 Sep 2006 19:18:34 +0000 Subject: [PATCH] configure.ac: updated "5.9.2" to "5.9.5" deep65.F: still has a weird bug; different workaround now. wsjtrc: changed default fonts git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@270 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- configure.ac | 2 +- deep65.F | 5 ++++- g2 | 1 - g3 | 2 -- portaudio-v19/libtool | 28 ++++++++++++++-------------- wsjt.py | 2 +- wsjtrc | 6 +++--- 7 files changed, 23 insertions(+), 23 deletions(-) delete mode 100755 g2 delete mode 100755 g3 diff --git a/configure.ac b/configure.ac index f30e34d9d..fd49af539 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl AC_PREREQ(2.59) dnl Sneaky way to get an Id tag into the configure script AC_COPYRIGHT([$Id$]) -AC_INIT([wsjt],[5.9.2]) +AC_INIT([wsjt],[5.9.5]) AC_PREFIX_DEFAULT(/usr/local/) diff --git a/deep65.F b/deep65.F index 346bc2a3b..1e70933d4 100644 --- a/deep65.F +++ b/deep65.F @@ -131,7 +131,10 @@ C Insert CQ message unless sync=OOO (flip=-1). if(mode65.eq.2) bias=max(1.08*p2,0.405) if(mode65.ge.4) bias=max(1.04*p2,0.505) -C This is really weird, but do not remove the following statement! + +C This is really weird, but do not remove the following statements! + write(77,*) mode65,bias,p1,p2 + rewind 77 rewind 23 qual=100.0*(p1-bias) diff --git a/g2 b/g2 deleted file mode 100755 index b2c9a4243..000000000 --- a/g2 +++ /dev/null @@ -1 +0,0 @@ -python /home/joe/installer_6a2/Installer/Makespec.py --tk --onefile wsjt.py diff --git a/g3 b/g3 deleted file mode 100755 index d9c6443d2..000000000 --- a/g3 +++ /dev/null @@ -1,2 +0,0 @@ -python /home/joe/installer_6a2/Installer/Build.py wsjt.spec -mv wsjt wsjt6 diff --git a/portaudio-v19/libtool b/portaudio-v19/libtool index a24f817d7..0970b910d 100755 --- a/portaudio-v19/libtool +++ b/portaudio-v19/libtool @@ -44,7 +44,7 @@ available_tags=" CXX F77" # ### BEGIN LIBTOOL CONFIG -# Libtool was configured on host pulsar21.Princeton.EDU: +# Libtool was configured on host aubrey: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -174,7 +174,7 @@ dlopen_self_static=unknown link_static_flag="-static" # Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions" +no_builtin_flag=" -fno-builtin" # Compiler flag to allow reflexive dlopens. export_dynamic_flag_spec="\${wl}--export-dynamic" @@ -325,10 +325,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM link_all_deplibs=unknown # Compile-time system search path for libraries -sys_lib_search_path_spec=" /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/ /usr/lib/gcc/i386-redhat-linux/3.2.2/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../../i386-redhat-linux/lib/i386-redhat-linux/3.2.2/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../../i386-redhat-linux/lib/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../i386-redhat-linux/3.2.2/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../ /lib/i386-redhat-linux/3.2.2/ /lib/ /usr/lib/i386-redhat-linux/3.2.2/ /usr/lib/" +sys_lib_search_path_spec=" /usr/lib/gcc/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../i486-linux-gnu/lib/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../i486-linux-gnu/lib/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../ /lib/i486-linux-gnu/4.1.2/ /lib/ /usr/lib/i486-linux-gnu/4.1.2/ /usr/lib/" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/kerberos/lib /usr/X11R6/lib /usr/local/lib /usr/local/pgplot /usr/lib/qt-3.1/lib /usr/lib/qt2/lib " +sys_lib_dlsearch_path_spec="/lib /usr/lib /lib /usr/lib /usr/i486-linuxlibc1/lib /usr/local/lib /usr/lib/mozilla /usr/lib/atlas " # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" @@ -7323,7 +7323,7 @@ disable_libs=static # End: # ### BEGIN LIBTOOL TAG CONFIG: CXX -# Libtool was configured on host pulsar21.Princeton.EDU: +# Libtool was configured on host aubrey: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -7505,11 +7505,11 @@ striplib="strip --strip-unneeded" # Dependencies to place before the objects being linked to create a # shared library. -predep_objects="/usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../crti.o /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/crtbeginS.o" +predep_objects="/usr/lib/gcc/i486-linux-gnu/4.0.4/../../../../lib/crti.o /usr/lib/gcc/i486-linux-gnu/4.0.4/crtbeginS.o" # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects="/usr/lib/gcc-lib/i386-redhat-linux/3.2.2/crtendS.o /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../crtn.o" +postdep_objects="/usr/lib/gcc/i486-linux-gnu/4.0.4/crtendS.o /usr/lib/gcc/i486-linux-gnu/4.0.4/../../../../lib/crtn.o" # Dependencies to place before the objects being linked to create a # shared library. @@ -7521,7 +7521,7 @@ postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s" # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path="-L/usr/lib/gcc-lib/i386-redhat-linux/3.2.2 -L/usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../.." +compiler_lib_search_path="-L/usr/lib/gcc/i486-linux-gnu/4.0.4 -L/usr/lib/gcc/i486-linux-gnu/4.0.4 -L/usr/lib/gcc/i486-linux-gnu/4.0.4/../../../../lib -L/usr/lib/gcc/i486-linux-gnu/4.0.4/../../.. -L/lib/../lib -L/usr/lib/../lib" # Method to check whether dependent libraries are shared objects. deplibs_check_method="pass_all" @@ -7601,10 +7601,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM link_all_deplibs=unknown # Compile-time system search path for libraries -sys_lib_search_path_spec=" /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/ /usr/lib/gcc/i386-redhat-linux/3.2.2/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../../i386-redhat-linux/lib/i386-redhat-linux/3.2.2/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../../i386-redhat-linux/lib/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../i386-redhat-linux/3.2.2/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../ /lib/i386-redhat-linux/3.2.2/ /lib/ /usr/lib/i386-redhat-linux/3.2.2/ /usr/lib/" +sys_lib_search_path_spec=" /usr/lib/gcc/i486-linux-gnu/4.0.4/ /usr/lib/gcc/i486-linux-gnu/4.0.4/ /usr/lib/gcc/i486-linux-gnu/4.0.4/../../../../i486-linux-gnu/lib/i486-linux-gnu/4.0.4/ /usr/lib/gcc/i486-linux-gnu/4.0.4/../../../../i486-linux-gnu/lib/ /usr/lib/gcc/i486-linux-gnu/4.0.4/../../../i486-linux-gnu/4.0.4/ /usr/lib/gcc/i486-linux-gnu/4.0.4/../../../ /lib/i486-linux-gnu/4.0.4/ /lib/ /usr/lib/i486-linux-gnu/4.0.4/ /usr/lib/" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/kerberos/lib /usr/X11R6/lib /usr/local/lib /usr/local/pgplot /usr/lib/qt-3.1/lib /usr/lib/qt2/lib " +sys_lib_dlsearch_path_spec="/lib /usr/lib /lib /usr/lib /usr/i486-linuxlibc1/lib /usr/local/lib /usr/lib/mozilla /usr/lib/atlas " # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" @@ -7628,7 +7628,7 @@ include_expsyms="" # ### BEGIN LIBTOOL TAG CONFIG: F77 -# Libtool was configured on host pulsar21.Princeton.EDU: +# Libtool was configured on host aubrey: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -7672,7 +7672,7 @@ LTCC="gcc" LTCFLAGS="-g -O2" # A language-specific compiler. -CC="g77" +CC="f95" # Is the compiler the GNU C compiler? with_gcc=yes @@ -7909,10 +7909,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM link_all_deplibs=unknown # Compile-time system search path for libraries -sys_lib_search_path_spec=" /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/ /usr/lib/gcc/i386-redhat-linux/3.2.2/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../../i386-redhat-linux/lib/i386-redhat-linux/3.2.2/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../../i386-redhat-linux/lib/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../i386-redhat-linux/3.2.2/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/../../../ /lib/i386-redhat-linux/3.2.2/ /lib/ /usr/lib/i386-redhat-linux/3.2.2/ /usr/lib/" +sys_lib_search_path_spec=" /usr/lib/gcc/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../i486-linux-gnu/lib/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../i486-linux-gnu/lib/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../ /lib/i486-linux-gnu/4.1.2/ /lib/ /usr/lib/i486-linux-gnu/4.1.2/ /usr/lib/" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/kerberos/lib /usr/X11R6/lib /usr/local/lib /usr/local/pgplot /usr/lib/qt-3.1/lib /usr/lib/qt2/lib " +sys_lib_dlsearch_path_spec="/lib /usr/lib /lib /usr/lib /usr/i486-linuxlibc1/lib /usr/local/lib /usr/lib/mozilla /usr/lib/atlas " # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" diff --git a/wsjt.py b/wsjt.py index 1ca89b581..cb90efe5a 100644 --- a/wsjt.py +++ b/wsjt.py @@ -1,4 +1,4 @@ -#----------------------------------------------------------------- WSJT +#------------------------------------------------------------------ WSJT # $Date$ $Revision$ # from Tkinter import * diff --git a/wsjtrc b/wsjtrc index 878089ec8..0a345509a 100644 --- a/wsjtrc +++ b/wsjtrc @@ -1,6 +1,6 @@ -*font: Arial 9 -*Label*font: Arial 9 -*Text*font: "Courier New" 10 +*font: "bitstream vera sans" 11 +*Label*font: "bitstream vera sans" 11 +*Text*font: "terminus" 13 *background: gray85 *Text*background: white *Entry*background: white