diff --git a/fivehz.F90 b/fivehz.F90 index 2fd15acc3..a4672cf1c 100644 --- a/fivehz.F90 +++ b/fivehz.F90 @@ -234,10 +234,8 @@ end subroutine addnoise real function gran(idum) real r(12) - integer nseed(1) - data nseed/714478811/ if(idum.lt.0) then - call random_seed(PUT=nseed) + call random_seed idum=0 endif call random_number(r) diff --git a/portaudio-v19/libtool b/portaudio-v19/libtool index 745ec3044..a24f817d7 100755 --- a/portaudio-v19/libtool +++ b/portaudio-v19/libtool @@ -1,4 +1,4 @@ -#! /usr/local/bin/bash +#! /bin/sh # libtoolT - Provide generalized library-building support services. # Generated automatically by (GNU ) @@ -30,10 +30,10 @@ # the same distribution terms that you use for the rest of that program. # A sed program that does not truncate output. -SED="/usr/bin/sed" +SED="/bin/sed" # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="/usr/bin/sed -e 1s/^X//" +Xsed="/bin/sed -e 1s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. @@ -44,10 +44,10 @@ available_tags=" CXX F77" # ### BEGIN LIBTOOL CONFIG -# Libtool was configured on host night.db.net: +# Libtool was configured on host pulsar21.Princeton.EDU: # Shell to use when invoking shell scripts. -SHELL="/usr/local/bin/bash" +SHELL="/bin/sh" # Whether or not to build shared libraries. build_libtool_libs=yes @@ -56,23 +56,23 @@ build_libtool_libs=yes build_old_libs=yes # Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=yes +build_libtool_need_lc=no # Whether or not to disallow shared libs when runtime libs are static allow_libtool_libs_with_static_runtimes=no # Whether or not to optimize for fast installation. -fast_install=needless +fast_install=yes # The host system. host_alias= -host=i386-unknown-freebsd7.0 -host_os=freebsd7.0 +host=i686-pc-linux-gnu +host_os=linux-gnu # The build system. build_alias= -build=i386-unknown-freebsd7.0 -build_os=freebsd7.0 +build=i686-pc-linux-gnu +build_os=linux-gnu # An echo program that does not interpret backslashes. echo="echo" @@ -147,7 +147,7 @@ pic_flag=" -fPIC -DPIC" pic_mode=default # What is the maximum length of a command? -max_cmd_len=196608 +max_cmd_len=32768 # Does compiler simultaneously support -c and -o options? compiler_c_o="yes" @@ -174,7 +174,7 @@ dlopen_self_static=unknown link_static_flag="-static" # Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" +no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions" # Compiler flag to allow reflexive dlopens. export_dynamic_flag_spec="\${wl}--export-dynamic" @@ -186,17 +186,17 @@ whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-arc thread_safe_flag_spec="" # Library versioning type. -version_type=freebsd-elf +version_type=linux # Format of library name prefix. libname_spec="lib\$name" # List of archive names. First name is the real one, the rest are links. # The last name is the one that the linker finds with -lNAME. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext} \$libname\${shared_ext}" +library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" # The coded name of the library, if different from the real name. -soname_spec="" +soname_spec="\${libname}\${release}\${shared_ext}\$major" # Commands used to build and install an old-style archive. RANLIB="ranlib" @@ -212,7 +212,10 @@ old_archive_from_expsyms_cmds="" # Commands used to build and install a shared archive. archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" -archive_expsym_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib" +archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~ + cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~ + \$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~ + \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib" postinstall_cmds="" postuninstall_cmds="" @@ -257,7 +260,7 @@ allow_undefined_flag="" no_undefined_flag="" # Commands used to finish a libtool library installation in a directory. -finish_cmds="" +finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir" # Same as above, but a single script fragment to be evaled but not shown. finish_eval="" @@ -278,7 +281,7 @@ runpath_var=LD_RUN_PATH shlibpath_var=LD_LIBRARY_PATH # Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes +shlibpath_overrides_runpath=no # How to hardcode a shared library path into an executable. hardcode_action=immediate @@ -322,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/" +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/" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" +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 " # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" @@ -7320,10 +7323,10 @@ disable_libs=static # End: # ### BEGIN LIBTOOL TAG CONFIG: CXX -# Libtool was configured on host night.db.net: +# Libtool was configured on host pulsar21.Princeton.EDU: # Shell to use when invoking shell scripts. -SHELL="/usr/local/bin/bash" +SHELL="/bin/sh" # Whether or not to build shared libraries. build_libtool_libs=yes @@ -7338,17 +7341,17 @@ build_libtool_need_lc=no allow_libtool_libs_with_static_runtimes=no # Whether or not to optimize for fast installation. -fast_install=needless +fast_install=yes # The host system. host_alias= -host=i386-unknown-freebsd7.0 -host_os=freebsd7.0 +host=i686-pc-linux-gnu +host_os=linux-gnu # The build system. build_alias= -build=i386-unknown-freebsd7.0 -build_os=freebsd7.0 +build=i686-pc-linux-gnu +build_os=linux-gnu # An echo program that does not interpret backslashes. echo="echo" @@ -7423,7 +7426,7 @@ pic_flag=" -fPIC -DPIC" pic_mode=default # What is the maximum length of a command? -max_cmd_len=196608 +max_cmd_len=32768 # Does compiler simultaneously support -c and -o options? compiler_c_o="yes" @@ -7462,17 +7465,17 @@ whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-arc thread_safe_flag_spec="" # Library versioning type. -version_type=freebsd-elf +version_type=linux # Format of library name prefix. libname_spec="lib\$name" # List of archive names. First name is the real one, the rest are links. # The last name is the one that the linker finds with -lNAME. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext} \$libname\${shared_ext}" +library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" # The coded name of the library, if different from the real name. -soname_spec="" +soname_spec="\${libname}\${release}\${shared_ext}\$major" # Commands used to build and install an old-style archive. RANLIB="ranlib" @@ -7502,11 +7505,11 @@ striplib="strip --strip-unneeded" # Dependencies to place before the objects being linked to create a # shared library. -predep_objects="/usr/lib/crti.o /usr/lib/crtbeginS.o" +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" # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects="/usr/lib/crtendS.o /usr/lib/crtn.o" +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" # Dependencies to place before the objects being linked to create a # shared library. @@ -7514,11 +7517,11 @@ predeps="" # Dependencies to place after the objects being linked to create a # shared library. -postdeps="-lstdc++ -lm -lgcc_pic -lgcc_pic" +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" +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/../../.." # Method to check whether dependent libraries are shared objects. deplibs_check_method="pass_all" @@ -7533,7 +7536,7 @@ allow_undefined_flag="" no_undefined_flag="" # Commands used to finish a libtool library installation in a directory. -finish_cmds="" +finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir" # Same as above, but a single script fragment to be evaled but not shown. finish_eval="" @@ -7554,7 +7557,7 @@ runpath_var=LD_RUN_PATH shlibpath_var=LD_LIBRARY_PATH # Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes +shlibpath_overrides_runpath=no # How to hardcode a shared library path into an executable. hardcode_action=immediate @@ -7598,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/" +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/" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" +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 " # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" @@ -7625,10 +7628,10 @@ include_expsyms="" # ### BEGIN LIBTOOL TAG CONFIG: F77 -# Libtool was configured on host night.db.net: +# Libtool was configured on host pulsar21.Princeton.EDU: # Shell to use when invoking shell scripts. -SHELL="/usr/local/bin/bash" +SHELL="/bin/sh" # Whether or not to build shared libraries. build_libtool_libs=yes @@ -7643,17 +7646,17 @@ build_libtool_need_lc=no allow_libtool_libs_with_static_runtimes=no # Whether or not to optimize for fast installation. -fast_install=needless +fast_install=yes # The host system. host_alias= -host=i386-unknown-freebsd7.0 -host_os=freebsd7.0 +host=i686-pc-linux-gnu +host_os=linux-gnu # The build system. build_alias= -build=i386-unknown-freebsd7.0 -build_os=freebsd7.0 +build=i686-pc-linux-gnu +build_os=linux-gnu # An echo program that does not interpret backslashes. echo="echo" @@ -7669,7 +7672,7 @@ LTCC="gcc" LTCFLAGS="-g -O2" # A language-specific compiler. -CC="f77" +CC="g77" # Is the compiler the GNU C compiler? with_gcc=yes @@ -7728,7 +7731,7 @@ pic_flag=" -fPIC" pic_mode=default # What is the maximum length of a command? -max_cmd_len=196608 +max_cmd_len=32768 # Does compiler simultaneously support -c and -o options? compiler_c_o="yes" @@ -7767,17 +7770,17 @@ whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-arc thread_safe_flag_spec="" # Library versioning type. -version_type=freebsd-elf +version_type=linux # Format of library name prefix. libname_spec="lib\$name" # List of archive names. First name is the real one, the rest are links. # The last name is the one that the linker finds with -lNAME. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext} \$libname\${shared_ext}" +library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" # The coded name of the library, if different from the real name. -soname_spec="" +soname_spec="\${libname}\${release}\${shared_ext}\$major" # Commands used to build and install an old-style archive. RANLIB="ranlib" @@ -7793,7 +7796,10 @@ old_archive_from_expsyms_cmds="" # Commands used to build and install a shared archive. archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" -archive_expsym_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib" +archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~ + cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~ + \$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~ + \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib" postinstall_cmds="" postuninstall_cmds="" @@ -7838,7 +7844,7 @@ allow_undefined_flag="" no_undefined_flag="" # Commands used to finish a libtool library installation in a directory. -finish_cmds="" +finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir" # Same as above, but a single script fragment to be evaled but not shown. finish_eval="" @@ -7859,7 +7865,7 @@ runpath_var=LD_RUN_PATH shlibpath_var=LD_LIBRARY_PATH # Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes +shlibpath_overrides_runpath=no # How to hardcode a shared library path into an executable. hardcode_action=immediate @@ -7903,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/" +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/" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" +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 " # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" diff --git a/sync65.f b/sync65.f index 4bc8f6605..d5220c2b7 100644 --- a/sync65.f +++ b/sync65.f @@ -39,10 +39,10 @@ C Compute power spectrum for each step and get average call flat1(psavg,s2,nh,nsteps,NHMAX,NSMAX) !Flatten the spectra C Find the best frequency channel for CCF -! famin= 670.46 -! fbmax=1870.46 - famin=200 - fbmax=3800 + famin= 670.46 + fbmax=1870.46 +! famin=200 +! fbmax=3800 fa=famin fb=fbmax if(NFreeze.eq.1) then diff --git a/wsjt.py b/wsjt.py index 9f753e942..83e619ce9 100644 --- a/wsjt.py +++ b/wsjt.py @@ -467,8 +467,9 @@ def clrToRadio(event): ToRadio.delete(0,END) HisGrid.delete(0,99) ToRadio.focus_set() - if kb8rq.get(): ntx.set(6) - + if kb8rq.get(): + ntx.set(6) + nfreeze.set(0) #------------------------------------------------------ whois def whois(hiscall): diff --git a/wsjt65.f b/wsjt65.f index 70417041a..885b59492 100644 --- a/wsjt65.f +++ b/wsjt65.f @@ -150,9 +150,6 @@ C Blank DT if shorthand message (### wrong logic? ###) nspecial=0 endif -C Blank the end-of-line numbers - if(naggressive.eq.0 .and. ndiag.eq.0) line(59:66)=' ' - if(lcum) write(21,1011) line 1011 format(a67) C Write decoded msg unless this is an "Exclude" request: diff --git a/wsjtrc b/wsjtrc index 10eb58d93..878089ec8 100644 --- a/wsjtrc +++ b/wsjtrc @@ -1,6 +1,6 @@ -*font: Arial 11 -*Label*font: Arial 11 -*Text*font: "Courier New" 12 +*font: Arial 9 +*Label*font: Arial 9 +*Text*font: "Courier New" 10 *background: gray85 *Text*background: white *Entry*background: white