From e19e0b31d8bbb6a4e21b03a0569462e7420c54f3 Mon Sep 17 00:00:00 2001 From: "R. Burghall" <39673063+r-burg@users.noreply.github.com> Date: Fri, 12 Aug 2022 13:32:15 +0100 Subject: [PATCH] Add files via upload --- Build | 5 +- Calcs.cpp | 19 +- Calcs.h | 7 + Clean | 5 + Count_lines | 5 + Edit | 4 + Makefile | 6 +- Rauch.cpp | 9 +- Sallen_and_Key.cpp | 4 +- Script.odt | Bin 0 -> 20770 bytes Script2.odt | Bin 0 -> 25436 bytes compile | 348 ++++++ configure | 2918 ++++++++++++++++++++------------------------ rbfilter.cpp | 1807 ++++++++++++++------------- 14 files changed, 2629 insertions(+), 2508 deletions(-) create mode 100644 Clean create mode 100644 Count_lines create mode 100644 Edit create mode 100644 Script.odt create mode 100644 Script2.odt create mode 100644 compile diff --git a/Build b/Build index 21ecc9f..5317dcb 100644 --- a/Build +++ b/Build @@ -1,6 +1,7 @@ #! /bin/bash -# I'm still using Gtk2! -g++ -g `pkg-config --cflags gtk+-2.0 gdk-2.0 libgnome-2.0 libgnomeui-2.0 gdk-pixbuf-xlib-2.0` -o rbfilter ./rbfilter.cpp ./Calcs.cpp ./Rauch.cpp ./Sallen_and_Key.cpp ./Discrete.cpp `pkg-config --libs gtk+-2.0 gdk-2.0 libgnome-2.0 libgnomeui-2.0 gdk-pixbuf-xlib-2.0` +# I'm WAS still using Gtk2! +# g++ -g `pkg-config --cflags gtk+-3.0 gdk-3.0 gdk-pixbuf-xlib-2.0` -o rbfilter ./rbfilter.cpp ./Calcs.cpp ./Rauch.cpp ./Sallen_and_Key.cpp ./Discrete.cpp `pkg-config --libs gtk+-3.0 gdk-3.0 gdk-pixbuf-xlib-3.0` +g++ -g `pkg-config --cflags gtk+-3.0 gdk-3.0` -o rbfilter ./rbfilter.cpp ./Calcs.cpp ./Rauch.cpp ./Sallen_and_Key.cpp ./Discrete.cpp `pkg-config --libs gtk+-3.0 gdk-3.0 gdk-pixbuf-xlib-2.0` echo "Done!" read diff --git a/Calcs.cpp b/Calcs.cpp index 956d867..dae9e86 100644 --- a/Calcs.cpp +++ b/Calcs.cpp @@ -66,7 +66,7 @@ double isinh(double x) double n_to_freq(int n, double f1, int nmax=FSTEPS, int decades=2) { - return(f1 * pow10(double(n) * decades / nmax)); + return(f1 * exp10(double(n) * decades / nmax)); } @@ -140,6 +140,7 @@ stage& stage::operator= (stage& f1) this->q = f1.q; this->pole = f1.pole; this->zero = f1.zero; + return(*this); } @@ -391,15 +392,15 @@ void TFilter::chebyshev(void) { char dump; - int i; - double aa[20], ww[20], g, a, w, tt, qq; // Chebyshev filter design. log(""); unsigned n = poles; - g = ripple; +// Version 2.11: correct ripple factor from dB. +// g = ripple; + g = sqrt(pow(10.0, ripple / 10.0) - 1.0); for(i=1; i<=n; i++) { a=-sin((2*i-1)*M_PI/(2*n))*sinh(isinh(1.0/g)/n); @@ -498,7 +499,7 @@ bode_calc(TFilter& filter) j = std::complex(0.0, 1.0); // filter.fmax = 1.0 * filter.frequency * M_PI / 2.0; - filter.fmax = 0.1 * filter.frequency; + filter.fmax = T_MULTIPLE_HP * filter.frequency; for(i=0; i(0.0, 1.0); switch(fclass) { - case Lowpass: tmax = 5.0/frequency; break; - case Bandpass: tmax = 5.0/bandwidth; break; - case Highpass: tmax = 2.0/frequency; break; + case Lowpass: tmax = T_MULTIPLE_LP/frequency; break; + case Bandpass: tmax = T_MULTIPLE_BP/bandwidth; break; + case Highpass: tmax = T_MULTIPLE_HP/frequency; break; default: cout << "Unknown fclass\n"; exit(-1); } dt = tmax/TSTEPS; @@ -1038,7 +1039,7 @@ double q1, q2; // Used for checking. // Check: q1 = (a1*a1+b1*b1)/(2.0*a1); q2 = (a2*a2+b2*b2)/(2.0*a2); - cout << "q=" << q1 << " & " << q2 << "\n"; +// cout << "q=" << q1 << " & " << q2 << "\n"; TODO: WHAT has gone wrong here?!!! filter.log(""); } diff --git a/Calcs.h b/Calcs.h index bab0365..a383df8 100644 --- a/Calcs.h +++ b/Calcs.h @@ -28,6 +28,13 @@ using std::string; #define IMAX 19 #define MAXS 19 +#define T_MULTIPLE_LP 5.0 +#define T_MULTIPLE_BP 5.0 +#define T_MULTIPLE_HP 2.0 +#define F_MULTIPLE 0.1 + +#define LINEAR_FREQ true + #define LOG true #define NORMALISE diff --git a/Clean b/Clean new file mode 100644 index 0000000..933da27 --- /dev/null +++ b/Clean @@ -0,0 +1,5 @@ +#! /bin/bash +rm *~ +echo "Done!" +sleep 2 + diff --git a/Count_lines b/Count_lines new file mode 100644 index 0000000..94206cc --- /dev/null +++ b/Count_lines @@ -0,0 +1,5 @@ +#! /bin/bash +echo "Count lines:" +wc -l *.cpp *.h +read + diff --git a/Edit b/Edit new file mode 100644 index 0000000..9194517 --- /dev/null +++ b/Edit @@ -0,0 +1,4 @@ +#! /bin/bash +gedit *.cpp *.h +read + diff --git a/Makefile b/Makefile index bab1e6e..ee2781d 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,10 @@ # Initial makefile for use of autotools. CC=g++ -FLAGS=`pkg-config --cflags gtk+-2.0 gdk-2.0 libgnome-2.0 libgnomeui-2.0 gdk-pixbuf-xlib-2.0` +# FLAGS=`pkg-config --cflags gtk+-2.0 gdk-2.0 libgnome-2.0 libgnomeui-2.0 gdk-pixbuf-xlib-2.0` +FLAGS=`pkg-config --cflags gtk+-3.0 gdk-3.0` HEAD= -LIBS=`pkg-config --libs gtk+-2.0 gdk-2.0 libgnome-2.0 libgnomeui-2.0 gdk-pixbuf-xlib-2.0` +# LIBS=`pkg-config --libs gtk+-2.0 gdk-2.0 libgnome-2.0 libgnomeui-2.0 gdk-pixbuf-xlib-2.0` +LIBS=`pkg-config --libs gtk+-3.0 gdk-3.0 gdk-pixbuf-xlib-2.0` bin_PROGRAMS=rbfilter rbfilter_SOURCES=./rbfilter.cpp ./Calcs.cpp ./Rauch.cpp ./Sallen_and_Key.cpp ./Discrete.cpp Calcs.h Drawing.h filter.h preferred.h Discrete.h Enums.h gnome.h rbfilter.h diff --git a/Rauch.cpp b/Rauch.cpp index 7102610..f9c74b9 100644 --- a/Rauch.cpp +++ b/Rauch.cpp @@ -46,7 +46,7 @@ double nearest(double v, ee e1) double l = log10(v); double p = int(l); // Power of ten: i.e. exponent double f = l - p; - double x = pow10(f+1.0); // Mantissa + double x = exp10(f+1.0); // Mantissa double *ep; switch(e1) { case _e6: ep = e6; n = 6; break; @@ -62,7 +62,7 @@ double nearest(double v, ee e1) cout << "Value below 1.0\n"; return(1.0); } - return((x/ep[i-1] < ep[i]/x)? ep[i-1] * pow10(p-1.0): ep[i] * pow10(p-1.0)); + return((x/ep[i-1] < ep[i]/x)? ep[i-1] * exp10(p-1.0): ep[i] * exp10(p-1.0)); } @@ -166,8 +166,10 @@ void stage::synthesise_R_band(void) double C; double R; - cout << "There may be a problem in this function. Try another method of realization.\n"; +#if 0 + cout << "There may be a problem in this function. Calculation aborted: try another method of realization.\n"; return; +#endif #if SHOW_CALC cout << "\nsynthesise_band\n"; @@ -178,6 +180,7 @@ void stage::synthesise_R_band(void) // Let C1 = C.r, C2 = C/r // If R1 = R2 then q = T/(R1*(C.r+C/r)) // C.r^2 - T/(q * R1).r + C = 0 + R1 *= 0.75; R2 *= 1.5; /// Try progressively increasing ratios of R2:R1 until a solution is possible. C = T / sqrt(R1*R2); R = sqrt(R1*R2); diff --git a/Sallen_and_Key.cpp b/Sallen_and_Key.cpp index afbe2dd..f5caf10 100644 --- a/Sallen_and_Key.cpp +++ b/Sallen_and_Key.cpp @@ -54,7 +54,7 @@ double Fn_e6(double c) int i = 0; double temp; float e6[] = { 10.0, 6.8, 4.7, 3.3, 2.2, 1.5, 1.0, 0.68 }; - double exponent = pow10(int(log10(c))); + double exponent = exp10(int(log10(c))); double mantissa = c / exponent; cout << "mantissa = " << mantissa << " exponent = " << exponent << "\n"; do { @@ -73,7 +73,7 @@ double Fn_e12(double c) int i = 0; double temp; float e12[] = { 10.0, 8.2, 6.8, 5.6, 4.7, 3.9, 3.3, 2.7, 2.2, 1.8, 1.5, 1.2, 1.0, 0.82 }; - double exponent = pow10(int(log10(c))); + double exponent = exp10(int(log10(c))); double mantissa = c / exponent; do { temp = sqrt(e12[i] * e12[i+1]) / 10.0; diff --git a/Script.odt b/Script.odt new file mode 100644 index 0000000000000000000000000000000000000000..e022fadfbb724461e22b1d051b07c5e49af26953 GIT binary patch literal 20770 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 SOH@?5NiQ@h{v<=lSN{NwzPBC# literal 0 HcmV?d00001 diff --git a/Script2.odt b/Script2.odt new file mode 100644 index 0000000000000000000000000000000000000000..cd652207bbfd36b2d4a0c5d34f4a21fdb47bee60 GIT binary patch literal 25436 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. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: "; # UTC" +# End: diff --git a/configure b/configure index e672468..c6d228f 100644 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for FULL-PACKAGE-NAME VERSION. +# Generated by GNU Autoconf 2.69 for rbfiltrer 0.1. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -197,8 +197,7 @@ test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" if (eval "$as_required") 2>/dev/null; then : as_have_required=yes else @@ -266,11 +265,11 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and BUG-REPORT-ADDRESS -$0: about your system, including any error possibly output -$0: before this message. Then install a modern shell, or -$0: manually run the script under such a shell if you do -$0: have one." + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: roger.burghall1@btinternet.com about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." fi exit 1 fi @@ -578,68 +577,61 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='FULL-PACKAGE-NAME' -PACKAGE_TARNAME='full-package-name' -PACKAGE_VERSION='VERSION' -PACKAGE_STRING='FULL-PACKAGE-NAME VERSION' -PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS' +PACKAGE_NAME='rbfiltrer' +PACKAGE_TARNAME='rbfiltrer' +PACKAGE_VERSION='0.1' +PACKAGE_STRING='rbfiltrer 0.1' +PACKAGE_BUGREPORT='roger.burghall1@btinternet.com' PACKAGE_URL='' -ac_unique_file="Discrete.cpp" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_INTTYPES_H -# include -#endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif" - -enable_option_checking=no -ac_subst_vars='LTLIBOBJS +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS LIBOBJS -subdirs -EGREP -GREP CPP -SET_MAKE -ac_ct_CC -CFLAGS -CC +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +am__nodep +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__include +DEPDIR OBJEXT EXEEXT -ac_ct_CXX +ac_ct_CC CPPFLAGS LDFLAGS -CXXFLAGS -CXX +CFLAGS +CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM target_alias host_alias build_alias @@ -678,24 +670,24 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules +enable_dependency_tracking ' ac_precious_vars='build_alias host_alias target_alias -CXX -CXXFLAGS +CC +CFLAGS LDFLAGS LIBS CPPFLAGS -CCC -CC -CFLAGS CPP' -ac_subdirs_all='Save' + # Initialize some variables set by options. ac_init_help= @@ -1245,7 +1237,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures FULL-PACKAGE-NAME VERSION to adapt to many kinds of systems. +\`configure' configures rbfiltrer 0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1294,8 +1286,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root - [DATAROOTDIR/doc/full-package-name] + --docdir=DIR documentation root [DATAROOTDIR/doc/rbfiltrer] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1303,31 +1294,45 @@ Fine tuning of the installation directories: _ACEOF cat <<\_ACEOF + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names _ACEOF fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FULL-PACKAGE-NAME VERSION:";; + short | recursive ) echo "Configuration of rbfiltrer 0.1:";; esac cat <<\_ACEOF +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + Some influential environment variables: - CXX C++ compiler command - CXXFLAGS C++ compiler flags + CC C compiler command + CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CC C compiler command - CFLAGS C compiler flags CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1390,7 +1395,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FULL-PACKAGE-NAME configure VERSION +rbfiltrer configure 0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1404,44 +1409,6 @@ fi ## Autoconf initialization. ## ## ------------------------ ## -# ac_fn_cxx_try_compile LINENO -# ---------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_compile - # ac_fn_c_try_compile LINENO # -------------------------- # Try to compile conftest.$ac_ext, and return whether this succeeded. @@ -1516,342 +1483,11 @@ fi as_fn_set_status $ac_retval } # ac_fn_c_try_cpp - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## --------------------------------- ## -## Report this to BUG-REPORT-ADDRESS ## -## --------------------------------- ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -# ------------------------------------------- -# Tests whether TYPE exists after having included INCLUDES, setting cache -# variable VAR accordingly. -ac_fn_c_check_type () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof ($2)) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof (($2))) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - eval "$3=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_type - -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_func cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by FULL-PACKAGE-NAME $as_me VERSION, which was +It was created by rbfiltrer $as_me 0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2199,32 +1835,251 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu +am__api_version='1.16' -ac_config_headers="$ac_config_headers config.h" +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -# Checks for programs. -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$2" = conftest.file + ) +then + # Ok. + : +else + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` + +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +fi + +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2233,7 +2088,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -2243,32 +2098,28 @@ IFS=$as_save_IFS fi fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$CXX" && break - done fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2277,7 +2128,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" + ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -2287,21 +2138,17 @@ IFS=$as_save_IFS fi fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" + if test "x$ac_ct_STRIP" = x; then + STRIP=":" else case $cross_compiling:$ac_tool_warned in yes:) @@ -2309,407 +2156,355 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - CXX=$ac_ct_CXX + STRIP=$ac_ct_STRIP fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5 -$as_echo_n "checking whether the C++ compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { { ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - else - ac_file='' + STRIP="$ac_cv_prog_STRIP" fi -if test -z "$ac_file"; then : + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + +fi + + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +fi -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C++ compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } + + test -n "$AWK" && break +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5 -$as_echo_n "checking for C++ compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -ac_exeext=$ac_cv_exeext -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + PACKAGE='rbfiltrer' + VERSION='0.1' + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + + + + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' +am__doit: + @echo this is the am__doit target >confinc.out +.PHONY: am__doit +END +am__include="#" +am__quote= +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : + ;; +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } + AMDEP_TRUE='#' + AMDEP_FALSE= fi -rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -else - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3039,6 +2834,256 @@ $as_echo "$ac_try_echo"; } >&5 test $ac_status = 0; } done +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } if ${ac_cv_c_compiler_gnu+:} false; then : @@ -3250,41 +3295,192 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} _ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -# Checks for libraries. + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi -# Checks for header files. ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3423,416 +3619,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in stdlib.h string.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -# Checks for typedefs, structures, and compiler characteristics. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 -$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } -if ${ac_cv_header_stdbool_h+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - #ifndef bool - "error: bool is not defined" - #endif - #ifndef false - "error: false is not defined" - #endif - #if false - "error: false is not 0" - #endif - #ifndef true - "error: true is not defined" - #endif - #if true != 1 - "error: true is not 1" - #endif - #ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" - #endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - /* See body of main program for 'e'. */ - char f[(_Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; - /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - */ - _Bool q = true; - _Bool *pq = &q; - -int -main () -{ - - bool e = &s; - *pq |= q; - *pq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdbool_h=yes -else - ac_cv_header_stdbool_h=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 -$as_echo "$ac_cv_header_stdbool_h" >&6; } - ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" -if test "x$ac_cv_type__Bool" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE__BOOL 1 -_ACEOF - - -fi - - - -# Checks for library functions. -for ac_func in sqrt -do : - ac_fn_c_check_func "$LINENO" "sqrt" "ac_cv_func_sqrt" -if test "x$ac_cv_func_sqrt" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SQRT 1 -_ACEOF - -fi -done - - -ac_config_files="$ac_config_files Initial_files/Makefile Makefile" - -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - - - -subdirs="$subdirs Save" +ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3924,7 +3711,43 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -DEFS=-DHAVE_CONFIG_H +# Transform confdefs.h into DEFS. +# Protect against shell expansion while executing Makefile rules. +# Protect against Makefile macro expansion. +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +ac_script=' +:mline +/\\$/{ + N + s,\\\n,, + b mline +} +t clear +:clear +s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g +t quote +s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g +t quote +b any +:quote +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g +s/\$/$$/g +H +:any +${ + g + s/^\n// + s/\n/ /g + p +} +' +DEFS=`sed -n "$ac_script" confdefs.h` + ac_libobjs= ac_ltlibobjs= @@ -3943,6 +3766,30 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -4340,7 +4187,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by FULL-PACKAGE-NAME $as_me VERSION, which was +This file was extended by rbfiltrer $as_me 0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4358,15 +4205,12 @@ case $ac_config_files in *" "*) set x $ac_config_files; shift; ac_config_files=$*;; esac -case $ac_config_headers in *" -"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" -config_headers="$ac_config_headers" +config_commands="$ac_config_commands" _ACEOF @@ -4387,22 +4231,20 @@ Usage: $0 [OPTION]... [TAG]... --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE Configuration files: $config_files -Configuration headers: -$config_headers +Configuration commands: +$config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -FULL-PACKAGE-NAME config.status VERSION +rbfiltrer config.status 0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -4412,6 +4254,9 @@ gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' test -n "\$AWK" || AWK=awk _ACEOF @@ -4456,18 +4301,7 @@ do esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append CONFIG_HEADERS " '$ac_optarg'" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; - --help | --hel | -h ) + --he | --h | --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) @@ -4515,6 +4349,11 @@ _ASBOX _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" + _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -4523,8 +4362,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "Initial_files/Makefile") CONFIG_FILES="$CONFIG_FILES Initial_files/Makefile" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -4538,7 +4376,7 @@ done # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -4726,116 +4564,8 @@ fi cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" -# Set up the scripts for CONFIG_HEADERS section. -# No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. -if test -n "$CONFIG_HEADERS"; then -cat >"$ac_tmp/defines.awk" <<\_ACAWK || -BEGIN { -_ACEOF -# Transform confdefs.h into an awk script `defines.awk', embedded as -# here-document in config.status, that substitutes the proper values into -# config.h.in to produce config.h. - -# Create a delimiter string that does not exist in confdefs.h, to ease -# handling of long lines. -ac_delim='%!_!# ' -for ac_last_try in false false :; do - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_tt"; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -# For the awk script, D is an array of macro values keyed by name, -# likewise P contains macro parameters if any. Preserve backslash -# newline sequences. - -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -sed -n ' -s/.\{148\}/&'"$ac_delim"'/g -t rset -:rset -s/^[ ]*#[ ]*define[ ][ ]*/ / -t def -d -:def -s/\\$// -t bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3"/p -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -d -:bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3\\\\\\n"\\/p -t cont -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -t cont -d -:cont -n -s/.\{148\}/&'"$ac_delim"'/g -t clear -:clear -s/\\$// -t bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/"/p -d -:bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -b cont -' >$CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - for (key in D) D_is_set[key] = 1 - FS = "" -} -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { - line = \$ 0 - split(line, arg, " ") - if (arg[1] == "#") { - defundef = arg[2] - mac1 = arg[3] - } else { - defundef = substr(arg[1], 2) - mac1 = arg[2] - } - split(mac1, mac2, "(") #) - macro = mac2[1] - prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". - print prefix "define", macro P[macro] D[macro] - next - } else { - # Replace #undef with comments. This is necessary, for example, - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { - print "/*", prefix defundef, macro, "*/" - next - } - } -} -{ print } -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 -fi # test -n "$CONFIG_HEADERS" - - -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " +eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS" shift for ac_tag do @@ -4969,6 +4699,15 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix # CONFIG_FILE # + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -5022,6 +4761,8 @@ s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ @@ -5043,34 +4784,111 @@ which seems to be undefined. Please make sure it is defined" >&2;} esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - :H) - # - # CONFIG_HEADER - # - if test x"$ac_file" != x-; then - { - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" - } >"$ac_tmp/config.h" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f "$ac_file" - mv "$ac_tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - fi - else - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error $? "could not create -" "$LINENO" 5 - fi + + + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} ;; - - esac + + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac + shift + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf + do + # Strip MF so we end up with the name of the file. + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? + done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk +} + ;; + + esac done # for ac_tag @@ -5102,153 +4920,9 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || as_fn_exit 1 fi - -# -# CONFIG_SUBDIRS section. -# -if test "$no_recursion" != yes; then - - # Remove --cache-file, --srcdir, and --disable-option-checking arguments - # so they do not pile up. - ac_sub_configure_args= - ac_prev= - eval "set x $ac_configure_args" - shift - for ac_arg - do - if test -n "$ac_prev"; then - ac_prev= - continue - fi - case $ac_arg in - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ - | --c=*) - ;; - --config-cache | -C) - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - ;; - --disable-option-checking) - ;; - *) - case $ac_arg in - *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append ac_sub_configure_args " '$ac_arg'" ;; - esac - done - - # Always prepend --prefix to ensure using the same prefix - # in subdir configurations. - ac_arg="--prefix=$prefix" - case $ac_arg in - *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args" - - # Pass --silent - if test "$silent" = yes; then - ac_sub_configure_args="--silent $ac_sub_configure_args" - fi - - # Always prepend --disable-option-checking to silence warnings, since - # different subdirs can have different --enable and --with options. - ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args" - - ac_popdir=`pwd` - for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue - - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. - test -d "$srcdir/$ac_dir" || continue - - ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)" - $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 - $as_echo "$ac_msg" >&6 - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - cd "$ac_dir" - - # Check for guested configure; otherwise get Cygnus style configure. - if test -f "$ac_srcdir/configure.gnu"; then - ac_sub_configure=$ac_srcdir/configure.gnu - elif test -f "$ac_srcdir/configure"; then - ac_sub_configure=$ac_srcdir/configure - elif test -f "$ac_srcdir/configure.in"; then - # This should be Cygnus configure. - ac_sub_configure=$ac_aux_dir/configure - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5 -$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} - ac_sub_configure= - fi - - # The recursion is here. - if test -n "$ac_sub_configure"; then - # Make the cache file name correct relative to the subdirectory. - case $cache_file in - [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; - *) # Relative name. - ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 -$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} - # The eval makes quoting arguments work. - eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ - --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || - as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 - fi - - cd "$ac_popdir" - done -fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + diff --git a/rbfilter.cpp b/rbfilter.cpp index ba6563a..8537f4a 100644 --- a/rbfilter.cpp +++ b/rbfilter.cpp @@ -27,8 +27,8 @@ either Sallen and Key or Rauch circuits, or as digital filters. The intention is to permit the frequency and step responses to be computed, the response to an arbitrary waveform (eventually; not implemented in version 1.0), and to design Sallen and Key or Rauch circuits, or transform -the filter to the z-domain. These functions were already implemented in the -BBC Model B version of the suite. +the filter to the z-domain (i.e. to adapt the design for discrete implementation). +These functions were already implemented in the BBC Model B version of the suite. Thanks are due to Graham Watts for help with the mathematics of impulse and step response functions. @@ -50,6 +50,20 @@ Added a slider at the top of the graphics window. Version 1.0 September 2016 RB First usable version of this port. +Version 1.01 August 2018 RB +Altered logic to hide unwanted combo-boxes when filter class, circuit type or response +is changed. + +Version 2.01 March 2022 RB +Conversion to GTK3 and Cairo graphics. + +Version 2.1 March 31st 2022 RB +Candidate for actual use (Beta?). + +Version 2.11 April 27th RB +Corrected Chebyshev calculation +Removed "Atten" input. + */ /*! \file rbfilter.cpp @@ -62,41 +76,56 @@ It is intended that operating system dependant code should be kept in this file */ -#include #include -#include -#include +#include +#include +#include +#include +#include +#include #include #include "Drawing.h" #include "Calcs.h" -#include -#include -#define VERSION 1.0 +#define VERSION "2.2" #if SHOW_FILE_COMPILING #pragma message "Compiling Drawing.cpp" // or #warning "Compiling Drawing.cpp"? #endif -#define XSIZE 800 -#define YSIZE 300 +#define XSIZE 640 +#define YSIZE 480 +#define ZOOM_X 75.0 +#define ZOOM_Y 75.0 + +#define HEIGHT 400 +#define WIDTH 300 #pragma GCC diagnostic ignored "-Wwrite-strings" #pragma GCC diagnostic ignored "-Wformat-security" +GtkWidget *window1; /// Window for controls. +GtkWidget *window2; /// Window for graphs. -static int slider_position; + +static gboolean on_draw(GtkWidget *widget, cairo_t *cr, gpointer user_data); + + +cairo_t *cr; + +static gdouble slider_position; extern TFilter filter; + GtkWidget *app, /* *window, */ *cct_diagram; GtkWidget *image; double xyscale; gchar str[256]; GtkWidget *Window1, *Area1; GtkWidget *scale1; -GtkObject *scale_adj1; -static GdkPixmap *pixmap = NULL; +GtkAdjustment *scale_adj1; +static GdkPixbuf *pixmap = NULL; bool square = FALSE; GdkColor TriColour; @@ -106,14 +135,20 @@ GtkWidget *LabelR, *LabelB, *LabelS; // Buttons. static GtkWidget *vbox1, *vbox2, *sp_button, *t_button, *f_button, *s_button /*, *z_button*/ ; DrawMode Draw_mode; +/* Surface to store current scribbles */ +static cairo_surface_t *surface = NULL; + + class callback { - public: - static void clicked(GtkWidget *button, gpointer data); - static gint quit(GtkWidget *Widget, GdkEvent *event, gpointer data); + public: + static void clicked(GtkWidget *button, gpointer data); + static gint quit(GtkWidget *Widget, GdkEvent *event, gpointer data); }; + +char *Dstring = ""; /** Define a method to be called if a button is clicked. Read all the combo-boxes and correct the filter object in @@ -123,118 +158,227 @@ Currently we do not check for valid entries. */ void callback::clicked(GtkWidget *button, gpointer data) { -void DrawMap(GtkWidget *, gdouble, gdouble); -void Draw_poles(GtkWidget *widget, gdouble x, gdouble y); -void DrawStep(GtkWidget *widget, gdouble x, gdouble y); -void DrawBode(GtkWidget *widget, gdouble x, gdouble y); -double scale(TFilter); - gchar *text; - int w, h; - int n; - char *string = (char *)data; - // OK button clicked. - g_print("\n"); - g_print(string); - text = (gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(Type)); - if(strncmp(text, "L", 1) == 0) filter.fclass = Lowpass; - else if(strncmp(text, "H", 1) == 0) filter.fclass = Highpass; - else if(strncmp(text, "B", 1) == 0) filter.fclass = Bandpass; +void DrawMap(cairo_t *cr, gdouble, gdouble); +void Draw_poles(cairo_t *cr, gdouble x, gdouble y); +void DrawStep(cairo_t *cr, gdouble x, gdouble y); +void DrawBode(GtkWidget *area, cairo_t *cr, gdouble x, gdouble y); +// void on_draw(void); +// static gboolean on_draw(GtkWidget *widget, cairo_t *cr, gpointer user_data); - text = (gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(Type2)); - if(strncmp(text, "Be", 2) == 0) filter.sclass = Bessel; - else if(strncmp(text, "Bu", 2) == 0) filter.sclass = Butterworth; - else if(strncmp(text, "C", 1) == 0) filter.sclass = Chebyshev; + double scale(TFilter); + const gchar *text; + int i, w, h; + int n; +// cairo_t cr1; + Dstring = (char *)data; + // OK button clicked. +#if VERBOSE + g_print("\n"); + g_print(Dstring); +#endif + /// Read 'Type'. + text = (gchar *)gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(Type)); + if(strncmp(text, "L", 1) == 0) filter.fclass = Lowpass; + else if(strncmp(text, "H", 1) == 0) filter.fclass = Highpass; + else if(strncmp(text, "B", 1) == 0) filter.fclass = Bandpass; - text = (gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(Circuit)); - if(strncmp(text, "S", 1) == 0) filter.cclass = SallKey; - else if(strncmp(text, "R", 1) == 0) filter.cclass = Rauch; - else if(strncmp(text, "Z", 1) == 0) filter.cclass = ZDomain; + /// Read 'Type2': shape of response. + text = (gchar *)gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(Type2)); + if(strncmp(text, "Be", 2) == 0) filter.sclass = Bessel; + else if(strncmp(text, "Bu", 2) == 0) filter.sclass = Butterworth; + else if(strncmp(text, "C", 1) == 0) filter.sclass = Chebyshev; - text = (gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(Freq)->entry)); - if(strlen(text)) n = sscanf(text, "%lf", &filter.frequency); - if((n == 0) || (filter.frequency <= 0.0)) { - filter.frequency = 1.0; - gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(Freq)->entry), "?"); - } + /// Read realisation. + text = (gchar *)gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(Circuit)); + if(strncmp(text, "S", 1) == 0) { + filter.cclass = SallKey; + gtk_widget_hide(LabelS); + } + else if(strncmp(text, "R", 1) == 0) { + filter.cclass = Rauch; + gtk_widget_hide(LabelS); + } + else if(strncmp(text, "D", 1) == 0) { + filter.cclass = ZDomain; + gtk_widget_show(LabelS); + } - text = (gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(Order)->entry)); - if(strlen(text)) sscanf(text, "%d", &filter.poles); - if((n == 0) || (filter.poles < 2) || ((filter.poles < 3) && (filter.fclass != Bandpass))) { - filter.poles = 3; - gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(Order)->entry), "?"); - } + /// Read frequency. + text = gtk_entry_get_text(GTK_ENTRY(Freq)); + if(strlen(text)) n = sscanf(text, "%lf", &filter.frequency); + if((n == 0) || (filter.frequency <= 0.0)) { + filter.frequency = 1.0; + } - text = (gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(Ripple)->entry)); - if(strlen(text)) sscanf(text, "%lf", &filter.ripple); - if((n == 0) || (filter.ripple < 0.0)) { - filter.ripple = 1.0; - gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(Ripple)->entry), "?"); - } + /// read (prototype) filter order. + text = gtk_entry_get_text(GTK_ENTRY(Order)); - text = (gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(Bandwidth)->entry)); - if(strlen(text)) sscanf(text, "%lf", &filter.bandwidth); - if((n == 0) || (filter.bandwidth <= 2)) { - filter.bandwidth = filter.frequency/2.0; - gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(Bandwidth)->entry), "?"); - } + if(strlen(text)) sscanf(text, "%d", &filter.poles); + if((n == 0) || (filter.poles < 2) || ((filter.poles < 3) && (filter.fclass != Bandpass))) { + filter.poles = 3; + } - text = (gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(SamplingFreq)->entry)); - if(strlen(text)) sscanf(text, "%lf", &filter.samplingfreq); + /// Read Ripple in dB. + text = gtk_entry_get_text(GTK_ENTRY(Ripple)); + if(strlen(text)) sscanf(text, "%lf", &filter.ripple); + if((n == 0) || (filter.ripple < 0.0)) { + filter.ripple = 1.0; + } - filter.Calculate( ); - bode_calc(filter); - filter.step_calc( ); - xyscale = scale(filter); - gdk_window_get_size(Window1->window, &w, &h); + /// Read Bandwidth. + text = gtk_entry_get_text(GTK_ENTRY(Bandwidth)); + if(strlen(text)) sscanf(text, "%lf", &filter.bandwidth); + if((n == 0) || (filter.bandwidth <= 2)) { + filter.bandwidth = filter.frequency/2.0; + } - if(strncmp(string, "Syn", 3) == 0) { - switch(filter.cclass) { - case Rauch: filter.gain = -1.0; filter.Synth_Rauch( ); - switch(filter.fclass) { - case Lowpass: gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/low_pass_MF.png"); break; - case Bandpass: gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/band_pass_MF.png"); break; - case Highpass: gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/high_pass_MF.png"); break; - } - gtk_widget_show(image); - gtk_widget_show(cct_diagram); - break; - case SallKey: filter.gain = 1.0; filter.Synth_SallKey( ); - switch(filter.fclass) { - case Lowpass: gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/low_pass_SK.png"); break; - case Bandpass: gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/band_pass_SK.png"); break; - case Highpass: gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/high_pass_SK.png"); break; - } - gtk_widget_show(image); - gtk_widget_show(cct_diagram); - break; - case ZDomain: filter.gain = 1.0; filter.bilinear( ); - gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/DirectForm1.png"); - gtk_widget_show(image); - gtk_widget_show(cct_diagram); - break; - default: cout << "Unknown cclass!\n"; exit(-1); - } - } + /// Read Sampling frequency; must be more than 2*frequency above. + text = gtk_entry_get_text(GTK_ENTRY(SamplingFreq)); + if(strlen(text)) sscanf(text, "%lf", &filter.samplingfreq); - if(strncmp(string, "S-p", 2) == 0) { - gtk_widget_hide(scale1); - Draw_mode = Splane; - Draw_poles(Area1, 250, 250); - } - if(strncmp(string, "T-d", 2) == 0) { - gtk_adjustment_set_value (GTK_ADJUSTMENT(scale_adj1), 0.0); - gtk_widget_show(scale1); - Draw_mode = Step; - DrawStep(Area1, 250, 250); - } - if(strncmp(string, "F-d", 2) == 0) { - gtk_adjustment_set_value (GTK_ADJUSTMENT(scale_adj1), (double)FSTEPS/2.0); - gtk_widget_show(scale1); - Draw_mode = Bode; - DrawBode(Area1, 250, 250); - } + filter.Calculate( ); + bode_calc(filter); + filter.step_calc( ); + xyscale = scale(filter); + + gtk_widget_show(Area1); + + gtk_window_get_size((GtkWindow *)window2, &w, &h); - g_print("\n"); + if(strncmp(Dstring, "Syn", 3) == 0) { + gtk_widget_hide(window2); + switch(filter.cclass) { + case Rauch: filter.gain = -1.0; filter.Synth_Rauch( ); + switch(filter.fclass) { + case Lowpass: gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/low_pass_MF.png"); break; + case Bandpass: gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/band_pass_MF.png"); break; + case Highpass: gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/high_pass_MF.png"); break; + } + gtk_widget_show(image); + gtk_widget_show(cct_diagram); + break; + case SallKey: filter.gain = 1.0; filter.Synth_SallKey( ); + switch(filter.fclass) { + case Lowpass: gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/low_pass_SK.png"); break; + case Bandpass: gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/band_pass_SK.png"); break; + case Highpass: gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/high_pass_SK.png"); break; + } + gtk_widget_show(image); + gtk_widget_show(cct_diagram); + break; + case ZDomain: filter.gain = 1.0; filter.bilinear( ); + gtk_image_set_from_file ((GtkImage *)image, "./Circuit_diagrams/DirectForm1.png"); + gtk_widget_show(image); + gtk_widget_show(cct_diagram); + break; + default: cout << "Unknown cclass!\n"; exit(-1); + } + cout << "\n"; + for(i=0; i\n"); +#endif + + gtk_widget_show_all(window2); + + if(strncmp(Dstring, "S-p", 2) == 0) { + gtk_widget_hide(scale1); + Draw_mode = Splane; + Draw_poles(cr, 250.0, 250.0); + } + if(strncmp(Dstring, "T-d", 2) == 0) { +// gtk_adjustment_set_value (GTK_ADJUSTMENT(scale_adj1), 0.0); + gtk_widget_show(scale1); + Draw_mode = Step; + DrawStep(cr, 250, 250); + } + if(strncmp(Dstring, "F-d", 2) == 0) { +// gtk_adjustment_set_value (GTK_ADJUSTMENT(scale_adj1), (double)FSTEPS/2.0); + gtk_widget_show(scale1); + Draw_mode = Bode; + DrawBode(area, cr, 250, 250); + } + +#if VERBOSE + g_print("\n"); +#endif + return(TRUE); } @@ -242,10 +386,10 @@ double scale(TFilter); /// Define a method to be called if the close icon is clicked. gint callback::quit(GtkWidget *Widget, GdkEvent *event, gpointer data) { - g_print("'Quit' callback\n"); +// g_print("'Quit' callback\n"); - gtk_main_quit( ); - return FALSE; + gtk_main_quit( ); + return FALSE; } @@ -253,286 +397,460 @@ gint callback::quit(GtkWidget *Widget, GdkEvent *event, gpointer data) /// I would like to make the application ignore the second window 'quit' event, but since I can't I'll quit the application. gint pseudo_quit(GtkWidget *Widget, GdkEvent *event, gpointer data) { - g_print("Second window 'Quit' callback\n"); - gtk_main_quit( ); - return FALSE; + g_print("Second window 'Quit' callback\n"); + gtk_main_quit( ); + return FALSE; } /// Draw the Bode diagram. -void DrawBode(GtkWidget *widget, gdouble x, gdouble y) +void DrawBode(GtkWidget *area, cairo_t *cr, gdouble x, gdouble y) { - extern double n_to_freq(int n, double f1, int nmax=FSTEPS, int decades=2); - char str[80]; - gint i, w, h; - gint xx, yy; - gint xx1, yy1, xx2, yy2; - gint width, height; - double a, f; - GdkFont* Font1; - GdkColor Colour1, Colour2; - GdkGC *gc1= gdk_gc_new(widget->window); - GdkGC *gc2= gdk_gc_new(widget->window); + extern double n_to_freq(int n, double f1, int nmax=FSTEPS, int decades=2); + char str[80], string1[80]; + gdouble ftest, gain; + gint i; + gdouble xx1, yy1, xx2, yy2, xx, yy; + gdouble width, height; + double a, f; + GdkRectangle da; /* GtkDrawingArea size */ + gdouble dx = 5.0, dy = 5.0; /* Pixels between each point */ + gdouble clip_x1 = 0.0, clip_y1 = 0.0, clip_x2 = 0.0, clip_y2 = 0.0; + gdouble left, right, top, bottom; + GdkWindow *window = gtk_widget_get_window(Area1); + assert(window != NULL); + gtk_window_set_title (GTK_WINDOW(window2), (gchar *)"Bode diagram"); + +#if VERBOSE + cout << "DrawBode: cr = " << (long)cr << "\n"; + cout << "Size request\n"; +#endif + gtk_widget_set_size_request(window2, 750, 750); + + /* Determine GtkDrawingArea dimensions. x, y is the position relative to the parent window. Width and height are obvious. */ + gdk_window_get_geometry((GdkWindow*)window, &da.x, &da.y, &da.width, &da.height); #if VERBOSE - g_print("\n"); + cout << "Set line width\n"; +#endif + cairo_set_line_width(cr, 0.02); + +#if VERBOSE + cout << "set source rgb\n"; +#endif + /* Draw on a black background */ + cairo_set_source_rgb(cr, 0.0, 0.0, 0.0); + cairo_paint(cr); +#if VERBOSE + cout << "stroke\n"; +#endif + cairo_stroke(cr); + +#if VERBOSE + cout << "translate\n"; +#endif + /* Change the transformation matrix */ + /* translate points in user space to the device space. */ +// cairo_translate(cr, 7*da.width / 8, da.height / 2); + cairo_translate(cr, 1, 1); + /* Scales the user space into the device space. */ + +#if VERBOSE + cout << "scale\n"; +#endif + cairo_scale(cr, ZOOM_X, ZOOM_Y); + + /* Determine the data points to calculate (ie. those in the clipping zone) */ +// cairo_device_to_user_distance(cr, &dx, &dy); +#if VERBOSE + cout << "extents\n"; +#endif + cairo_clip_extents(cr, &clip_x1, &clip_y1, &clip_x2, &clip_y2); + +#if VERBOSE + g_print("\n"); #endif - gtk_window_set_title ((GtkWindow *)Window1, (gchar *)"Bode diagram"); +// Let's pick colour blue for the foreground. + cairo_set_source_rgb(cr, 0.5, 0.5, 1.0); + +#if VERBOSE + cout << "select font\n"; +#endif + cairo_select_font_face(cr, "NimbusSans-Regular", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); + +#if VERBOSE + cout << "set font size\n"; +#endif + cairo_set_font_size(cr, 0.075); + + width = clip_x2 - clip_x1; + left = clip_x1 + width / 100.0; + width = clip_x2 - left; + height = clip_y1 - clip_y2; + yy = (2.0 * clip_y1 + clip_y2) / 3.0; +#if VERBOSE + cout << "draw lines\n"; +#endif +#if 0 +// Diagonal line test. + cairo_move_to(cr, left, clip_y1); + cairo_line_to(cr, clip_x2, clip_y2); +#endif + cairo_move_to(cr, left, clip_y1); + cairo_line_to(cr, left, clip_y2); + cairo_move_to(cr, left, yy); + cairo_line_to(cr, clip_x2, yy); -// Let's colour 'gc1' blue and set the foreground colour to it. - Colour1.red=32000; - Colour1.green=32000; - Colour1.blue=62000; - gdk_gc_set_rgb_fg_color(gc1, &Colour1); - - Colour2.red=32000; - Colour2.green=62000; - Colour2.blue=32000; - gdk_gc_set_rgb_fg_color(gc2, &Colour2); - -// g_print("draw brush\n"); - Font1 = gdk_font_load("*trebuchet*12*"); - if(Font1 == NULL) Font1 = gdk_font_load("*arial*"); - if(Font1 == NULL) Font1 = gdk_font_load("*sans*"); - if(Font1 == NULL) Font1 = gdk_font_load("*helvetica*--14*"); - if(Font1 == NULL) Font1 = gdk_font_load("*helvetica*"); - if(Font1 == NULL) Font1 = gdk_font_load("-misc-fixed-*"); - if(Font1 == NULL) Font1 = gdk_font_load("-bitstream-bitstream charter-*"); - if(Font1 == NULL) Font1 = gdk_font_load("*clean*"); - if(Font1 == NULL) g_print("Failed to find font\n"); - - gdk_window_get_size(widget->window, &w, &h); -// OR gdk_drawable_get_size(widget->window, &width, &height); - - GdkRectangle update_rect; - - update_rect.x = (gint)1; - update_rect.y = (gint)1; - update_rect.width = (gint)w - 2; - update_rect.height = (gint)h - 2; - - gdk_draw_rectangle(widget->window, widget->style->white_gc, TRUE, 0, 0, w, h); - gdk_draw_line(widget->window, gc1, 10, h/5, w-10, h/5); - gdk_draw_line(widget->window, gc1, (w)/10, h, (w)/10, 1); - gdk_draw_string(widget->window, Font1, widget->style->black_gc, (w)/10, h/5, "0,0"); - - yy = h/5 - 0.5*log10(0.708) * 3*h/5; - gdk_draw_line(widget->window, gc2, w/10, yy, 9*w/10, yy); - gdk_draw_string(widget->window, Font1, gc2, (w)/10, yy, "-3dB"); - yy = h/5 - 0.5*log10(0.708*0.708) * 3*h/5; - gdk_draw_line(widget->window, gc2, w/10, yy, 9*w/10, yy); - gdk_draw_string(widget->window, Font1, gc2, (w)/10, yy, "-6dB"); - yy = h/5 - 0.5*log10(0.708*0.708*0.708) * 3*h/5; - gdk_draw_line(widget->window, gc2, w/10, yy, 9*w/10, yy); - gdk_draw_string(widget->window, Font1, gc2, (w)/10, yy, "-9dB"); - if(filter.fclass == Bandpass) gdk_draw_string(widget->window, Font1, widget->style->black_gc, (w)/10, yy/10, "Gain normalised to 1.0"); + cairo_stroke(cr); /// Draw the frequency response curve. - for(i=1; iwindow, gc1, xx1, yy1, xx2, yy2); - } - -/// Draw line at measurement frequency - f = n_to_freq(slider_position, filter.fmax); - xx1 = w/10 + (slider_position-1) * 8*w/10 / FSTEPS; - gdk_draw_line(widget->window, gc1, xx1, h, xx1, 1); - sprintf(str, "f = %0.2f Hz", f); - gdk_draw_string(widget->window, Font1, widget->style->black_gc, (7*w)/10, h/10, str); -// a = log10(filter.freq_resp[slider_position-1]); - a = filter.freq_resp[slider_position-1]; - sprintf(str, "Gain = %0.2f ", a); - gdk_draw_string(widget->window, Font1, widget->style->black_gc, (7*w)/10, h/8, str); + for(i=1; i\n"); + g_print("\n"); #endif } /// Draw the s-plane diagram. -void Draw_poles(GtkWidget *widget, gdouble x, gdouble y) +void Draw_poles(cairo_t *cr, gdouble x, gdouble y) { - double scale(TFilter); - char str[80]; - gint i, w, h; - gint xx, yy; - gint width, height; - GdkFont* Font1; - GdkColor Colour1; - GdkGC *gc1= gdk_gc_new(widget->window); + GdkRectangle da; /* GtkDrawingArea size */ + gdouble dx = 5.0, dy = 5.0; /* Pixels between each point */ + gdouble clip_x1 = 0.0, clip_y1 = 0.0, clip_x2 = 0.0, clip_y2 = 0.0; + gdouble left, right, top, bottom; + gint i; + gchar string1[64]; + gdouble xx1, yy1, xx2, yy2, xx, yy; + gdouble width, height, xyscale; + GdkWindow *window = gtk_widget_get_window(Area1); + gdouble scale(TFilter); + assert(window != NULL); + gtk_window_set_title (GTK_WINDOW(window2), (gchar *)"S-plane"); #if VERBOSE - g_print("\n"); -#endif + cout << "DrawBode: cr = " << (long)cr << "\n"; + cout << "Size request\n"; +#endif + gtk_widget_set_size_request(window2, 400, 750); + + /* Determine GtkDrawingArea dimensions. x, y is the position relative to the parent window. Width and height are obvious. */ + gdk_window_get_geometry((GdkWindow*)window, &da.x, &da.y, &da.width, &da.height); - gtk_window_set_title ((GtkWindow *)Window1, (gchar *)"'s' plane"); - -// Let's colour 'gc1' blue and set the foreground colour to it. - Colour1.red=32000; - Colour1.green=32000; - Colour1.blue=62000; - gdk_gc_set_rgb_fg_color(gc1, &Colour1); - -// g_print("draw brush\n"); - Font1 = gdk_font_load("*trebuchet*12*"); - if(Font1 == NULL) Font1 = gdk_font_load("*arial*"); - if(Font1 == NULL) Font1 = gdk_font_load("*sans*"); - if(Font1 == NULL) Font1 = gdk_font_load("*helvetica*--14*"); - if(Font1 == NULL) Font1 = gdk_font_load("*helvetica*"); - if(Font1 == NULL) Font1 = gdk_font_load("-misc-fixed-*"); - if(Font1 == NULL) Font1 = gdk_font_load("-bitstream-bitstream charter-*"); - if(Font1 == NULL) Font1 = gdk_font_load("*clean*"); - if(Font1 == NULL) g_print("Failed to find font\n"); - - gdk_window_get_size(widget->window, &w, &h); -// OR gdk_drawable_get_size(widget->window, &width, &height); - - GdkRectangle update_rect; - - update_rect.x = (gint)1; - update_rect.y = (gint)1; - update_rect.width = (gint)w - 2; - update_rect.height = (gint)h - 2; - - gdk_draw_rectangle(widget->window, widget->style->white_gc, TRUE, 0, 0, w, h); - gdk_draw_line(widget->window, gc1, 10, h/2, w-10, h/2); - gdk_draw_line(widget->window, gc1, (4*w)/5, h, (4*w)/5, 1); - gdk_draw_string(widget->window, Font1, widget->style->black_gc, (4*w)/5+5, h/2-5, "0,0"); - - xyscale = scale(filter); - - for(i=0; iwindow, widget->style->black_gc, xx-10, h/2 + yy, xx+10, h/2 + yy); - gdk_draw_line(widget->window, widget->style->black_gc, xx, h/2 + yy - 10, xx, h/2 + yy + 10); - sprintf(str, "%1.3lf, %1.2lf", filter.st[i].pole.real(), filter.st[i].pole.imag()); - gdk_draw_string(widget->window, Font1, gc1, xx - 80, h/2 + yy - 15, str); - } - if(filter.type != '0') for(i=0; iwindow, Font1, widget->style->black_gc, w / 10, 20 + i * 15, str); - } - if(filter.zeroes) { - gdk_draw_arc(widget->window, widget->style->black_gc, false, (4*w)/5 - 10, h/2 - 10, 20, 20, 0, 360*64); - sprintf(str, "* %1d", filter.zeroes); - gdk_draw_string(widget->window, Font1, gc1, (4*w)/5 - 20, h/2 + 20, str); - } #if VERBOSE - g_print("\n"); + cout << "Set line width\n"; #endif + cairo_set_line_width(cr, 0.02); + +#if VERBOSE + cout << "set source rgb\n"; +#endif + /* Draw on a blue background */ + cairo_set_source_rgb(cr, 0.5, 0.5, 0.8); + cairo_paint(cr); +#if VERBOSE + cout << "stroke\n"; +#endif + cairo_stroke(cr); + +#if VERBOSE + cout << "translate\n"; +#endif + /* translate points in user space to the device space. */ + cairo_translate(cr, 1, 1); + /* Scales the user space into the device space. */ +#if VERBOSE + cout << "scale\n"; +#endif + cairo_scale(cr, ZOOM_X, ZOOM_Y); + +#if VERBOSE + cout << "extents\n"; +#endif + cairo_clip_extents(cr, &clip_x1, &clip_y1, &clip_x2, &clip_y2); + +#if VERBOSE + g_print("\n"); +#endif + +// Let's pick colour blue for the foreground. + cairo_set_source_rgb(cr, 0.0, 0.0, 0.0); + +#if VERBOSE + cout << "select font\n"; +#endif + + cairo_select_font_face(cr, "NimbusSans-Regular", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); + +#if VERBOSE + cout << "set font size\n"; +#endif + cairo_set_font_size(cr, 0.25); + + width = clip_x2 - clip_x1; + left = clip_x1 + width / 100.0; + width = clip_x2 - left; + height = clip_y2 - clip_y1; + yy = (2.0 * clip_y1 + clip_y2) / 3.0; + cairo_move_to(cr, left+0.9*width, clip_y1); + cairo_line_to(cr, left+0.9*width, clip_y2); + cairo_move_to(cr, left, clip_y1+0.5*height); + cairo_line_to(cr, left+width, clip_y1+0.5*height); + cairo_stroke(cr); + + xyscale = scale(filter); + for(i=0; iwindow); + char str[80], string1[80]; + gint i, w, h; + gdouble yy, xx1, yy1, xx2, yy2; + gdouble width, height; + gdouble t, v; + GdkRectangle da; /* GtkDrawingArea size */ + gdouble dx = 5.0, dy = 5.0; /* Pixels between each point */ + gdouble clip_x1 = 0.0, clip_y1 = 0.0, clip_x2 = 0.0, clip_y2 = 0.0; + gdouble left, right, top, bottom; + GdkWindow *window = gtk_widget_get_window(Area1); + assert(window != NULL); + gtk_window_set_title (GTK_WINDOW(window2), (gchar *)"Step response"); #if VERBOSE - g_print("\n"); + cout << "DrawStep: cr = " << (long)cr << "\n"; + cout << "Size request\n"; +#endif + gtk_widget_set_size_request(window2, 750, 750); + + /* Determine GtkDrawingArea dimensions. x, y is the position relative to the parent window. Width and height are obvious. */ + gdk_window_get_geometry((GdkWindow*)window, &da.x, &da.y, &da.width, &da.height); + +#if VERBOSE + cout << "Set line width\n"; +#endif + cairo_set_line_width(cr, 0.02); + +#if VERBOSE + cout << "set source rgb\n"; +#endif + /* Draw on a black background */ + cairo_set_source_rgb(cr, 0.0, 0.0, 0.0); + cairo_paint(cr); +#if VERBOSE + cout << "stroke\n"; +#endif + cairo_stroke(cr); + +#if VERBOSE + cout << "translate\n"; +#endif + /* Change the transformation matrix */ + /* translate points in user space to the device space. */ + cairo_translate(cr, 1, 1); + /* Scales the user space into the device space. */ + +#if VERBOSE + cout << "scale\n"; +#endif + cairo_scale(cr, ZOOM_X, ZOOM_Y); + + /* Determine the data points to calculate (ie. those in the clipping zone) */ +// cairo_device_to_user_distance(cr, &dx, &dy); +#if VERBOSE + cout << "extents\n"; +#endif + cairo_clip_extents(cr, &clip_x1, &clip_y1, &clip_x2, &clip_y2); + +#if VERBOSE + g_print("\n"); #endif - gtk_window_set_title ((GtkWindow *)Window1, (gchar *)"Time domain"); - -/// Let's colour 'gc1' blue and set the foreground colour to it. - Colour1.red=32000; - Colour1.green=32000; - Colour1.blue=62000; - gdk_gc_set_rgb_fg_color(gc1, &Colour1); - -/// Select a suitable font. -// g_print("draw brush\n"); - Font1 = gdk_font_load("*trebuchet*12*"); - if(Font1 == NULL) Font1 = gdk_font_load("*arial*"); - if(Font1 == NULL) Font1 = gdk_font_load("*sans*"); - if(Font1 == NULL) Font1 = gdk_font_load("*helvetica*--14*"); - if(Font1 == NULL) Font1 = gdk_font_load("*helvetica*"); - if(Font1 == NULL) Font1 = gdk_font_load("-misc-fixed-*"); - if(Font1 == NULL) Font1 = gdk_font_load("-bitstream-bitstream charter-*"); - if(Font1 == NULL) Font1 = gdk_font_load("*clean*"); - if(Font1 == NULL) g_print("Failed to find font\n"); - -/// Check the size of the window then define an update rectangle. - gdk_window_get_size(widget->window, &w, &h); -// OR gdk_drawable_get_size(widget->window, &width, &height); - - GdkRectangle update_rect; - update_rect.x = (gint)1; - update_rect.y = (gint)1; - update_rect.width = (gint)w - 2; - update_rect.height = (gint)h - 2; - - filter.step_calc( ); - -/// Draw suitable axes. - gdk_draw_rectangle(widget->window, widget->style->white_gc, TRUE, 0, 0, w, h); - switch(filter.fclass) { - case Lowpass: gdk_draw_line(widget->window, gc1, 10, 4*h/5, w-10, 4*h/5); break; - case Bandpass: gdk_draw_line(widget->window, gc1, 10, h/2, w-10, h/2); break; - case Highpass: gdk_draw_line(widget->window, gc1, 10, 3*h/5, w-10, 3*h/5); break; - } - gdk_draw_line(widget->window, gc1, w/10, h, w/10, 1); - -/// Draw the step response curve. - for(i=1; iwindow, gc1, xx1, yy1, xx2, yy2); - } - -/// Draw line at measurement time - t = filter.tmax * slider_position / TSTEPS; - xx1 = w/10 + (slider_position-1) * 8*w/10 / FSTEPS; - gdk_draw_line(widget->window, gc1, xx1, h, xx1, 1); - sprintf(str, "t = %0.2f ", t); - gdk_draw_string(widget->window, Font1, widget->style->black_gc, (7*w)/10, h/8, str); - v = filter.step_resp[slider_position-1]; - sprintf(str, "v = %0.2f at ", v); - gdk_draw_string(widget->window, Font1, widget->style->black_gc, (7*w)/10, h/10, str); - -/// List the stage Ts and qs etc. - if(filter.type != '0') for(i=0; iwindow, Font1, widget->style->black_gc, w / 10, 20 + i * 15, str); - } +// Let's pick colour blue for the foreground. + cairo_set_source_rgb(cr, 0.5, 0.5, 1.0); + #if VERBOSE - g_print("\n"); + cout << "select font\n"; +#endif + cairo_select_font_face(cr, "NimbusSans-Regular", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); + +#if VERBOSE + cout << "set font size\n"; +#endif + cairo_set_font_size(cr, 0.075); + + width = clip_x2 - clip_x1; + height = clip_y2 - clip_y1; + left = clip_x1 + width / 100.0; + yy = (2.0 * clip_y1 + clip_y2) / 3.0; +#if VERBOSE + cout << "draw axes\n"; +#endif +#if 0 +// Diagonal line test. + cairo_move_to(cr, left, clip_y1); + cairo_line_to(cr, clip_x2, clip_y2); +#endif + + /// Draw suitable axes. + cairo_move_to(cr, left, clip_y1); + cairo_line_to(cr, left, clip_y2); // Vertical axis. + switch(filter.fclass) { + case Lowpass: + yy = (0.2 * clip_y1 + 0.8 * clip_y2); + break; + case Bandpass: + yy = (0.5 * clip_y1 + 0.5 * clip_y2); + break; + case Highpass: + yy = (0.4 * clip_y1 + 0.6 * clip_y2); + break; + } + cairo_move_to(cr, left, yy); + cairo_line_to(cr, clip_x2, yy); // Horizontal axis. + cairo_stroke(cr); + + filter.step_calc( ); + + /// Draw the step response curve. + for(i=1; iwindow, Font1, widget->style->black_gc, w / 10, 20 + i * 15, str); + } +#if VERBOSE + g_print("\n"); +#endif #endif } @@ -541,24 +859,26 @@ void DrawStep(GtkWidget *widget, gdouble x, gdouble y) /** Draw a rectangle on the screen, and add the axes, poles and the Ts and qs. */ void -DrawMap(GtkWidget *widget, gdouble x, gdouble y) +DrawMap(cairo_t *cr, gdouble x, gdouble y) { +#if 0 #if VERBOSE - g_print("\n"); + g_print("\n"); #endif - switch(Draw_mode) { - case Splane: Draw_poles(widget, 250, 250); - break; - case Step: DrawStep(widget, 250, 250); - break; - case Bode: DrawBode(widget, 250, 250); - break; - default: cout << "\n\n***UNKNOWN DRAW MODE!***\n\n"; - break; - } + switch(Draw_mode) { + case Splane: Draw_poles(widget, 250, 250); + break; + case Step: DrawStep(widget, 250, 250); + break; + case Bode: DrawBode(widget, 250, 250); + break; + default: cout << "\n\n***UNKNOWN DRAW MODE!***\n\n"; + break; + } #if VERBOSE - g_print("\n"); + g_print("\n"); +#endif #endif } @@ -567,17 +887,7 @@ DrawMap(GtkWidget *widget, gdouble x, gdouble y) /** Define a function to be called if the window is re-exposed. */ static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event) { -#if VERBOSE - g_print("\n"); -#endif - - DrawMap(widget, 0, 0); - -#if VERBOSE - g_print("\n"); -#endif - - return(TRUE); + return(TRUE); } @@ -586,24 +896,7 @@ static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event) static gboolean button_press_event( GtkWidget *widget, GdkEventButton *event ) { - gint w, h; - -#if VERBOSE - g_print("\n"); -#endif - - gdk_window_get_size(widget->window, &w, &h); - g_print("button press callback\n"); - - gdk_draw_rectangle(widget->window, widget->style->white_gc, TRUE, 0, 0, w, h); - gdk_draw_rectangle(widget->window, widget->style->black_gc, FALSE, (w/2)-4, (h/2)-4, 8, 8); - if (event->button == 1) DrawMap (widget, event->x, event->y); - -#if VERBOSE - g_print("\n"); -#endif - - return TRUE; + return TRUE; } @@ -612,28 +905,7 @@ button_press_event( GtkWidget *widget, GdkEventButton *event ) static gboolean motion_notify_event( GtkWidget *widget, GdkEventMotion *event ) { - int x, y; - GdkModifierType state; - -#if VERBOSE - g_print("\n"); -#endif - - if (event->is_hint) gdk_window_get_pointer (event->window, &x, &y, &state); - else { - x = (gint)event->x; - y = (gint)event->y; - state = (GdkModifierType)event->state; - } - -// if (state & GDK_BUTTON1_MASK) DrawMap (window, x, y); - DrawMap(widget, x, y); - -#if VERBOSE - g_print("\n"); -#endif - - return TRUE; + return TRUE; } @@ -644,44 +916,14 @@ motion_notify_event( GtkWidget *widget, GdkEventMotion *event ) static gboolean configure_event( GtkWidget *widget, GdkEventConfigure *event ) { - gint x, y; -#if VERBOSE - g_print("\n"); -#endif - - if(pixmap) g_object_unref(pixmap); - - pixmap = gdk_pixmap_new(widget->window, - widget->allocation.width, widget->allocation.height, -1); - gdk_draw_rectangle (widget->window, widget->style->white_gc, - TRUE, 0, 0, x = widget->allocation.width, y = widget->allocation.height); - DrawMap(widget, x, y); -#if VERBOSE - g_print("\n"); -#endif - - return TRUE; + return TRUE; } bool Check_band(void) { -const gchar *txt = "Impossible request"; -// Buttons are:- sp_button, t_button, f_button, s_button - if(filter.fclass == Bandpass && filter.poles % 2) { - gtk_widget_set_sensitive(sp_button, false); - gtk_widget_set_sensitive(t_button, false); - gtk_widget_set_sensitive(f_button, false); - gtk_widget_set_sensitive(s_button, false); -/* GtkWidget* msg = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, txt); - gtk_widget_show(GTK_WIDGET(msg)); */ - } else { - gtk_widget_set_sensitive(sp_button, true); - gtk_widget_set_sensitive(t_button, true); - gtk_widget_set_sensitive(f_button, true); - gtk_widget_set_sensitive(s_button, true); - } + return(TRUE); } @@ -691,23 +933,7 @@ const gchar *txt = "Impossible request"; */ void Type_event(GtkComboBox *widget, gpointer data) { - gchar *entry_text; - gtk_widget_hide(cct_diagram); - - /// Get the text box contents. - entry_text = gtk_combo_box_get_active_text(widget); - if(strncmp(entry_text, "L", 1) == 0) filter.fclass = Lowpass; - else if(strncmp(entry_text, "H", 1) == 0) filter.fclass = Highpass; - else if(strncmp(entry_text, "B", 1) == 0) { - filter.fclass = Bandpass; - gtk_widget_show(GTK_WIDGET(LabelB)); - gtk_widget_show(GTK_WIDGET(Bandwidth)); - } else { - gtk_widget_hide(GTK_WIDGET(LabelB)); - gtk_widget_hide(GTK_WIDGET(Bandwidth)); - } -// Check_band( ); - printf("Class: <%s>\n", entry_text); + gtk_widget_hide(cct_diagram); } @@ -717,24 +943,7 @@ void Type_event(GtkComboBox *widget, gpointer data) */ void Type2_event(GtkComboBox *widget, gpointer data) { - gchar *entry_text; - gtk_widget_hide(image); - // Get the text box contents. - entry_text = gtk_combo_box_get_active_text(widget); - if(strncmp(entry_text, "Be", 2) == 0) filter.sclass = Bessel; - else if(strncmp(entry_text, "Bu", 2) == 0) filter.sclass = Butterworth; - else if(strncmp(entry_text, "C", 1) == 0) { - filter.sclass = Chebyshev; - gtk_widget_show(GTK_WIDGET(LabelR)); - gtk_widget_show(GTK_WIDGET(Ripple)); - } else { - gtk_widget_hide(GTK_WIDGET(LabelR)); - gtk_widget_hide(GTK_WIDGET(Ripple)); - } - -// Check_band( ); - printf("Type: <%s>\n", entry_text); } @@ -745,24 +954,6 @@ void Type2_event(GtkComboBox *widget, gpointer data) */ void Circuit_event(GtkComboBox *widget, gpointer data) { - gchar *entry_text; - gtk_widget_hide(cct_diagram); - - // Get the text box contents. - entry_text = gtk_combo_box_get_active_text(widget); - if(strncmp(entry_text, "S", 1) == 0) filter.cclass = SallKey; - else if(strncmp(entry_text, "R", 1) == 0) filter.cclass = Rauch; - else if(strncmp(entry_text, "D", 1) == 0) { - filter.cclass = ZDomain; - gtk_widget_show(GTK_WIDGET(LabelS)); - gtk_widget_show(GTK_WIDGET(SamplingFreq)); - } else { - gtk_widget_hide(GTK_WIDGET(LabelS)); - gtk_widget_hide(GTK_WIDGET(SamplingFreq)); - } -// if(strncmp(entry_text, "B", 1) == 0) filter.cclass = ????; -// Check_band( ); - printf("Type: <%s>\n", entry_text); } @@ -772,23 +963,9 @@ void Circuit_event(GtkComboBox *widget, gpointer data) */ void Freq_callback(GtkWidget *widget, GtkWidget *textbox) { - int n; - gchar *entry_text; - gtk_widget_hide(cct_diagram); - - double T1; -// Get the text box contents. - entry_text = (gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(textbox)->entry)); - if(strlen(entry_text)) n = sscanf(entry_text, "%lf", &filter.frequency); -// Check_band( ); - printf("Entry contents 1: <%s>\n", entry_text); - -// Clear box by writing empty string? May cause a problem when you type text! -/* if((n == 0) || (filter.frequency <= 0.0)) { - gtk_entry_set_text (GTK_ENTRY(widget), "1.0"); - filter.frequency = 1.0; - } -*/ +#if VERBOSE + puts("Freq_callback\n"); +#endif } @@ -798,28 +975,6 @@ void Freq_callback(GtkWidget *widget, GtkWidget *textbox) */ void Atten_callback(GtkWidget *widget, GtkWidget *textbox) { - int n; - double a; - gchar *entry_text; - gtk_widget_hide(cct_diagram); - - double T1; -// Get the text box contents. - entry_text = (gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(textbox)->entry)); - if(strlen(entry_text)) n = sscanf(entry_text, "%lf", &a); - -// Clear box by writing empty string? May cause a problem when you type text! -// if((n == 0) || (a > 0.0)) { gtk_entry_set_text (GTK_ENTRY(widget), "-3.0"); a = -3.0; } - -/** dB = 20 * log10(ratio) -e.g. if ratio = 0.707, dB = 3.01 -Thus, if we have the value in dB: -ratio = pow10(dB / 20) -*/ - filter.a0 = pow10(-abs(a) / 20.0); - -// Check_band( ); - printf("Entry contents 1a: <%s>\n", entry_text); } @@ -829,22 +984,6 @@ ratio = pow10(dB / 20) */ void SFreq_callback(GtkWidget *widget, GtkWidget *textbox) { - int n; - gchar *entry_text; - gtk_widget_hide(cct_diagram); - - double T1; - // Get the text box contents. - entry_text = (gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(textbox)->entry)); - if(strlen(entry_text)) n = sscanf(entry_text, "%lf", &filter.frequency); -/* Check_band( ); */ - printf("Entry contents 1a: <%s>\n", entry_text); - // Clear box by writing empty string? May cause a problem when you type text! -/* if(n == 0) { - gtk_entry_set_text (GTK_ENTRY(widget), "1.0"); - filter.frequency = 1.0; - } -*/ } @@ -854,17 +993,6 @@ void SFreq_callback(GtkWidget *widget, GtkWidget *textbox) */ void q_callback(GtkWidget *widget, GtkWidget *textbox) { - int n; - gchar *entry_text; - gtk_widget_hide(cct_diagram); - - // Get the text box contents. - entry_text = (gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(textbox)->entry)); -// if(strlen(entry_text)) n = sscanf(entry_text, "%lf", &filter.q); -// Check_band( ); - printf("Entry contents 2: <%s>\n", entry_text); - // Clear box by writing empty string? May cause a problem when you type text! -// if(n == 0) gtk_entry_set_text (GTK_ENTRY(widget), "?"); } @@ -874,17 +1002,6 @@ void q_callback(GtkWidget *widget, GtkWidget *textbox) */ void order_callback(GtkWidget *widget, GtkWidget *textbox) { - int n; - gchar *entry_text; - gtk_widget_hide(cct_diagram); - - // Get the text box contents. - entry_text = (gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(textbox)->entry)); - if(strlen(entry_text)) n = sscanf(entry_text, "%d", &filter.poles); -// Check_band( ); - printf("Entry contents 3: <%s>\n", entry_text); - // Clear box by writing empty string? May cause a problem when you type text! -// if(n == 0) gtk_entry_set_text (GTK_ENTRY(widget), "?"); } @@ -894,17 +1011,6 @@ void order_callback(GtkWidget *widget, GtkWidget *textbox) */ void ripple_callback(GtkWidget *widget, GtkWidget *textbox) { - int n; - gchar *entry_text; - gtk_widget_hide(cct_diagram); - - // Get the text box contents. - entry_text = (gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(textbox)->entry)); - if(strlen(entry_text)) n = sscanf(entry_text, "%lf", &filter.ripple); -// Check_band( ); - printf("Entry contents 4: <%s>\n", entry_text); - // Clear box by writing empty string? May cause a problem when you type text! -// if(n == 0) gtk_entry_set_text(GTK_ENTRY(widget), "?"); } @@ -914,17 +1020,6 @@ void ripple_callback(GtkWidget *widget, GtkWidget *textbox) */ void bandwidth_callback(GtkWidget *widget, GtkWidget *textbox) { - int n; - gchar *entry_text; - gtk_widget_hide(cct_diagram); - - // Get the text box contents. - entry_text = (gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(textbox)->entry)); - if(strlen(entry_text)) n = sscanf(entry_text, "%lf", &filter.bandwidth); -// Check_band( ); - printf("Entry contents 5: <%s>\n", entry_text); - // Clear box by writing empty string? May cause a problem when you type text! -// if(n == 0) gtk_entry_set_text (GTK_ENTRY(widget), "?"); } @@ -935,27 +1030,7 @@ numbers of redrawings as the slider is moved. */ gboolean time_event(GtkWidget *widget) { - static int last_value = -1; - - if (widget->window == NULL) return FALSE; - - GDateTime *now = g_date_time_new_now_local(); - gchar *my_time = g_date_time_format(now, "%H:%M:%S"); - - slider_position = gtk_adjustment_get_value(GTK_ADJUSTMENT(scale_adj1)); - if(slider_position != last_value) { - sprintf(str, "Scale position = %d\n", slider_position); - last_value = slider_position; -#if VERBOSE - g_print(str); -#endif - gtk_widget_queue_draw (widget); - } - - g_free(my_time); - g_date_time_unref(now); - - return TRUE; + return TRUE; } @@ -963,276 +1038,272 @@ gboolean time_event(GtkWidget *widget) int main(int argc, char *argv[ ]) { - std::cout << "'rbfilter' version " << VERSION << "\n"; - std::cout << "Copyright (c) Roger Burghall 2013..2016\n"; + puts("'rbfilter' version "); + puts(VERSION); + puts("Copyright (c) Roger Burghall 2013..2022\n"); - ofstream logfile; - logfile.open("./rbfilter.log", ios::trunc); - logfile << "rbfilter log file.\n******************\n"; - logfile.close( ); + ofstream logfile; + logfile.open("./rbfilter.log", ios::trunc); + logfile << "rbfilter log file.\n******************\n"; + logfile.close( ); - GtkWidget *hbox, *vbox_draw, *vbox_main; - GList *glist, *glist1; + GtkWidget *hbox, *vbox_draw, *vbox_main; + GList *glist, *glist1; + GtkWidget *vbox_cct; + GtkWidget *da; - GtkWidget *vbox_cct; + gtk_init(&argc, &argv); -//* Initialise Gnome; similar to gtk_init(). */ - gnome_init("Filter-designer", "3.01", argc, argv); -/// First window, for controls. - app = gnome_app_new("drawing-example", "Control"); - assert(app != NULL); -/// Draw a second window for graphs etc. - Window1 = gtk_window_new(GTK_WINDOW_TOPLEVEL); - assert(Window1 != NULL); - /// Centre the graphics window. - gtk_window_set_position ((GtkWindow *)Window1, GTK_WIN_POS_CENTER); - gtk_widget_set_size_request(GTK_WIDGET(Window1), 600, 650); - gtk_window_set_title ((GtkWindow *)Window1, (gchar *)"Graphics"); +/// Create a window for the controls. + window1 = gtk_window_new(GTK_WINDOW_TOPLEVEL); + assert(window1 != NULL); + gtk_window_set_default_size(GTK_WINDOW(window1), WIDTH, HEIGHT); + gtk_window_set_title(GTK_WINDOW(window1), "rbfilter controls"); + g_signal_connect(G_OBJECT(window1), "destroy", gtk_main_quit, NULL); + + cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 480, 480); + cairo_t *cr = cairo_create(surface); - vbox_draw = gtk_vbox_new(FALSE, 5); - - scale_adj1 = gtk_adjustment_new (FSTEPS/2.0, 0.0, (double)FSTEPS, 10.0, 10.0, 10.0); - scale1 = gtk_hscale_new (GTK_ADJUSTMENT(scale_adj1)); - gtk_scale_set_draw_value ((GtkScale*)scale1, FALSE); - -/// Put a vbox in the window and the slider in the vbox. - gtk_container_add(GTK_CONTAINER(Window1), vbox_draw); - gtk_box_pack_start(GTK_BOX(vbox_draw), scale1, FALSE, FALSE, 0); - - gtk_window_set_default_size (GTK_WINDOW(Window1), 400, 300); +/// Create another window for graphs etc. + window2 = gtk_window_new(GTK_WINDOW_TOPLEVEL); + assert(window2 != NULL); + g_signal_connect(G_OBJECT(window2), "destroy", gtk_main_quit, NULL); + gtk_window_set_position ((GtkWindow *)window2, GTK_WIN_POS_CENTER); + + gtk_widget_set_size_request(GTK_WIDGET(window2), 600, 650); + gtk_window_set_title ((GtkWindow *)window2, (gchar *)"rbfilter graphics"); + + vbox_draw = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1); /// Create a drawing area which must receive extra space when window is enlarged. - Area1 = gtk_drawing_area_new( ); - gtk_widget_set_size_request(GTK_WIDGET(Area1), XSIZE, YSIZE); - gtk_box_pack_start(GTK_BOX(vbox_draw), Area1, TRUE, TRUE, 0); - - gtk_widget_show(vbox_draw); - gtk_widget_show(Area1); - gtk_widget_hide(scale1); + Area1 = gtk_drawing_area_new ( ); + +/// Create a scale + scale_adj1 = gtk_adjustment_new (FSTEPS/2.0, 0.0, (double)FSTEPS, 10.0, 10.0, 10.0); + scale1 = gtk_scale_new(GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT(scale_adj1)); + gtk_scale_set_draw_value ((GtkScale*)scale1, FALSE); +/// Put a vbox in the window and the scale in the vbox. + gtk_container_add(GTK_CONTAINER(window2), vbox_draw); + gtk_box_pack_start(GTK_BOX(vbox_draw), scale1, FALSE, FALSE, 0); + g_signal_connect(G_OBJECT(scale1), "value_changed", G_CALLBACK(slider_changed), NULL); + gtk_container_add(GTK_CONTAINER(vbox_draw), Area1); + gtk_widget_set_size_request(GTK_WIDGET(Area1), XSIZE, YSIZE); + g_signal_connect(G_OBJECT(Area1), "draw", G_CALLBACK(on_draw), NULL); + gtk_widget_set_size_request(Area1, 750, 750); + gtk_widget_show_all(window2); + /// Draw a third window, for showing the circuit diagrams - cct_diagram = gtk_window_new(GTK_WINDOW_TOPLEVEL); - assert(cct_diagram != NULL); - gtk_window_set_position ((GtkWindow *)cct_diagram, GTK_WIN_POS_NONE); - gtk_widget_set_size_request(GTK_WIDGET(cct_diagram), 650, 365); - gtk_window_set_title ((GtkWindow *)cct_diagram, (gchar *)"Realisation"); - GtkWidget *cct_box = gtk_hbox_new(false, 0); - image = gtk_image_new( ); - gtk_container_add(GTK_CONTAINER(cct_diagram), cct_box); - gtk_box_pack_start(GTK_BOX(cct_box), image, false, false, 3); -/// Remove close icon from the realisation window. - gtk_window_set_deletable((GtkWindow *)cct_diagram, false); - gtk_widget_show(image); - gtk_widget_show(cct_box); - gtk_widget_hide(cct_diagram); + cct_diagram = gtk_window_new(GTK_WINDOW_TOPLEVEL); + assert(cct_diagram != NULL); - Draw_mode = Splane; +/// Set the size, position and title of the circuit diagram window. + gtk_window_set_position ((GtkWindow *)cct_diagram, GTK_WIN_POS_NONE); + gtk_widget_set_size_request(GTK_WIDGET(cct_diagram), 600, 650); + gtk_window_set_title ((GtkWindow *)cct_diagram, (gchar *)"Realisation"); + + GtkWidget *cct_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); + image = gtk_image_new( ); + gtk_container_add(GTK_CONTAINER(cct_diagram), cct_box); + gtk_container_add(GTK_CONTAINER(cct_box), image); + + +/// Remove close icon from the realisation window. + gtk_window_set_deletable((GtkWindow *)cct_diagram, false); + +/// Position the control window to the left of the screen. GTK2 could tell us the dimensions of \ +the screen; it seems GTK3 can't which is completely *!~#. +/// Position the control window to the left of the screen. + gtk_window_move((GtkWindow *)window1, 100, 100); /// Create a 'vbox' and place it in the application. - vbox_main = gtk_vbox_new(FALSE, 5); - gnome_app_set_contents(GNOME_APP(app), vbox_main); - gtk_widget_show(vbox_main); - -/// Position the control window to the left of the screen. - /// Check size of screen. - gint scr_w = gdk_screen_width( ); - gint scr_h = gdk_screen_height( ); - /// Place the window. - gtk_window_move ((GtkWindow *)app, scr_w/10, scr_h/5); - -/// Create an 'hbox' and put it in the 'vbox' - hbox = gtk_hbox_new(FALSE, 5); - gtk_container_add (GTK_CONTAINER (vbox_main), hbox); - gtk_widget_show(hbox); - -/// Create button 'vbox'es and place them in the 'hbox'. - vbox1 = gtk_vbox_new(FALSE, 5); - vbox2 = gtk_vbox_new(FALSE, 5); - gtk_box_pack_start (GTK_BOX (hbox), vbox1, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0); - gtk_widget_show(vbox1); - gtk_widget_show(vbox2); - + vbox_main = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1); + gtk_container_add(GTK_CONTAINER(window1), vbox_main); + + /// Create an 'hbox' and put it in the 'vbox' + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1); + gtk_container_add (GTK_CONTAINER(vbox_main), hbox); + + /// Create button 'vbox'es and place them in the 'hbox'. + vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1); + vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1); + gtk_box_pack_start (GTK_BOX (hbox), vbox1, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0); + /// Put data entry boxes in 'vbox1':- /// Combobox permitting only preset entries for filter class - GtkWidget *Label = gtk_label_new ("Class"); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Label), TRUE, FALSE, 0); - gtk_widget_show(GTK_WIDGET(Label)); - Type = /* GTK_COMBO_BOX */ (gtk_combo_box_new_text( )); - gtk_combo_box_append_text(GTK_COMBO_BOX(Type), "Low-pass"); - gtk_combo_box_append_text(GTK_COMBO_BOX(Type), "High-pass"); - gtk_combo_box_append_text(GTK_COMBO_BOX(Type), "Band-pass"); - gtk_combo_box_set_active(GTK_COMBO_BOX(Type), 0); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Type), TRUE, TRUE, 5); - g_signal_connect(GTK_OBJECT(Type), "changed", GTK_SIGNAL_FUNC(Type_event), Type); - gtk_widget_show(GTK_WIDGET(Type)); + GtkWidget *Label = gtk_label_new ("Class"); + gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Label), FALSE, FALSE, 1); + Type = gtk_combo_box_text_new(); + gtk_combo_box_text_insert_text((GtkComboBoxText *)Type, -1, (gchar *)"Low-pass"); + gtk_combo_box_text_insert_text((GtkComboBoxText *)Type, -1, (gchar *)"High-pass"); + gtk_combo_box_text_insert_text((GtkComboBoxText *)Type, -1, (gchar *)"Band-pass"); + gtk_container_add(GTK_CONTAINER(vbox1), Type); + gtk_combo_box_set_active(GTK_COMBO_BOX(Type), 0); + g_signal_connect((GtkComboBoxText *)(Type), "changed", G_CALLBACK(combo_changed), NULL); + + Label = gtk_label_new ("Response"); + gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Label), FALSE, FALSE, 1); + + Type2 = gtk_combo_box_text_new(); + gtk_combo_box_text_insert_text((GtkComboBoxText *)Type2, -1, (gchar *)"Bessel"); + gtk_combo_box_text_insert_text((GtkComboBoxText *)Type2, -1, (gchar *)"Butterworth"); + gtk_combo_box_text_insert_text((GtkComboBoxText *)Type2, -1, (gchar *)"Chebyshev"); + gtk_container_add(GTK_CONTAINER(vbox1), Type2); + gtk_combo_box_set_active(GTK_COMBO_BOX(Type2), 0); + g_signal_connect((GtkComboBoxText *)(Type2), "changed", G_CALLBACK(combo_changed), NULL); - Type2 = /* GTK_COMBO_BOX */ (gtk_combo_box_new_text( )); - gtk_combo_box_append_text(GTK_COMBO_BOX(Type2), "Bessel"); - gtk_combo_box_append_text(GTK_COMBO_BOX(Type2), "Butterworth"); - gtk_combo_box_append_text(GTK_COMBO_BOX(Type2), "Chebyshev"); - gtk_combo_box_set_active(GTK_COMBO_BOX(Type2), 0); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Type2), TRUE, TRUE, 5); - g_signal_connect(GTK_OBJECT(Type2), "changed", GTK_SIGNAL_FUNC(Type2_event), Type2); - gtk_widget_show(GTK_WIDGET(Type2)); /// Combobox permitting only preset entries for filter class - Label = gtk_label_new ("Circuit"); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Label), TRUE, FALSE, 0); - gtk_widget_show(GTK_WIDGET(Label)); - Circuit = /* GTK_COMBO_BOX */ (gtk_combo_box_new_text( )); - gtk_combo_box_append_text(GTK_COMBO_BOX(Circuit), "Sallen and Key"); - gtk_combo_box_append_text(GTK_COMBO_BOX(Circuit), "Rauch"); - gtk_combo_box_append_text(GTK_COMBO_BOX(Circuit), "Discrete"); - gtk_combo_box_set_active(GTK_COMBO_BOX(Circuit), 0); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Circuit), TRUE, TRUE, 5); - g_signal_connect(GTK_OBJECT(Circuit), "changed", GTK_SIGNAL_FUNC(Circuit_event), Circuit); - gtk_widget_show(GTK_WIDGET(Circuit)); + Label = gtk_label_new ("Circuit"); + gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Label), FALSE, FALSE, 1); -/// Combobox permitting non-standard entries for cut-off frequency - Label = gtk_label_new ("Freq"); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Label), TRUE, FALSE, 0); - gtk_widget_show(GTK_WIDGET(Label)); - Freq = gtk_combo_new( ); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Freq), TRUE, FALSE, 0); - glist = NULL; - glist = g_list_append(glist, (gpointer)"1.0"); - glist = g_list_append(glist, (gpointer)"10.0"); - glist = g_list_append(glist, (gpointer)"100.0"); - gtk_combo_set_popdown_strings(GTK_COMBO(Freq), glist); - g_signal_connect(GTK_COMBO(Freq)->entry, "changed", G_CALLBACK(Freq_callback), Freq); - gtk_widget_show(GTK_WIDGET(Freq)); + Circuit = gtk_combo_box_text_new(); + gtk_combo_box_text_insert_text((GtkComboBoxText *)Circuit, -1, (gchar *)"Sallen and Key"); + gtk_combo_box_text_insert_text((GtkComboBoxText *)Circuit, -1, (gchar *)"Rauch"); + gtk_combo_box_text_insert_text((GtkComboBoxText *)Circuit, -1, (gchar *)"Discrete"); + gtk_container_add(GTK_CONTAINER(vbox1), Circuit); + gtk_combo_box_set_active(GTK_COMBO_BOX(Circuit), 0); + g_signal_connect((GtkComboBoxText *)(Circuit), "changed", G_CALLBACK(combo_changed), NULL); -/// Combobox permitting non-standard entries for cut-off attenuation - Label = gtk_label_new ("Atten (dB)"); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Label), TRUE, FALSE, 0); - gtk_widget_show(GTK_WIDGET(Label)); - Atten = gtk_combo_new( ); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Atten), TRUE, FALSE, 0); - glist = NULL; - glist = g_list_append(glist, (gpointer)"-3.0"); - glist = g_list_append(glist, (gpointer)"-6.0"); - glist = g_list_append(glist, (gpointer)"-9.0"); - gtk_combo_set_popdown_strings(GTK_COMBO(Atten), glist); - g_signal_connect(GTK_COMBO(Atten)->entry, "changed", G_CALLBACK(Atten_callback), Atten); - gtk_widget_show(GTK_WIDGET(Atten)); -/// Combobox permitting non-standard entries for sampling frequency - LabelS = gtk_label_new ("Sampling Freq"); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(LabelS), TRUE, FALSE, 0); -// gtk_widget_show(GTK_WIDGET(Label)); - SamplingFreq = gtk_combo_new( ); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(SamplingFreq), TRUE, FALSE, 0); - glist = NULL; - glist = g_list_append(glist, (gpointer)"100.0"); - glist = g_list_append(glist, (gpointer)"1000.0"); - glist = g_list_append(glist, (gpointer)"100000.0"); - gtk_combo_set_popdown_strings(GTK_COMBO(SamplingFreq), glist); - g_signal_connect(GTK_COMBO(Freq)->entry, "changed", G_CALLBACK(SFreq_callback), SamplingFreq); -// gtk_widget_show(GTK_WIDGET(SamplingFreq)); + /// Combobox permitting non-standard entries for cut-off frequency + Label = gtk_label_new ("Freq"); + gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Label), TRUE, FALSE, 0); + + Freq = gtk_entry_new( ); + gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Freq), TRUE, FALSE, 0); + gtk_entry_set_text((GtkEntry *)Freq, "1.0"); -/// Combobox permitting non-standard entries for filter order - Label = gtk_label_new ("Prototype order"); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Label), TRUE, FALSE, 0); - gtk_widget_show(GTK_WIDGET(Label)); - Order = gtk_combo_new( ); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Order), TRUE, FALSE, 0); - glist = NULL; - glist = g_list_append(glist, (gpointer)"3"); - glist = g_list_append(glist, (gpointer)"4"); - glist = g_list_append(glist, (gpointer)"5"); - gtk_combo_set_popdown_strings(GTK_COMBO(Order), glist); - g_signal_connect(GTK_COMBO(Order)->entry, "changed", G_CALLBACK(order_callback), Order); - gtk_widget_show(GTK_WIDGET(Order)); + g_signal_connect(Freq, "changed", G_CALLBACK(Freq_callback), Freq); + + // Version 2.11: remove Atten input box. + // Combobox permitting non-standard entries for cut-off attenuation + Label = gtk_label_new("Atten (dB)"); +// gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Label), TRUE, FALSE, 0); +// gtk_widget_show(GTK_WIDGET(Label)); + Atten = gtk_entry_new( ); +// gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Atten), TRUE, FALSE, 0); + gtk_entry_set_text((GtkEntry *)Atten, "1.0"); + g_signal_connect(Atten, "changed", G_CALLBACK(Atten_callback), Atten); -/// Combobox permitting non-standard entries for filter ripple (Chebyshev only) - LabelR = gtk_label_new ("ripple"); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(LabelR), TRUE, FALSE, 0); - Ripple = gtk_combo_new( ); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Ripple), TRUE, FALSE, 0); - glist1 = NULL; - glist1 = g_list_append(glist1, (gpointer)"0.5"); - glist1 = g_list_append(glist1, (gpointer)"1.0"); - glist1 = g_list_append(glist1, (gpointer)"2.0"); - gtk_combo_set_popdown_strings(GTK_COMBO(Ripple), glist1); - g_signal_connect(GTK_COMBO(Ripple)->entry, "changed", G_CALLBACK(ripple_callback), Ripple); -/// Combobox permitting non-standard entries for filter bandwidth (Bandpass only) - LabelB = gtk_label_new ("bandwidth"); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(LabelB), TRUE, FALSE, 0); - Bandwidth = gtk_combo_new( ); - gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Bandwidth), TRUE, FALSE, 0); - glist1 = NULL; - glist1 = g_list_append(glist1, (gpointer)"0.25"); - glist1 = g_list_append(glist1, (gpointer)"0.125"); - glist1 = g_list_append(glist1, (gpointer)"0.0625"); - gtk_combo_set_popdown_strings(GTK_COMBO(Bandwidth), glist1); - g_signal_connect(GTK_COMBO(Bandwidth)->entry, "changed", G_CALLBACK(bandwidth_callback), Bandwidth); + /// Entry box permitting non-standard entries for sampling frequency + LabelS = gtk_label_new ("Sampling Freq"); + gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(LabelS), TRUE, FALSE, 0); + SamplingFreq = gtk_entry_new( ); + gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(SamplingFreq), TRUE, FALSE, 0); + gtk_entry_set_text((GtkEntry *)SamplingFreq, "100"); + g_signal_connect(SamplingFreq, "changed", G_CALLBACK(SFreq_callback), SamplingFreq); + + /// Combobox permitting non-standard entries for filter order + Label = gtk_label_new ("Prototype order"); + gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Label), TRUE, FALSE, 0); + Order = gtk_entry_new( ); + gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Order), TRUE, FALSE, 0); + gtk_entry_set_text((GtkEntry *)Order, "3"); + g_signal_connect(Order, "changed", G_CALLBACK(order_callback), Order); + + /// Combobox permitting non-standard entries for filter ripple (Chebyshev only) + LabelR = gtk_label_new ("Ripple (dB)"); + gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(LabelR), TRUE, FALSE, 0); + Ripple = gtk_entry_new( ); + gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Ripple), TRUE, FALSE, 0); + gtk_entry_set_text((GtkEntry *)Ripple, "0.99"); + g_signal_connect(Ripple, "changed", G_CALLBACK(ripple_callback), Ripple); + + /// Combobox permitting non-standard entries for filter bandwidth (Bandpass only) + LabelB = gtk_label_new ("Bandwidth"); + gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(LabelB), TRUE, FALSE, 0); + Bandwidth = gtk_entry_new( ); + gtk_box_pack_start(GTK_BOX(vbox1), GTK_WIDGET(Bandwidth), TRUE, FALSE, 0); + gtk_entry_set_text((GtkEntry *)Bandwidth, "1.0"); + g_signal_connect(Bandwidth, "changed", G_CALLBACK(bandwidth_callback), Bandwidth); /// Create "S-p", "T-d" and "F-d" buttons and place them in 'vbox2'. - sp_button = gtk_button_new_with_label ("s-plane"); - t_button = gtk_button_new_with_label ("Time"); - f_button = gtk_button_new_with_label ("Freq"); - s_button = gtk_button_new_with_label ("Synth"); -// z_button = gtk_button_new_with_label ("Bilinear"); - gtk_box_pack_start (GTK_BOX (vbox2), sp_button, TRUE, FALSE, 20); - gtk_box_pack_start (GTK_BOX (vbox2), t_button, TRUE, FALSE, 20); - gtk_box_pack_start (GTK_BOX (vbox2), f_button, TRUE, FALSE, 20); - gtk_box_pack_start (GTK_BOX (vbox2), s_button, TRUE, FALSE, 20); -// gtk_box_pack_start (GTK_BOX (vbox2), z_button, TRUE, FALSE, 20); - gtk_widget_show(sp_button); - gtk_widget_show(t_button); - gtk_widget_show(f_button); - gtk_widget_show(s_button); -// gtk_widget_show(z_button); + sp_button = gtk_button_new_with_label("s-plane"); + t_button = gtk_button_new_with_label("Time"); + f_button = gtk_button_new_with_label("Freq"); + s_button = gtk_button_new_with_label("Synth"); + gtk_box_pack_start (GTK_BOX (vbox2), sp_button, TRUE, FALSE, 20); + gtk_box_pack_start (GTK_BOX (vbox2), t_button, TRUE, FALSE, 20); + gtk_box_pack_start (GTK_BOX (vbox2), f_button, TRUE, FALSE, 20); + gtk_box_pack_start (GTK_BOX (vbox2), s_button, TRUE, FALSE, 20); + /// Connect button signals + gchar *Event2 = (gchar *)"clicked"; + gchar *Ctrl1 = (gchar *)"S-p\n"; + gchar *Ctrl2 = (gchar *)"T-d\n"; + gchar *Ctrl3 = (gchar *)"F-d\n"; + gchar *Ctrl4 = (gchar *)"Syn\n"; + gchar *Ctrl5 = (gchar *)"Z-t\n"; + g_signal_connect(sp_button, Event2, G_CALLBACK (callback::clicked), Ctrl1); + g_signal_connect(t_button, Event2, G_CALLBACK (callback::clicked), Ctrl2); + g_signal_connect(f_button, Event2, G_CALLBACK (callback::clicked), Ctrl3); + g_signal_connect(s_button, Event2, G_CALLBACK (callback::clicked), Ctrl4); -/// Connect button signals - gchar *Event2 = (gchar *)"clicked"; - gchar *Ctrl1 = (gchar *)"S-p\n"; - gchar *Ctrl2 = (gchar *)"T-d\n"; - gchar *Ctrl3 = (gchar *)"F-d\n"; - gchar *Ctrl4 = (gchar *)"Syn\n"; - gchar *Ctrl5 = (gchar *)"Z-t\n"; - gtk_signal_connect(GTK_OBJECT (sp_button), Event2, GTK_SIGNAL_FUNC (callback::clicked), Ctrl1); - gtk_signal_connect(GTK_OBJECT (t_button), Event2, GTK_SIGNAL_FUNC (callback::clicked), Ctrl2); - gtk_signal_connect(GTK_OBJECT (f_button), Event2, GTK_SIGNAL_FUNC (callback::clicked), Ctrl3); - gtk_signal_connect(GTK_OBJECT (s_button), Event2, GTK_SIGNAL_FUNC (callback::clicked), Ctrl4); -// gtk_signal_connect(GTK_OBJECT (z_button), Event2, GTK_SIGNAL_FUNC (callback::clicked), Ctrl5); -//* Bind "destroy" event to gtk_main_quit. */ - gchar *Event1 = "destroy"; - gtk_signal_connect(GTK_OBJECT (app), Event1, - GTK_SIGNAL_FUNC (callback::quit), NULL); - gtk_signal_connect(GTK_OBJECT (Window1), Event1, - GTK_SIGNAL_FUNC (pseudo_quit), NULL); + Draw_mode = Splane; - gtk_signal_connect(GTK_OBJECT(Area1), "expose_event", GTK_SIGNAL_FUNC(expose_event), NULL); - gtk_signal_connect (GTK_OBJECT(Area1),"configure_event", - (GtkSignalFunc) configure_event, NULL); - gtk_signal_connect (GTK_OBJECT (Area1), "motion_notify_event", - (GtkSignalFunc) motion_notify_event, NULL); - gtk_signal_connect (GTK_OBJECT (Area1), "button_press_event", - GTK_SIGNAL_FUNC(button_press_event), NULL); + gtk_widget_show_all(window1); + gtk_widget_hide(LabelB); + gtk_widget_hide(Bandwidth); + gtk_widget_hide(LabelR); + gtk_widget_hide(Ripple); + gtk_widget_hide(LabelS); + gtk_widget_hide(SamplingFreq); - g_timeout_add(500, (GSourceFunc) time_event, (gpointer) Window1); - time_event(Window1); + gtk_widget_show_all(window2); + gtk_widget_hide(window2); + + gtk_widget_show_all(cct_diagram); + gtk_widget_hide(cct_diagram); + + gtk_main( ); - gtk_widget_set_events (Window1, GDK_EXPOSURE_MASK - | GDK_LEAVE_NOTIFY_MASK - | GDK_BUTTON_PRESS_MASK - | GDK_POINTER_MOTION_MASK - | GDK_POINTER_MOTION_HINT_MASK); - gtk_drawing_area_size((GtkDrawingArea*)Area1, XSIZE, YSIZE); - - gtk_widget_show(app); - gtk_widget_show(Area1); - gtk_widget_show(Area1); - gtk_widget_show(Window1); - - gtk_main( ); - - return 0; + return 0; } +#if 0 + +//* Bind "destroy" event to gtk_main_quit. */ +gchar *Event1 = "destroy"; +gtk_signal_connect(GTK_OBJECT (app), Event1, +GTK_SIGNAL_FUNC (callback::quit), NULL); +gtk_signal_connect(GTK_OBJECT (Window1), Event1, +GTK_SIGNAL_FUNC (pseudo_quit), NULL); + +gtk_signal_connect(GTK_OBJECT(Area1), "expose_event", GTK_SIGNAL_FUNC(expose_event), NULL); +gtk_signal_connect (GTK_OBJECT(Area1),"configure_event", +(GtkSignalFunc) configure_event, NULL); +gtk_signal_connect (GTK_OBJECT (Area1), "motion_notify_event", +(GtkSignalFunc) motion_notify_event, NULL); +gtk_signal_connect (GTK_OBJECT (Area1), "button_press_event", +GTK_SIGNAL_FUNC(button_press_event), NULL); + +g_timeout_add(500, (GSourceFunc) time_event, (gpointer) Window1); +time_event(Window1); + +gtk_widget_set_events (Window1, GDK_EXPOSURE_MASK +| GDK_LEAVE_NOTIFY_MASK +| GDK_BUTTON_PRESS_MASK +| GDK_POINTER_MOTION_MASK +| GDK_POINTER_MOTION_HINT_MASK); +gtk_drawing_area_size((GtkDrawingArea*)Area1, XSIZE, YSIZE); + +gtk_widget_show(app); +gtk_widget_show(Area1); +gtk_widget_show(Area1); +gtk_widget_show(Window1); + +gtk_main( ); + + + +return 0; +} +#endif + + +