--- gnuradio-3.2.2.dfsg.orig/aclocal.m4 +++ gnuradio-3.2.2.dfsg/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.2 -*- Autoconf -*- +# generated automatically by aclocal 1.10.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -34,7 +34,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.2], [], +m4_if([$1], [1.10.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,7 +50,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.2])dnl +[AM_AUTOMAKE_VERSION([1.10.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -165,14 +165,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 10 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -229,6 +229,16 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [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 @@ -246,7 +256,17 @@ 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 @@ -256,19 +276,23 @@ break fi ;; + 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 - # 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. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $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 sub/conftest.${OBJEXT-o} 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 @@ -418,7 +442,7 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -492,8 +516,8 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -839,12 +863,19 @@ [am_cv_python_pythondir], [if test "x$prefix" = xNONE then - py_prefix_arg= + am_py_prefix=$ac_default_prefix else - py_prefix_arg=",prefix='$prefix'" + am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`]) + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + esac + ]) AC_SUBST([pythondir], [$am_cv_python_pythondir]) dnl pkgpythondir -- $PACKAGE directory under pythondir. Was @@ -862,12 +893,19 @@ [am_cv_python_pyexecdir], [if test "x$exec_prefix" = xNONE then - py_exec_prefix_arg=$py_prefix_arg + am_py_exec_prefix=$am_py_prefix else - py_exec_prefix_arg=",prefix='$exec_prefix'" + am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null || - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`]) + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + esac + ]) AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) --- gnuradio-3.2.2.dfsg.orig/config.h.in +++ gnuradio-3.2.2.dfsg/config.h.in @@ -244,13 +244,13 @@ /* Define to 1 if you have the `strspn' function. */ #undef HAVE_STRSPN -/* Define to 1 if `cmcred_uid' is member of `struct cmsgcred'. */ +/* Define to 1 if `cmcred_uid' is a member of `struct cmsgcred'. */ #undef HAVE_STRUCT_CMSGCRED_CMCRED_UID -/* Define to 1 if `msg_accrights' is member of `struct msghdr'. */ +/* Define to 1 if `msg_accrights' is a member of `struct msghdr'. */ #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS -/* Define to 1 if `msg_control' is member of `struct msghdr'. */ +/* Define to 1 if `msg_control' is a member of `struct msghdr'. */ #undef HAVE_STRUCT_MSGHDR_MSG_CONTROL /* Define to 1 if the system has the type `struct timespec'. */ @@ -259,7 +259,7 @@ /* Define to 1 if the system has the type `struct timezone'. */ #undef HAVE_STRUCT_TIMEZONE -/* Define to 1 if `uid' is member of `struct ucred'. */ +/* Define to 1 if `uid' is a member of `struct ucred'. */ #undef HAVE_STRUCT_UCRED_UID /* Define to 1 if you have the `sysconf' function. */ @@ -362,6 +362,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION --- gnuradio-3.2.2.dfsg.orig/configure +++ gnuradio-3.2.2.dfsg/configure @@ -1,18 +1,22 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63. +# Generated by GNU Autoconf 2.67. +# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -20,23 +24,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -44,7 +40,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -55,7 +57,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -78,13 +80,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -94,15 +89,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -114,12 +109,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -131,330 +130,299 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || 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" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $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 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 - - fi - fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append -exitcode=0 -if as_func_success; then - : +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' else - exitcode=1 - echo as_func_success failed. -fi + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi -if as_func_ret_success; then - : +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_ret_success failed. + as_expr=false fi -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO 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'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -471,8 +439,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -482,29 +449,18 @@ exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -534,7 +490,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -553,10 +509,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -571,7 +527,6 @@ - # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -720,10 +675,11 @@ -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -738,7 +694,6 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME= @@ -746,6 +701,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= +PACKAGE_URL= ac_unique_file="gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc" # Factoring default headers for most tests. @@ -841,16 +797,10 @@ QWTPLOT3D_CFLAGS QWT_LIBS QWT_CFLAGS -QTOPENGL_CPPFLAGS -QTOPENGL_INCLUDEDIR QTOPENGL_LIBS QTOPENGL_CFLAGS -QTGUI_CPPFLAGS -QTGUI_INCLUDEDIR QTGUI_LIBS QTGUI_CFLAGS -QTCORE_CPPFLAGS -QTCORE_INCLUDEDIR QTCORE_LIBS QTCORE_CFLAGS gr_wxgui_LDFLAG @@ -863,9 +813,7 @@ gr_video_sdl_INCLUDEDIR gr_video_sdl_LA gr_video_sdl_INCLUDES -SDL_CPPFLAGS SDL_CONFIG -SDL_INCLUDEDIR SDL_LIBS SDL_CFLAGS gr_trellis_LDFLAG @@ -914,8 +862,6 @@ gr_audio_portaudio_INCLUDEDIR gr_audio_portaudio_LA gr_audio_portaudio_INCLUDES -PORTAUDIO_CPPFLAGS -PORTAUDIO_INCLUDEDIR PORTAUDIO_LIBS PORTAUDIO_CFLAGS gr_audio_osx_LDFLAG @@ -934,8 +880,6 @@ gr_audio_jack_INCLUDEDIR gr_audio_jack_LA gr_audio_jack_INCLUDES -JACK_CPPFLAGS -JACK_INCLUDEDIR JACK_LIBS JACK_CFLAGS gr_audio_alsa_LDFLAG @@ -943,8 +887,6 @@ gr_audio_alsa_INCLUDEDIR gr_audio_alsa_LA gr_audio_alsa_INCLUDES -ALSA_CPPFLAGS -ALSA_INCLUDEDIR ALSA_LIBS ALSA_CFLAGS gr_gcell_LDFLAG @@ -978,8 +920,6 @@ usrp_darwin_omnithread_pc_requires XAS XCC -USB_CPPFLAGS -USB_INCLUDEDIR USB_LIBS USB_CFLAGS FUSB_TECH_ra_wb_FALSE @@ -1011,8 +951,6 @@ gnuradio_core_PYDIRPATH gnuradio_core_SWIGDIRPATH gnuradio_core_I -GSL_CPPFLAGS -GSL_INCLUDEDIR GSL_LIBS GSL_CFLAGS CBLAS_LIBS @@ -1049,8 +987,6 @@ GUILE CPPUNIT_INCLUDES CPPUNIT_CONFIG -CPPUNIT_CPPFLAGS -CPPUNIT_INCLUDEDIR CPPUNIT_LIBS CPPUNIT_CFLAGS MD_CPU_generic_FALSE @@ -1072,10 +1008,10 @@ DOC_TRUE DOT DOXYGEN -FFTW3F_CPPFLAGS -FFTW3F_INCLUDEDIR FFTW3F_LIBS FFTW3F_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG HAVE_DOT LIBOBJS @@ -1114,7 +1050,6 @@ PYTHON SWIG NO_UNDEFINED -FLIBS ac_ct_F77 FFLAGS F77 @@ -1243,6 +1178,7 @@ program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -1345,39 +1281,30 @@ F77 FFLAGS PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR FFTW3F_CFLAGS FFTW3F_LIBS -FFTW3F_INCLUDEDIR CPPUNIT_CFLAGS CPPUNIT_LIBS -CPPUNIT_INCLUDEDIR GSL_CFLAGS GSL_LIBS -GSL_INCLUDEDIR USB_CFLAGS USB_LIBS -USB_INCLUDEDIR ALSA_CFLAGS ALSA_LIBS -ALSA_INCLUDEDIR JACK_CFLAGS JACK_LIBS -JACK_INCLUDEDIR PORTAUDIO_CFLAGS PORTAUDIO_LIBS -PORTAUDIO_INCLUDEDIR SDL_CFLAGS SDL_LIBS -SDL_INCLUDEDIR QTCORE_CFLAGS QTCORE_LIBS -QTCORE_INCLUDEDIR QTGUI_CFLAGS QTGUI_LIBS -QTGUI_INCLUDEDIR QTOPENGL_CFLAGS -QTOPENGL_LIBS -QTOPENGL_INCLUDEDIR' +QTOPENGL_LIBS' ac_subdirs_all='usrp2/firmware' # Initialize some variables set by options. @@ -1440,8 +1367,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -1486,8 +1414,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1513,8 +1440,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1718,8 +1644,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1735,8 +1660,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1766,17 +1690,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1793,15 +1717,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1824,8 +1746,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1839,8 +1760,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1855,11 +1776,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1898,13 +1817,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1944,7 +1861,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -2069,7 +1986,7 @@ both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pythondir=DIR python installation directory (cross-compiling) - [default=$prefix/lib/python2.5/site-packages] + [[default=$prefix/lib/python2.5/site-packages]] --with-md-cpu=ARCH set machine dependent speedups (auto) --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional) --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional) @@ -2136,7 +2053,7 @@ 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 C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor CXX C++ compiler command @@ -2147,63 +2064,46 @@ F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path FFTW3F_CFLAGS C compiler flags for FFTW3F, overriding pkg-config FFTW3F_LIBS linker flags for FFTW3F, overriding pkg-config - FFTW3F_INCLUDEDIR - includedir for FFTW3F, overriding pkg-config CPPUNIT_CFLAGS C compiler flags for CPPUNIT, overriding pkg-config CPPUNIT_LIBS linker flags for CPPUNIT, overriding pkg-config - CPPUNIT_INCLUDEDIR - includedir for CPPUNIT, overriding pkg-config GSL_CFLAGS C compiler flags for GSL, overriding pkg-config GSL_LIBS linker flags for GSL, overriding pkg-config - GSL_INCLUDEDIR - includedir for GSL, overriding pkg-config USB_CFLAGS C compiler flags for USB, overriding pkg-config USB_LIBS linker flags for USB, overriding pkg-config - USB_INCLUDEDIR - includedir for USB, overriding pkg-config ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config ALSA_LIBS linker flags for ALSA, overriding pkg-config - ALSA_INCLUDEDIR - includedir for ALSA, overriding pkg-config JACK_CFLAGS C compiler flags for JACK, overriding pkg-config JACK_LIBS linker flags for JACK, overriding pkg-config - JACK_INCLUDEDIR - includedir for JACK, overriding pkg-config PORTAUDIO_CFLAGS C compiler flags for PORTAUDIO, overriding pkg-config PORTAUDIO_LIBS linker flags for PORTAUDIO, overriding pkg-config - PORTAUDIO_INCLUDEDIR - includedir for PORTAUDIO, overriding pkg-config SDL_CFLAGS C compiler flags for SDL, overriding pkg-config SDL_LIBS linker flags for SDL, overriding pkg-config - SDL_INCLUDEDIR - includedir for SDL, overriding pkg-config QTCORE_CFLAGS C compiler flags for QTCORE, overriding pkg-config QTCORE_LIBS linker flags for QTCORE, overriding pkg-config - QTCORE_INCLUDEDIR - includedir for QTCORE, overriding pkg-config QTGUI_CFLAGS C compiler flags for QTGUI, overriding pkg-config QTGUI_LIBS linker flags for QTGUI, overriding pkg-config - QTGUI_INCLUDEDIR - includedir for QTGUI, overriding pkg-config QTOPENGL_CFLAGS C compiler flags for QTOPENGL, overriding pkg-config QTOPENGL_LIBS linker flags for QTOPENGL, overriding pkg-config - QTOPENGL_INCLUDEDIR - includedir for QTOPENGL, overriding pkg-config 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 the package provider. _ACEOF ac_status=$? fi @@ -2267,193 +2167,987 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.63 +generated by GNU Autoconf 2.67 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi -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 $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_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_c_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 - $ $0 $@ + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval -_ACEOF -exec 5>>config.log +} # ac_fn_c_try_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () { -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 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; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +} # ac_fn_c_try_cpp -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +# 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 "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; 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; } -_ASUNAME +# 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; } -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done -IFS=$as_save_IFS +# 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;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -} >&5 +} # ac_fn_c_check_header_mongrel -cat >&5 <<_ACEOF +# 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval -## ----------- ## -## Core tests. ## -## ----------- ## +} # 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 "test \"\${$3+set}\"" = set; 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +} # ac_fn_c_check_header_compile -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo +# 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 || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo + 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo +} # ac_fn_c_try_link - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do +# 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_compile + +# ac_fn_cxx_try_cpp LINENO +# ------------------------ +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 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; } > conftest.i && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_cpp + +# 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 "test \"\${$3+set}\"" = set; 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_func + +# ac_fn_cxx_try_link LINENO +# ------------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_link + +# ac_fn_f77_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_f77_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_f77_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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_f77_try_compile + +# ac_fn_f77_try_link LINENO +# ------------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_f77_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_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_f77_try_link + +# 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 "test \"\${$3+set}\"" = set; 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_type + +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. +ac_fn_c_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_decl + +# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES +# ---------------------------------------------------- +# Tries to find if the field MEMBER exists in type AGGR, after including +# INCLUDES, setting cache variable VAR accordingly. +ac_fn_c_check_member () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if eval "test \"\${$4+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + eval "$4=no" +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=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_member + +# ac_fn_cxx_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_cxx_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; 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_cxx_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_cxx_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_cxx_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;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_cxx_check_header_mongrel +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 $as_me, which was +generated by GNU Autoconf 2.67. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do eval ac_val=\$$ac_var case $ac_val in *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; @@ -2464,11 +3158,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2482,46 +3174,53 @@ exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2532,19 +3231,23 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; @@ -2552,7 +3255,7 @@ esac fi else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -2567,11 +3270,11 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; @@ -2581,17 +3284,17 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac @@ -2603,35 +3306,20 @@ esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi - - - - - - - - - - - - - - - - +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2662,9 +3350,7 @@ fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + 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, @@ -2678,35 +3364,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then +if test "${ac_cv_build+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2722,28 +3400,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then +if test "${ac_cv_host+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2759,28 +3433,24 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking target system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 $as_echo_n "checking target system type... " >&6; } -if test "${ac_cv_target+set}" = set; then +if test "${ac_cv_target+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$target_alias" = x; then ac_cv_target=$ac_cv_host else ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -$as_echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -2819,10 +3489,10 @@ # 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:$LINENO: checking for a BSD-compatible install" >&5 +{ $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 test "${ac_cv_path_install+set}" = set; then +if test "${ac_cv_path_install+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2830,11 +3500,11 @@ 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/* | \ + # 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\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2871,7 +3541,7 @@ ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -2887,7 +3557,7 @@ INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $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}. @@ -2898,7 +3568,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 @@ -2922,11 +3592,8 @@ # 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_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -2935,13 +3602,10 @@ # Ok. : else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" @@ -2962,93 +3626,195 @@ am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 + { $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 -{ $as_echo "$as_me:$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 test "${ac_cv_path_mkdir+set}" = set; then +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + +# 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 test "${ac_cv_prog_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin + 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 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 - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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 + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 done + done IFS=$as_save_IFS fi - - 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. - test -d ./--version && rmdir ./--version - MKDIR_P="$ac_install_sh -d" - fi fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&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 -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -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:$LINENO: checking for $ac_word" >&5 +fi +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 test "${ac_cv_prog_AWK+set}" = set; then +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # 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 do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + 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 done -done + done +IFS=$as_save_IFS + +fi +fi +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 + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +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 test "${ac_cv_path_mkdir+set}" = set; 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 + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + +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 test "${ac_cv_prog_AWK+set}" = set; 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3056,11 +3822,11 @@ test -n "$AWK" && break done -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $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 { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -3068,7 +3834,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# 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;; @@ -3078,11 +3844,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -3102,9 +3868,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -3148,108 +3912,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - -# 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:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - 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 -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -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:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - 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 -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. @@ -3286,7 +3948,7 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= @@ -3314,12 +3976,12 @@ fi -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 $as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -3344,9 +4006,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3357,24 +4019,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3384,9 +4046,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3397,24 +4059,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3423,7 +4085,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3437,9 +4099,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3450,24 +4112,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3477,9 +4139,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3491,18 +4153,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -3521,10 +4183,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3536,9 +4198,9 @@ 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_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3549,24 +4211,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3580,9 +4242,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3593,24 +4255,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3623,7 +4285,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3634,57 +4296,37 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +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=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3700,8 +4342,8 @@ # 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:$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}: 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: @@ -3717,17 +4359,17 @@ done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $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, @@ -3744,7 +4386,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3763,84 +4405,41 @@ else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 +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:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +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 -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - fi - fi -fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +{ $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" +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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $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 @@ -3855,32 +4454,83 @@ esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } fi - -rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +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 -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +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 test "${ac_cv_objext+set}" = set; then +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3892,17 +4542,17 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $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 @@ -3915,31 +4565,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +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:$LINENO: result: $ac_cv_objext" >&5 +{ $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:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $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 test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3953,37 +4595,16 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -3992,20 +4613,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4016,35 +4633,11 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4055,36 +4648,12 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4095,42 +4664,17 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - 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_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -4147,18 +4691,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4215,32 +4755,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -4251,17 +4768,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4271,9 +4790,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4299,6 +4818,11 @@ 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 @@ -4316,7 +4840,17 @@ 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 @@ -4326,19 +4860,23 @@ break fi ;; + 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 - # 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. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $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 sub/conftest.${OBJEXT-o} 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 @@ -4362,7 +4900,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $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 @@ -4382,14 +4920,14 @@ 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:$LINENO: checking how to run the C preprocessor" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 $as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then + if test "${ac_cv_prog_CPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -4404,11 +4942,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -4417,78 +4951,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -4500,7 +4990,7 @@ else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -4511,11 +5001,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -4524,87 +5010,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -4615,9 +5054,9 @@ -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +{ $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 test "${ac_cv_path_GREP+set}" = set; then +if test "${ac_cv_path_GREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4628,7 +5067,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + 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" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue @@ -4648,7 +5087,7 @@ $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 - ac_count=`expr $ac_count + 1` + 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" @@ -4663,26 +5102,24 @@ $ac_path_GREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + 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:$LINENO: result: $ac_cv_path_GREP" >&5 +{ $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:$LINENO: checking for egrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then +if test "${ac_cv_path_EGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4696,7 +5133,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + 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" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue @@ -4716,7 +5153,7 @@ $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 - ac_count=`expr $ac_count + 1` + 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" @@ -4731,12 +5168,10 @@ $ac_path_EGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + 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 @@ -4744,21 +5179,17 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +{ $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:$LINENO: checking for ANSI C header files" >&5 +{ $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 test "${ac_cv_header_stdc+set}" = set; then +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4773,48 +5204,23 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + 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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + 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 - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4824,18 +5230,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + 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 - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4845,14 +5247,10 @@ 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 + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4879,292 +5277,70 @@ return 0; } _ACEOF -rm -f 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -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 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +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:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $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 -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$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 + ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" +if test "x$ac_cv_header_minix_config_h" = x""yes; then : + MINIX=yes +else + MINIX= +fi + if test "$MINIX" = yes; then +$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h -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` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h + + +$as_echo "#define _MINIX 1" >>confdefs.h + + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - if test "${ac_cv_header_minix_config_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 -$as_echo_n "checking for minix/config.h... " >&6; } -if test "${ac_cv_header_minix_config_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -$as_echo "$ac_cv_header_minix_config_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5 -$as_echo_n "checking minix/config.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5 -$as_echo_n "checking minix/config.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 -$as_echo_n "checking for minix/config.h... " >&6; } -if test "${ac_cv_header_minix_config_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_minix_config_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -$as_echo "$ac_cv_header_minix_config_h" >&6; } - -fi -if test "x$ac_cv_header_minix_config_h" = x""yes; then - MINIX=yes -else - MINIX= -fi - - - if test "$MINIX" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define _POSIX_SOURCE 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define _POSIX_1_SOURCE 2 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define _MINIX 1 -_ACEOF - - fi - - - - { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5 -$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # define __EXTENSIONS__ 1 @@ -5177,69 +5353,35 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_safe_to_define___extensions__=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_safe_to_define___extensions__=no + ac_cv_safe_to_define___extensions__=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } test $ac_cv_safe_to_define___extensions__ = yes && - cat >>confdefs.h <<\_ACEOF -#define __EXTENSIONS__ 1 -_ACEOF + $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _ALL_SOURCE 1 -_ACEOF + $as_echo "#define _ALL_SOURCE 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _GNU_SOURCE 1 -_ACEOF + $as_echo "#define _GNU_SOURCE 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _POSIX_PTHREAD_SEMANTICS 1 -_ACEOF + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _TANDEM_SOURCE 1 -_ACEOF + $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h -{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 $as_echo_n "checking for library containing strerror... " >&6; } -if test "${ac_cv_search_strerror+set}" = set; then +if test "${ac_cv_search_strerror+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -5264,54 +5406,27 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_strerror=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_strerror+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then : break fi done -if test "${ac_cv_search_strerror+set}" = set; then - : +if test "${ac_cv_search_strerror+set}" = set; then : + else ac_cv_search_strerror=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 $as_echo "$ac_cv_search_strerror" >&6; } ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -5332,9 +5447,9 @@ 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_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then +if test "${ac_cv_prog_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -5345,24 +5460,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 $as_echo "$CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5376,9 +5491,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -5389,24 +5504,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done 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:$LINENO: result: $ac_ct_CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 $as_echo "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5419,7 +5534,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5430,53 +5545,36 @@ fi fi # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +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=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $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 -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +{ $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 test "${ac_cv_cxx_compiler_gnu+set}" = set; then +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5490,37 +5588,16 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + 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:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +{ $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 @@ -5529,20 +5606,16 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then +if test "${ac_cv_prog_cxx_g+set}" = set; 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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5553,35 +5626,11 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5592,36 +5641,12 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cxx_werror_flag=$ac_save_cxx_werror_flag +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5632,42 +5657,17 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - 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:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +{ $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 @@ -5692,9 +5692,9 @@ depcc="$CXX" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -5720,6 +5720,11 @@ 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 @@ -5737,7 +5742,17 @@ 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 @@ -5747,19 +5762,23 @@ break fi ;; + 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 - # 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. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $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 sub/conftest.${OBJEXT-o} 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 @@ -5783,7 +5802,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type @@ -5803,10 +5822,10 @@ 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 -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CXXCPP needs to be expanded @@ -5821,11 +5840,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -5834,78 +5849,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -5917,7 +5888,7 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 $as_echo "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -5928,11 +5899,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -5941,87 +5908,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -6044,13 +5964,9 @@ - { $as_echo "$as_me:$LINENO: checking whether C++ has std::isnan" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ has std::isnan" >&5 $as_echo_n "checking whether C++ has std::isnan... " >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -6063,39 +5979,16 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define CXX_HAS_STD_ISNAN /**/ -_ACEOF +$as_echo "#define CXX_HAS_STD_ISNAN /**/" >>confdefs.h else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -6110,7 +6003,7 @@ - { $as_echo "$as_me:$LINENO: checking gr_libdir_suffix" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking gr_libdir_suffix" >&5 $as_echo_n "checking gr_libdir_suffix... " >&6; } gr_libdir_suffix="" @@ -6141,19 +6034,19 @@ fi fi - { $as_echo "$as_me:$LINENO: result: $gr_libdir_suffix" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gr_libdir_suffix" >&5 $as_echo "$gr_libdir_suffix" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to append 64 to libdir" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to append 64 to libdir" >&5 $as_echo_n "checking whether to append 64 to libdir... " >&6; } t=${libdir##*/lib} if test "$t" != 64 && test "$gr_libdir_suffix" = "64"; then libdir=${libdir}64 - { $as_echo "$as_me:$LINENO: result: yes. Setting libdir to $libdir" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes. Setting libdir to $libdir" >&5 $as_echo "yes. Setting libdir to $libdir" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6198,15 +6091,15 @@ echo 'void f(){}' > conftest.c for i in $cc_warning_flags do - { $as_echo "$as_me:$LINENO: checking whether $CC accepts $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts $i" >&5 $as_echo_n "checking whether $CC accepts $i... " >&6; } if test -z "`${CC} $i -c conftest.c 2>&1`" then lf_CFLAGS="${lf_CFLAGS} $i" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi done @@ -6220,15 +6113,15 @@ echo 'void f(){}' > conftest.cc for i in $cxx_warning_flags do - { $as_echo "$as_me:$LINENO: checking whether $CXX accepts $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts $i" >&5 $as_echo_n "checking whether $CXX accepts $i... " >&6; } if test -z "`${CXX} $i -c conftest.cc 2>&1`" then lf_CXXFLAGS="${lf_CXXFLAGS} $i" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi done @@ -6238,17 +6131,17 @@ fi - { $as_echo "$as_me:$LINENO: checking whether user wants gprof" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether user wants gprof" >&5 $as_echo_n "checking whether user wants gprof... " >&6; } # Check whether --with-gprof was given. -if test "${with_gprof+set}" = set; then +if test "${with_gprof+set}" = set; then : withval=$with_gprof; else with_gprof=no fi - { $as_echo "$as_me:$LINENO: result: $with_gprof" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gprof" >&5 $as_echo "$with_gprof" >&6; } cc_profiling_flags="-pg" @@ -6262,15 +6155,15 @@ echo 'void f(){}' > conftest.c for i in $cc_profiling_flags do - { $as_echo "$as_me:$LINENO: checking whether $CC accepts $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts $i" >&5 $as_echo_n "checking whether $CC accepts $i... " >&6; } if test -z "`${CC} $i -c conftest.c 2>&1`" then lf_CFLAGS="${lf_CFLAGS} $i" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi done @@ -6284,15 +6177,15 @@ echo 'void f(){}' > conftest.cc for i in $cxx_profiling_flags do - { $as_echo "$as_me:$LINENO: checking whether $CXX accepts $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts $i" >&5 $as_echo_n "checking whether $CXX accepts $i... " >&6; } if test -z "`${CXX} $i -c conftest.cc 2>&1`" then lf_CXXFLAGS="${lf_CXXFLAGS} $i" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi done @@ -6303,17 +6196,17 @@ fi - { $as_echo "$as_me:$LINENO: checking whether user wants prof" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether user wants prof" >&5 $as_echo_n "checking whether user wants prof... " >&6; } # Check whether --with-prof was given. -if test "${with_prof+set}" = set; then +if test "${with_prof+set}" = set; then : withval=$with_prof; else with_prof=no fi - { $as_echo "$as_me:$LINENO: result: $with_prof" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_prof" >&5 $as_echo "$with_prof" >&6; } cc_profiling_flags="-p" @@ -6327,15 +6220,15 @@ echo 'void f(){}' > conftest.c for i in $cc_profiling_flags do - { $as_echo "$as_me:$LINENO: checking whether $CC accepts $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts $i" >&5 $as_echo_n "checking whether $CC accepts $i... " >&6; } if test -z "`${CC} $i -c conftest.c 2>&1`" then lf_CFLAGS="${lf_CFLAGS} $i" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi done @@ -6349,15 +6242,15 @@ echo 'void f(){}' > conftest.cc for i in $cxx_profiling_flags do - { $as_echo "$as_me:$LINENO: checking whether $CXX accepts $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts $i" >&5 $as_echo_n "checking whether $CXX accepts $i... " >&6; } if test -z "`${CXX} $i -c conftest.cc 2>&1`" then lf_CXXFLAGS="${lf_CXXFLAGS} $i" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi done @@ -6376,9 +6269,9 @@ depcc="$CCAS" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -6404,6 +6297,9 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + + 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 @@ -6421,7 +6317,17 @@ 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 @@ -6431,19 +6337,23 @@ break fi ;; + 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 - # 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. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $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 sub/conftest.${OBJEXT-o} 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 @@ -6467,7 +6377,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 $as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type @@ -6482,22 +6392,22 @@ fi -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 $as_echo "no, using $LN_S" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $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 { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -6505,7 +6415,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# 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;; @@ -6515,161 +6425,28 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -# 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:$LINENO: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; 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 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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 - # 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:$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' # AC_PROG_MKDIR_P # is a backport of autoconf-2.60's AC_PROG_MKDIR_P. # Remove this macro when we can assume autoconf >= 2.60. -{ $as_echo "$as_me:$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 test "${ac_cv_path_mkdir+set}" = set; 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 - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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 - - 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. - test -d ./--version && rmdir ./--version - MKDIR_P="$ac_install_sh -d" - fi -fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_RM_PROG+set}" = set; then +if test "${ac_cv_path_RM_PROG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $RM_PROG in @@ -6682,14 +6459,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RM_PROG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -6697,10 +6474,10 @@ fi RM_PROG=$ac_cv_path_RM_PROG if test -n "$RM_PROG"; then - { $as_echo "$as_me:$LINENO: result: $RM_PROG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM_PROG" >&5 $as_echo "$RM_PROG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6713,9 +6490,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AS+set}" = set; then +if test "${ac_cv_prog_AS+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AS"; then @@ -6726,24 +6503,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AS="${ac_tool_prefix}as" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AS=$ac_cv_prog_AS if test -n "$AS"; then - { $as_echo "$as_me:$LINENO: result: $AS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 $as_echo "$AS" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6753,9 +6530,9 @@ ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AS+set}" = set; then +if test "${ac_cv_prog_ac_ct_AS+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AS"; then @@ -6766,24 +6543,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AS="as" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_AS=$ac_cv_prog_ac_ct_AS if test -n "$ac_ct_AS"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 $as_echo "$ac_ct_AS" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6792,7 +6569,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6805,9 +6582,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DLLTOOL+set}" = set; then +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$DLLTOOL"; then @@ -6818,24 +6595,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 $as_echo "$DLLTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6845,9 +6622,9 @@ ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DLLTOOL"; then @@ -6858,24 +6635,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 $as_echo "$ac_ct_DLLTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6884,7 +6661,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6897,9 +6674,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -6910,24 +6687,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 $as_echo "$OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6937,9 +6714,9 @@ ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -6950,24 +6727,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 $as_echo "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6976,7 +6753,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7010,7 +6787,7 @@ # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then +if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -7040,7 +6817,7 @@ # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then +if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -7071,14 +6848,14 @@ case `pwd` in *\ * | *\ *) - { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -macro_version='2.2.6' -macro_revision='1.3012' +macro_version='2.2.6b' +macro_revision='1.3017' @@ -7094,9 +6871,9 @@ ltmain="$ac_aux_dir/ltmain.sh" -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then +if test "${ac_cv_path_SED+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -7104,7 +6881,7 @@ ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - $as_unset ac_script || ac_script= + { ac_script=; unset ac_script;} if test -z "$SED"; then ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -7113,7 +6890,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue @@ -7133,7 +6910,7 @@ $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" @@ -7148,19 +6925,17 @@ $ac_path_SED_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -7178,9 +6953,9 @@ -{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then +if test "${ac_cv_path_FGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -7194,7 +6969,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue @@ -7214,7 +6989,7 @@ $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" @@ -7229,12 +7004,10 @@ $ac_path_FGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -7242,7 +7015,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 $as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -7268,7 +7041,7 @@ # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -7277,7 +7050,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -7307,13 +7080,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then +if test "${lt_cv_path_LD+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -7344,18 +7117,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then +if test "${lt_cv_prog_gnu_ld+set}" = set; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -7368,7 +7139,7 @@ ;; esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -7380,9 +7151,9 @@ -{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then +if test "${lt_cv_path_NM+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -7429,7 +7200,7 @@ : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" @@ -7440,9 +7211,9 @@ 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_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then +if test "${ac_cv_prog_DUMPBIN+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -7453,24 +7224,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 $as_echo "$DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7484,9 +7255,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -7497,24 +7268,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 $as_echo "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7527,7 +7298,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7547,33 +7318,33 @@ -{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if test "${lt_cv_nm_interface+set}" = set; then +if test "${lt_cv_nm_interface+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:7557: $ac_compile\"" >&5) + (eval echo "\"\$as_me:7328: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7560: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:7331: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7563: output\"" >&5) + (eval echo "\"\$as_me:7334: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi rm -f conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 $as_echo "$lt_cv_nm_interface" >&6; } # find the maximum length of command line arguments -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then +if test "${lt_cv_sys_max_cmd_len+set}" = set; then : $as_echo_n "(cached) " >&6 else i=0 @@ -7691,10 +7462,10 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:$LINENO: result: none" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -7708,7 +7479,7 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no @@ -7718,17 +7489,17 @@ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 $as_echo "$xsi_shell" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 $as_echo "$lt_shell_append" >&6; } @@ -7763,14 +7534,14 @@ -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then +if test "${lt_cv_ld_reload_flag+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 $as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in @@ -7799,9 +7570,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -7812,24 +7583,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 $as_echo "$OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7839,9 +7610,9 @@ ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -7852,24 +7623,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 $as_echo "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7878,7 +7649,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7895,9 +7666,9 @@ -{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then +if test "${lt_cv_deplibs_check_method+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -8091,7 +7862,7 @@ esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method @@ -8111,9 +7882,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then +if test "${ac_cv_prog_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -8124,24 +7895,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 $as_echo "$AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8151,9 +7922,9 @@ ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -8164,24 +7935,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 $as_echo "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8190,7 +7961,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -8216,9 +7987,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if test "${ac_cv_prog_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -8229,24 +8000,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8256,9 +8027,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -8269,24 +8040,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8295,7 +8066,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -8315,9 +8086,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then +if test "${ac_cv_prog_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -8328,24 +8099,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 $as_echo "$RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8355,9 +8126,9 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -8368,24 +8139,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 $as_echo "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8394,7 +8165,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -8472,9 +8243,9 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -8590,18 +8361,18 @@ int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -8654,11 +8425,11 @@ lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi LIBS="$lt_save_LIBS" @@ -8692,10 +8463,10 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:$LINENO: result: failed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 $as_echo "failed" >&6; } else - { $as_echo "$as_me:$LINENO: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } fi @@ -8721,7 +8492,7 @@ # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then +if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi @@ -8733,11 +8504,11 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" @@ -8751,12 +8522,12 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8754 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo '#line 8525 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -8790,11 +8561,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) case $host in @@ -8843,9 +8614,9 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then +if test "${lt_cv_cc_needs_belf+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -8854,11 +8625,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8869,38 +8636,13 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_cc_needs_belf=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8908,7 +8650,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf @@ -8918,11 +8660,11 @@ sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in @@ -8948,9 +8690,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then @@ -8961,24 +8703,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 $as_echo "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8988,9 +8730,9 @@ ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -9001,24 +8743,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 $as_echo "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9027,7 +8769,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -9040,9 +8782,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then +if test "${ac_cv_prog_NMEDIT+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -9053,24 +8795,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 $as_echo "$NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9080,9 +8822,9 @@ ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -9093,24 +8835,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 $as_echo "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9119,7 +8861,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -9132,9 +8874,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then +if test "${ac_cv_prog_LIPO+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -9145,24 +8887,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 $as_echo "$LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9172,9 +8914,9 @@ ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -9185,24 +8927,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 $as_echo "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9211,7 +8953,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -9224,9 +8966,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then +if test "${ac_cv_prog_OTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -9237,24 +8979,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 $as_echo "$OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9264,9 +9006,9 @@ ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -9277,24 +9019,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 $as_echo "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9303,7 +9045,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -9316,9 +9058,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then +if test "${ac_cv_prog_OTOOL64+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -9329,24 +9071,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 $as_echo "$OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9356,9 +9098,9 @@ ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -9369,24 +9111,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 $as_echo "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9395,7 +9137,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -9431,9 +9173,9 @@ - { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then +if test "${lt_cv_apple_cc_single_mod+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -9458,22 +9200,18 @@ rm -f conftest.* fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9484,42 +9222,17 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no + lt_cv_ld_exported_symbols_list=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[012]) @@ -9556,62 +9269,13 @@ ;; esac - for ac_header in dlfcn.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_DLFCN_H 1 _ACEOF fi @@ -9634,9 +9298,9 @@ 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_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then +if test "${ac_cv_prog_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -9647,24 +9311,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 $as_echo "$CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9678,9 +9342,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -9691,24 +9355,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done 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:$LINENO: result: $ac_ct_CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 $as_echo "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9721,7 +9385,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -9732,53 +9396,36 @@ fi fi # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +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=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $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 -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +{ $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 test "${ac_cv_cxx_compiler_gnu+set}" = set; then +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9792,37 +9439,16 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + 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:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +{ $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 @@ -9831,20 +9457,16 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then +if test "${ac_cv_prog_cxx_g+set}" = set; 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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9855,35 +9477,11 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9894,36 +9492,12 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cxx_werror_flag=$ac_save_cxx_werror_flag +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9934,42 +9508,17 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - 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:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +{ $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 @@ -9994,9 +9543,9 @@ depcc="$CXX" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -10022,6 +9571,11 @@ 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 @@ -10039,7 +9593,17 @@ 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 @@ -10049,19 +9613,23 @@ break fi ;; + 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 - # 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. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $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 sub/conftest.${OBJEXT-o} 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 @@ -10085,7 +9653,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type @@ -10108,10 +9676,10 @@ 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 -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CXXCPP needs to be expanded @@ -10126,11 +9694,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -10139,78 +9703,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -10222,7 +9742,7 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 $as_echo "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -10233,11 +9753,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -10246,81 +9762,37 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} _lt_caught_CXX_error=yes; } fi @@ -10350,7 +9822,7 @@ # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then +if test "${with_pic+set}" = set; then : withval=$with_pic; pic_mode="$withval" else pic_mode=default @@ -10366,7 +9838,7 @@ # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then +if test "${enable_fast_install+set}" = set; then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -10447,9 +9919,9 @@ setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then +if test "${lt_cv_objdir+set}" = set; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -10462,7 +9934,7 @@ fi rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -10555,9 +10027,9 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -10608,10 +10080,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -10621,9 +10093,9 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:$LINENO: checking for file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -10674,10 +10146,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -10758,9 +10230,9 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' - { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -10776,11 +10248,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10779: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10251: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10783: \$? = $ac_status" >&5 + echo "$as_me:10255: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10793,7 +10265,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then @@ -10813,7 +10285,7 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 $as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then @@ -11085,7 +10557,7 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 $as_echo "$lt_prog_compiler_pic" >&6; } @@ -11097,9 +10569,9 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -11115,11 +10587,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11118: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10590: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11122: \$? = $ac_status" >&5 + echo "$as_me:10594: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11132,7 +10604,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then @@ -11156,9 +10628,9 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then +if test "${lt_cv_prog_compiler_static_works+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -11184,7 +10656,7 @@ LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then @@ -11199,9 +10671,9 @@ - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -11220,11 +10692,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11223: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10695: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11227: \$? = $ac_status" >&5 + echo "$as_me:10699: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11246,7 +10718,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -11254,9 +10726,9 @@ - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -11275,11 +10747,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11278: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10750: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11282: \$? = $ac_status" >&5 + echo "$as_me:10754: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11301,7 +10773,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -11310,7 +10782,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* @@ -11318,10 +10790,10 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -11334,7 +10806,7 @@ - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= @@ -11777,11 +11249,7 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11792,27 +11260,7 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -11826,16 +11274,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -11848,11 +11289,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11863,27 +11300,7 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -11897,16 +11314,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -12118,42 +11528,16 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat >conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int foo(void) {} _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' @@ -12409,7 +11793,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no @@ -12446,16 +11830,16 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -12469,11 +11853,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } then archive_cmds_need_lc=no else @@ -12484,7 +11868,7 @@ cat conftest.err 1>&5 fi $RM conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 $as_echo "$archive_cmds_need_lc" >&6; } ;; esac @@ -12648,7 +12032,7 @@ - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then @@ -13070,11 +12454,7 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -13085,41 +12465,13 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : shlibpath_overrides_runpath=yes fi - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -13343,7 +12695,7 @@ dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -13445,7 +12797,7 @@ - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || @@ -13470,7 +12822,7 @@ # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || @@ -13515,18 +12867,14 @@ darwin*) # if libdl is installed we need to link against it - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -13544,43 +12892,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -13593,106 +12916,18 @@ ;; *) - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -$as_echo_n "checking for shl_load... " >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* 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 shl_load (); -/* 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_shl_load || defined __stub___shl_load -choke me -#endif - -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shl_load=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -$as_echo "$ac_cv_func_shl_load" >&6; } -if test "x$ac_cv_func_shl_load" = x""yes; then + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = x""yes; then : lt_cv_dlopen="shl_load" else - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then +if test "${ac_cv_lib_dld_shl_load+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -13710,145 +12945,32 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_shl_load=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* 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 dlopen (); -/* 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_dlopen || defined __stub___dlopen -choke me -#endif - -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -13866,57 +12988,28 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then +if test "${ac_cv_lib_svld_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -13934,57 +13027,28 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_svld_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then +if test "${ac_cv_lib_dld_dld_link+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -14002,43 +13066,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_dld_link=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -14077,9 +13116,9 @@ save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then +if test "${lt_cv_dlopen_self+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -14088,7 +13127,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14091 "configure" +#line 13130 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14147,11 +13186,11 @@ return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -14168,14 +13207,14 @@ fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then +if test "${lt_cv_dlopen_self_static+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -14184,7 +13223,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14187 "configure" +#line 13226 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14243,11 +13282,11 @@ return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -14264,7 +13303,7 @@ fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 $as_echo "$lt_cv_dlopen_self_static" >&6; } fi @@ -14303,12 +13342,12 @@ striplib= old_striplib= -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 $as_echo_n "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough @@ -14317,15 +13356,15 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi ;; *) - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ;; esac @@ -14343,12 +13382,12 @@ # Report which library types will actually be built - { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 $as_echo "$can_build_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no @@ -14369,14 +13408,14 @@ fi ;; esac - { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 $as_echo "$enable_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -14517,7 +13556,7 @@ # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -14526,7 +13565,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -14556,13 +13595,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then +if test "${lt_cv_path_LD+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -14593,18 +13632,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then +if test "${lt_cv_prog_gnu_ld+set}" = set; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -14617,7 +13654,7 @@ ;; esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -14672,7 +13709,7 @@ fi # PORTME: fill in a description of your system's C++ link characteristics - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ld_shlibs_CXX=yes case $host_os in @@ -14773,11 +13810,7 @@ allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -14788,27 +13821,7 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -14822,16 +13835,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -14845,11 +13851,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -14860,27 +13862,7 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -14894,16 +13876,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -15647,7 +14622,7 @@ ;; esac - { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no @@ -15675,11 +14650,11 @@ }; _LT_EOF -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. @@ -15860,7 +14835,7 @@ lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # C++ specific cases for pic, static, wl, etc. @@ -16177,7 +15152,7 @@ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 $as_echo "$lt_prog_compiler_pic_CXX" >&6; } @@ -16186,9 +15161,9 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works_CXX=no @@ -16204,11 +15179,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16207: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15182: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16211: \$? = $ac_status" >&5 + echo "$as_me:15186: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16221,7 +15196,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then @@ -16242,9 +15217,9 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no @@ -16270,7 +15245,7 @@ LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then @@ -16282,9 +15257,9 @@ - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no @@ -16303,11 +15278,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16306: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15281: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16310: \$? = $ac_status" >&5 + echo "$as_me:15285: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16329,14 +15304,14 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no @@ -16355,11 +15330,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16358: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15333: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16362: \$? = $ac_status" >&5 + echo "$as_me:15337: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16381,7 +15356,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } @@ -16390,7 +15365,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* @@ -16398,10 +15373,10 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -16411,7 +15386,7 @@ - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -16440,7 +15415,7 @@ esac exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no @@ -16468,16 +15443,16 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -16491,11 +15466,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag_CXX allow_undefined_flag_CXX= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } then archive_cmds_need_lc_CXX=no else @@ -16506,7 +15481,7 @@ cat conftest.err 1>&5 fi $RM conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5 $as_echo "$archive_cmds_need_lc_CXX" >&6; } ;; esac @@ -16577,7 +15552,7 @@ - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= @@ -16947,11 +15922,7 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -16962,41 +15933,13 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then +if ac_fn_cxx_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : shlibpath_overrides_runpath=yes fi - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -17220,7 +16163,7 @@ dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -17271,7 +16214,7 @@ - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || @@ -17296,7 +16239,7 @@ # directories. hardcode_action_CXX=unsupported fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 $as_echo "$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink || @@ -17361,13 +16304,13 @@ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn 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_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_F77+set}" = set; then +if test "${ac_cv_prog_F77+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$F77"; then @@ -17378,24 +16321,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then - { $as_echo "$as_me:$LINENO: result: $F77" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 $as_echo "$F77" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -17405,13 +16348,13 @@ fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then +if test "${ac_cv_prog_ac_ct_F77+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_F77"; then @@ -17422,24 +16365,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 $as_echo "$ac_ct_F77" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -17452,7 +16395,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -17462,54 +16405,41 @@ # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +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=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $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 rm -f a.out # If we don't use `.F' as extension, the preprocessor is not run on the # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5 $as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } -if test "${ac_cv_f77_compiler_gnu+set}" = set; then +if test "${ac_cv_f77_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF + cat > conftest.$ac_ext <<_ACEOF program main #ifndef __GNUC__ choke me @@ -17517,83 +16447,41 @@ end _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_f77_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 $as_echo "$ac_cv_f77_compiler_gnu" >&6; } ac_ext=$ac_save_ext ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= -{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 $as_echo_n "checking whether $F77 accepts -g... " >&6; } -if test "${ac_cv_prog_f77_g+set}" = set; then +if test "${ac_cv_prog_f77_g+set}" = set; then : $as_echo_n "(cached) " >&6 else FFLAGS=-g -cat >conftest.$ac_ext <<_ACEOF +cat > conftest.$ac_ext <<_ACEOF program main end _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_f77_try_compile "$LINENO"; then : ac_cv_prog_f77_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_prog_f77_g=no + ac_cv_prog_f77_g=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 $as_echo "$ac_cv_prog_f77_g" >&6; } if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS @@ -17630,7 +16518,7 @@ # Check whether --enable-fortran was given. -if test "${enable_fortran+set}" = set; then +if test "${enable_fortran+set}" = set; then : enableval=$enable_fortran; else enable_fortran=no @@ -17644,275 +16532,9 @@ ENABLE_FORTRAN_FALSE= fi - if test "x$enable_fortran" = xyes then - ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn - 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_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_F77+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$F77"; then - ac_cv_prog_F77="$F77" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -F77=$ac_cv_prog_F77 -if test -n "$F77"; then - { $as_echo "$as_me:$LINENO: result: $F77" >&5 -$as_echo "$F77" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$F77" && break - done -fi -if test -z "$F77"; then - ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn -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:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_F77"; then - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_F77="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_F77=$ac_cv_prog_ac_ct_F77 -if test -n "$ac_ct_F77"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -$as_echo "$ac_ct_F77" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_F77" && break -done - - if test "x$ac_ct_F77" = x; then - F77="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - F77=$ac_ct_F77 - fi -fi - - -# Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -rm -f a.out - -# If we don't use `.F' as extension, the preprocessor is not run on the -# input file. (Note that this only needs to work for GNU compilers.) -ac_save_ext=$ac_ext -ac_ext=F -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } -if test "${ac_cv_f77_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF - program main -#ifndef __GNUC__ - choke me -#endif - - end -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_f77_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -$as_echo "$ac_cv_f77_compiler_gnu" >&6; } -ac_ext=$ac_save_ext -ac_test_FFLAGS=${FFLAGS+set} -ac_save_FFLAGS=$FFLAGS -FFLAGS= -{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -$as_echo_n "checking whether $F77 accepts -g... " >&6; } -if test "${ac_cv_prog_f77_g+set}" = set; then - $as_echo_n "(cached) " >&6 -else - FFLAGS=-g -cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_f77_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_prog_f77_g=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -$as_echo "$ac_cv_prog_f77_g" >&6; } -if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS -elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-g -O2" - else - FFLAGS="-g" - fi -else - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-O2" - else - FFLAGS= - fi -fi - -if test $ac_compiler_gnu = yes; then - G77=yes -else - G77= -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=f + ac_ext=f ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu @@ -18013,12 +16635,12 @@ GCC=$G77 if test -n "$compiler"; then - { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 $as_echo "$can_build_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no @@ -18038,14 +16660,14 @@ fi ;; esac - { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 $as_echo "$enable_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } GCC_F77="$G77" @@ -18059,7 +16681,7 @@ lt_prog_compiler_pic_F77= lt_prog_compiler_static_F77= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 $as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then @@ -18331,7 +16953,7 @@ lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" ;; esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_F77" >&5 $as_echo "$lt_prog_compiler_pic_F77" >&6; } @@ -18340,9 +16962,9 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_F77"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works_F77=no @@ -18358,11 +16980,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18361: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16983: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18365: \$? = $ac_status" >&5 + echo "$as_me:16987: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18375,7 +16997,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_F77" >&5 $as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; } if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then @@ -18396,9 +17018,9 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_F77=no @@ -18424,7 +17046,7 @@ LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_F77" >&5 $as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; } if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then @@ -18436,9 +17058,9 @@ - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then +if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_F77=no @@ -18457,11 +17079,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18460: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17082: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18464: \$? = $ac_status" >&5 + echo "$as_me:17086: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18483,14 +17105,14 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_F77" >&5 $as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then +if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_F77=no @@ -18509,11 +17131,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18512: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17134: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18516: \$? = $ac_status" >&5 + echo "$as_me:17138: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18535,7 +17157,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_F77" >&5 $as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } @@ -18544,7 +17166,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* @@ -18552,10 +17174,10 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -18565,7 +17187,7 @@ - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= @@ -19008,32 +17630,12 @@ allow_undefined_flag_F77='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF + cat > conftest.$ac_ext <<_ACEOF program main end _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_f77_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -19047,16 +17649,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -19069,32 +17664,12 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF + cat > conftest.$ac_ext <<_ACEOF program main end _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_f77_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -19108,16 +17683,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -19329,42 +17897,15 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat >conftest.$ac_ext <<_ACEOF + cat > conftest.$ac_ext <<_ACEOF int foo(void) {} _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_f77_try_link "$LINENO"; then : archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" else archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' @@ -19620,7 +18161,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_F77" >&5 $as_echo "$ld_shlibs_F77" >&6; } test "$ld_shlibs_F77" = no && can_build_shared=no @@ -19648,16 +18189,16 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -19671,11 +18212,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag_F77 allow_undefined_flag_F77= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_F77 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds_F77 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } then archive_cmds_need_lc_F77=no else @@ -19686,7 +18227,7 @@ cat conftest.err 1>&5 fi $RM conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_F77" >&5 $as_echo "$archive_cmds_need_lc_F77" >&6; } ;; esac @@ -19757,7 +18298,7 @@ - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= @@ -20127,46 +18668,18 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_F77\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_F77\"" - cat >conftest.$ac_ext <<_ACEOF + cat > conftest.$ac_ext <<_ACEOF program main end _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then +if ac_fn_f77_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : shlibpath_overrides_runpath=yes fi - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -20390,7 +18903,7 @@ dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -20441,7 +18954,7 @@ - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || @@ -20466,7 +18979,7 @@ # directories. hardcode_action_F77=unsupported fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_F77" >&5 $as_echo "$hardcode_action_F77" >&6; } if test "$hardcode_action_F77" = relink || @@ -20498,337 +19011,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to get verbose linking output from $F77" >&5 -$as_echo_n "checking how to get verbose linking output from $F77... " >&6; } -if test "${ac_cv_prog_f77_v+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_f77_v= -# Try some options frequently used verbose output -for ac_verb in -v -verbose --verbose -V -\#\#\#; do - cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF - -# Compile and link our simple test program by passing a flag (argument -# 1 to this macro) to the Fortran compiler in order to get -# "verbose" output that we can then parse for the Fortran linker -# flags. -ac_save_FFLAGS=$FFLAGS -FFLAGS="$FFLAGS $ac_verb" -eval "set x $ac_link" -shift -$as_echo "$as_me:$LINENO: $*" >&5 -# gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, -# LIBRARY_PATH; skip all such settings. -ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | - grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="` -$as_echo "$ac_f77_v_output" >&5 -FFLAGS=$ac_save_FFLAGS - -rm -rf conftest* - -# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where -# /foo, /bar, and /baz are search directories for the Fortran linker. -# Here, we change these into -L/foo -L/bar -L/baz (and put it first): -ac_f77_v_output="`echo $ac_f77_v_output | - grep 'LPATH is:' | - sed 's|.*LPATH is\(: *[^ ]*\).*|\1|;s|: */| -L/|g'` $ac_f77_v_output" - -# FIXME: we keep getting bitten by quoted arguments; a more general fix -# that detects unbalanced quotes in FLIBS should be implemented -# and (ugh) tested at some point. -case $ac_f77_v_output in - # If we are using xlf then replace all the commas with spaces. - *xlfentry*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/,/ /g'` ;; - - # With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted - # $LIBS confuse us, and the libraries appear later in the output anyway). - *mGLOB_options_string*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/"-mGLOB[^"]*"/ /g'` ;; - - # Portland Group compiler has singly- or doubly-quoted -cmdline argument - # Singly-quoted arguments were reported for versions 5.2-4 and 6.0-4. - # Doubly-quoted arguments were reported for "PGF90/x86 Linux/x86 5.0-2". - *-cmdline\ * | *-ignore\ * | *-def\ *) - ac_f77_v_output=`echo $ac_f77_v_output | sed "\ - s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g - s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g - s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; - - # If we are using Cray Fortran then delete quotes. - *cft90*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/"//g'` ;; -esac - - - # look for -l* and *.a constructs in the output - for ac_arg in $ac_f77_v_output; do - case $ac_arg in - [\\/]*.a | ?:[\\/]*.a | -[lLRu]*) - ac_cv_prog_f77_v=$ac_verb - break 2 ;; - esac - done -done -if test -z "$ac_cv_prog_f77_v"; then - { $as_echo "$as_me:$LINENO: WARNING: cannot determine how to obtain linking information from $F77" >&5 -$as_echo "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;} -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: WARNING: compilation failed" >&5 -$as_echo "$as_me: WARNING: compilation failed" >&2;} -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_v" >&5 -$as_echo "$ac_cv_prog_f77_v" >&6; } -{ $as_echo "$as_me:$LINENO: checking for Fortran 77 libraries of $F77" >&5 -$as_echo_n "checking for Fortran 77 libraries of $F77... " >&6; } -if test "${ac_cv_f77_libs+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "x$FLIBS" != "x"; then - ac_cv_f77_libs="$FLIBS" # Let the user override the test. -else - -cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF - -# Compile and link our simple test program by passing a flag (argument -# 1 to this macro) to the Fortran compiler in order to get -# "verbose" output that we can then parse for the Fortran linker -# flags. -ac_save_FFLAGS=$FFLAGS -FFLAGS="$FFLAGS $ac_cv_prog_f77_v" -eval "set x $ac_link" -shift -$as_echo "$as_me:$LINENO: $*" >&5 -# gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, -# LIBRARY_PATH; skip all such settings. -ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | - grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="` -$as_echo "$ac_f77_v_output" >&5 -FFLAGS=$ac_save_FFLAGS - -rm -rf conftest* - -# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where -# /foo, /bar, and /baz are search directories for the Fortran linker. -# Here, we change these into -L/foo -L/bar -L/baz (and put it first): -ac_f77_v_output="`echo $ac_f77_v_output | - grep 'LPATH is:' | - sed 's|.*LPATH is\(: *[^ ]*\).*|\1|;s|: */| -L/|g'` $ac_f77_v_output" - -# FIXME: we keep getting bitten by quoted arguments; a more general fix -# that detects unbalanced quotes in FLIBS should be implemented -# and (ugh) tested at some point. -case $ac_f77_v_output in - # If we are using xlf then replace all the commas with spaces. - *xlfentry*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/,/ /g'` ;; - - # With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted - # $LIBS confuse us, and the libraries appear later in the output anyway). - *mGLOB_options_string*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/"-mGLOB[^"]*"/ /g'` ;; - - # Portland Group compiler has singly- or doubly-quoted -cmdline argument - # Singly-quoted arguments were reported for versions 5.2-4 and 6.0-4. - # Doubly-quoted arguments were reported for "PGF90/x86 Linux/x86 5.0-2". - *-cmdline\ * | *-ignore\ * | *-def\ *) - ac_f77_v_output=`echo $ac_f77_v_output | sed "\ - s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g - s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g - s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; - - # If we are using Cray Fortran then delete quotes. - *cft90*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/"//g'` ;; -esac - - - -ac_cv_f77_libs= - -# Save positional arguments (if any) -ac_save_positional="$@" - -set X $ac_f77_v_output -while test $# != 1; do - shift - ac_arg=$1 - case $ac_arg in - [\\/]*.a | ?:[\\/]*.a) - ac_exists=false - for ac_i in $ac_cv_f77_libs; do - if test x"$ac_arg" = x"$ac_i"; then - ac_exists=true - break - fi - done - - if test x"$ac_exists" = xtrue; then - : -else - ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" -fi - - ;; - -bI:*) - ac_exists=false - for ac_i in $ac_cv_f77_libs; do - if test x"$ac_arg" = x"$ac_i"; then - ac_exists=true - break - fi - done - - if test x"$ac_exists" = xtrue; then - : -else - if test "$ac_compiler_gnu" = yes; then - for ac_link_opt in $ac_arg; do - ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt" - done -else - ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" -fi -fi - - ;; - # Ignore these flags. - -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*) - ;; - -lkernel32) - test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" - ;; - -[LRuYz]) - # These flags, when seen by themselves, take an argument. - # We remove the space between option and argument and re-iterate - # unless we find an empty arg or a new option (starting with -) - case $2 in - "" | -*);; - *) - ac_arg="$ac_arg$2" - shift; shift - set X $ac_arg "$@" - ;; - esac - ;; - -YP,*) - for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do - ac_exists=false - for ac_i in $ac_cv_f77_libs; do - if test x"$ac_j" = x"$ac_i"; then - ac_exists=true - break - fi - done - - if test x"$ac_exists" = xtrue; then - : -else - ac_arg="$ac_arg $ac_j" - ac_cv_f77_libs="$ac_cv_f77_libs $ac_j" -fi - - done - ;; - -[lLR]*) - ac_exists=false - for ac_i in $ac_cv_f77_libs; do - if test x"$ac_arg" = x"$ac_i"; then - ac_exists=true - break - fi - done - - if test x"$ac_exists" = xtrue; then - : -else - ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" -fi - - ;; - -zallextract*| -zdefaultextract) - ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" - ;; - # Ignore everything else. - esac -done -# restore positional arguments -set X $ac_save_positional; shift - -# We only consider "LD_RUN_PATH" on Solaris systems. If this is seen, -# then we insist that the "run path" must be an absolute path (i.e. it -# must begin with a "/"). -case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - ac_ld_run_path=`$as_echo "$ac_f77_v_output" | - sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'` - test "x$ac_ld_run_path" != x && - if test "$ac_compiler_gnu" = yes; then - for ac_link_opt in $ac_ld_run_path; do - ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt" - done -else - ac_cv_f77_libs="$ac_cv_f77_libs $ac_ld_run_path" -fi - ;; -esac -fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x" - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_libs" >&5 -$as_echo "$ac_cv_f77_libs" >&6; } -FLIBS="$ac_cv_f77_libs" - - -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 - fi @@ -20855,9 +19037,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PYTHON+set}" = set; then +if test "${ac_cv_path_PYTHON+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PYTHON in @@ -20870,14 +19052,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -20885,10 +19067,10 @@ fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then - { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 $as_echo "$PYTHON" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -20902,20 +19084,18 @@ if test "$PYTHON" = :; then - { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 -$as_echo "$as_me: error: no suitable Python interpreter found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 $as_echo_n "checking for $am_display_PYTHON version... " >&6; } -if test "${am_cv_python_version+set}" = set; then +if test "${am_cv_python_version+set}" = set; then : $as_echo_n "(cached) " >&6 else am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"` fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 $as_echo "$am_cv_python_version" >&6; } PYTHON_VERSION=$am_cv_python_version @@ -20927,35 +19107,42 @@ - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 $as_echo_n "checking for $am_display_PYTHON platform... " >&6; } -if test "${am_cv_python_platform+set}" = set; then +if test "${am_cv_python_platform+set}" = set; then : $as_echo_n "(cached) " >&6 else am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"` fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 $as_echo "$am_cv_python_platform" >&6; } PYTHON_PLATFORM=$am_cv_python_platform - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } -if test "${am_cv_python_pythondir+set}" = set; then +if test "${am_cv_python_pythondir+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$prefix" = xNONE then - py_prefix_arg= + am_py_prefix=$ac_default_prefix else - py_prefix_arg=",prefix='$prefix'" + am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null || + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + esac + fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 $as_echo "$am_cv_python_pythondir" >&6; } pythondir=$am_cv_python_pythondir @@ -20964,21 +19151,28 @@ pkgpythondir=\${pythondir}/$PACKAGE - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } -if test "${am_cv_python_pyexecdir+set}" = set; then +if test "${am_cv_python_pyexecdir+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$exec_prefix" = xNONE then - py_exec_prefix_arg=$py_prefix_arg + am_py_exec_prefix=$am_py_prefix else - py_exec_prefix_arg=",prefix='$exec_prefix'" + am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null || + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + esac + fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 $as_echo "$am_cv_python_pyexecdir" >&6; } pyexecdir=$am_cv_python_pyexecdir @@ -20997,7 +19191,7 @@ # Check whether --with-pythondir was given. -if test "${with_pythondir+set}" = set; then +if test "${with_pythondir+set}" = set; then : withval=$with_pythondir; with_pythondir=${withval} else with_pythondir=${prefix}/lib/python2.5/site-packages @@ -21023,12 +19217,10 @@ fi # Check for Python include path - { $as_echo "$as_me:$LINENO: checking for Python include path" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5 $as_echo_n "checking for Python include path... " >&6; } if test -z "$PYTHON" ; then - { { $as_echo "$as_me:$LINENO: error: cannot find Python path" >&5 -$as_echo "$as_me: error: cannot find Python path" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find Python path" "$LINENO" 5 fi # ask distutils which include path we should use @@ -21041,12 +19233,10 @@ print path ' python_path=`$PYTHON -c "$python_cmd"` - { $as_echo "$as_me:$LINENO: result: $python_path" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_path" >&5 $as_echo "$python_path" >&6; } if test -z "$python_path" ; then - { { $as_echo "$as_me:$LINENO: error: cannot find Python include path" >&5 -$as_echo "$as_me: error: cannot find Python include path" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find Python include path" "$LINENO" 5 fi PYTHON_CPPFLAGS=-I$python_path @@ -21055,166 +19245,30 @@ # Check for Python headers usability python_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" - -for ac_header in Python.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> + for ac_header in Python.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default" +if test "x$ac_cv_header_Python_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PYTHON_H 1 _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +else + as_fn_error $? "cannot find usable Python headers" "$LINENO" 5 fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +done -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + CPPFLAGS="$python_save_CPPFLAGS" - ac_header_preproc=no -fi + # Only set this on mingw and cygwin hosts, (only implemented + # for mingw host, for crosscompiling you need to trick this) -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - { { $as_echo "$as_me:$LINENO: error: cannot find usable Python headers" >&5 -$as_echo "$as_me: error: cannot find usable Python headers" >&2;} - { (exit 1); exit 1; }; } -fi - -done - - CPPFLAGS="$python_save_CPPFLAGS" - - # Only set this on mingw and cygwin hosts, (only implemented - # for mingw host, for crosscompiling you need to trick this) - - PYTHON_LDFLAGS="" - case $host_os in - *mingw* | *cygwin* ) - { $as_echo "$as_me:$LINENO: checking for Python LDFLAGS" >&5 -$as_echo_n "checking for Python LDFLAGS... " >&6; } + PYTHON_LDFLAGS="" + case $host_os in + *mingw* | *cygwin* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python LDFLAGS" >&5 +$as_echo_n "checking for Python LDFLAGS... " >&6; } python_cmd=' import distutils.sysconfig @@ -21241,7 +19295,7 @@ fi PYTHON_LDFLAGS="-L$python_stdlib_path -l$libpython_name" - { $as_echo "$as_me:$LINENO: result: $PYTHON_LDFLAGS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_LDFLAGS" >&5 $as_echo "$PYTHON_LDFLAGS" >&6; } # Replace all backslashes in PYTHON Paths with forward slashes pythondir=`echo $pythondir |sed 's,\\\\,/,g'` @@ -21263,9 +19317,9 @@ # Extract the first word of "swig", so it can be a program name with args. set dummy swig; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_SWIG+set}" = set; then +if test "${ac_cv_prog_SWIG+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$SWIG"; then @@ -21276,39 +19330,37 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_SWIG="`which swig`" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi SWIG=$ac_cv_prog_SWIG if test -n "$SWIG"; then - { $as_echo "$as_me:$LINENO: result: $SWIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5 $as_echo "$SWIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$SWIG" ; then - { { $as_echo "$as_me:$LINENO: error: Cannot find 'swig' program. SWIG version >= 1.3.31 required" >&5 -$as_echo "$as_me: error: Cannot find 'swig' program. SWIG version >= 1.3.31 required" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Cannot find 'swig' program. SWIG version >= 1.3.31 required" "$LINENO" 5 SWIG=false elif test -n "1.3.31" ; then - { $as_echo "$as_me:$LINENO: checking for SWIG version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SWIG version" >&5 $as_echo_n "checking for SWIG version... " >&6; } swig_version=`$SWIG -version 2>&1 | \ awk '/^SWIG Version [0-9]+\.[0-9]+\.[0-9]+.*$/ { split($3,a,"[^.0-9]"); print a[1] }'` - { $as_echo "$as_me:$LINENO: result: $swig_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $swig_version" >&5 $as_echo "$swig_version" >&6; } if test -n "$swig_version" ; then swig_version=`echo $swig_version | \ @@ -21316,14 +19368,10 @@ swig_required_version=`echo 1.3.31 | \ awk '{ split($1,a,"\."); print a[1]*1000000+a[2]*1000+a[3] }' 2>/dev/null` if test $swig_required_version -gt $swig_version ; then - { { $as_echo "$as_me:$LINENO: error: SWIG version >= 1.3.31 required" >&5 -$as_echo "$as_me: error: SWIG version >= 1.3.31 required" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "SWIG version >= 1.3.31 required" "$LINENO" 5 fi else - { { $as_echo "$as_me:$LINENO: error: cannot determine SWIG version" >&5 -$as_echo "$as_me: error: cannot determine SWIG version" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot determine SWIG version" "$LINENO" 5 fi fi @@ -21350,9 +19398,9 @@ # Extract the first word of "xmlto", so it can be a program name with args. set dummy xmlto; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_XMLTO+set}" = set; then +if test "${ac_cv_prog_XMLTO+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$XMLTO"; then @@ -21363,24 +19411,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_XMLTO="yes" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi XMLTO=$ac_cv_prog_XMLTO if test -n "$XMLTO"; then - { $as_echo "$as_me:$LINENO: result: $XMLTO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5 $as_echo "$XMLTO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -21394,19 +19442,14 @@ fi - -{ $as_echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 $as_echo_n "checking for socket in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_socket+set}" = set; then +if test "${ac_cv_lib_socket_socket+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -21424,43 +19467,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_socket=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_socket=no + ac_cv_lib_socket_socket=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 $as_echo "$ac_cv_lib_socket_socket" >&6; } -if test "x$ac_cv_lib_socket_socket" = x""yes; then +if test "x$ac_cv_lib_socket_socket" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 _ACEOF @@ -21495,13 +19513,9 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" save_LIBS="$LIBS" LIBS="$PTHREAD_LIBS $LIBS" - { $as_echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 $as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -21519,39 +19533,12 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : acx_pthread_ok=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 $as_echo "$acx_pthread_ok" >&6; } if test x"$acx_pthread_ok" = xno; then PTHREAD_LIBS="" @@ -21613,12 +19600,12 @@ case $flag in none) - { $as_echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 $as_echo_n "checking whether pthreads work without any flags... " >&6; } ;; -*) - { $as_echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 $as_echo_n "checking whether pthreads work with $flag... " >&6; } PTHREAD_CFLAGS="$flag" ;; @@ -21626,9 +19613,9 @@ pthread-config) # Extract the first word of "pthread-config", so it can be a program name with args. set dummy pthread-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_acx_pthread_config+set}" = set; then +if test "${ac_cv_prog_acx_pthread_config+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$acx_pthread_config"; then @@ -21639,14 +19626,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_acx_pthread_config="yes" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no" @@ -21654,10 +19641,10 @@ fi acx_pthread_config=$ac_cv_prog_acx_pthread_config if test -n "$acx_pthread_config"; then - { $as_echo "$as_me:$LINENO: result: $acx_pthread_config" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5 $as_echo "$acx_pthread_config" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -21668,7 +19655,7 @@ ;; *) - { $as_echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 $as_echo_n "checking for the pthreads library -l$flag... " >&6; } PTHREAD_LIBS="-l$flag" ;; @@ -21688,11 +19675,7 @@ # pthread_cleanup_push because it is one of the few pthread # functions on Solaris that doesn't have a non-functional libc stub. # We try pthread_create on general principles. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -21705,43 +19688,16 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : acx_pthread_ok=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" - { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 $as_echo "$acx_pthread_ok" >&6; } if test "x$acx_pthread_ok" = xyes; then break; @@ -21760,15 +19716,11 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - { $as_echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 $as_echo_n "checking for joinable pthread attribute... " >&6; } attr_name=unknown for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -21779,40 +19731,13 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : attr_name=$attr; break -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext done - { $as_echo "$as_me:$LINENO: result: $attr_name" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 $as_echo "$attr_name" >&6; } if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then @@ -21822,14 +19747,14 @@ fi - { $as_echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 $as_echo_n "checking if more special flags are required for pthreads... " >&6; } flag=no case "${host_cpu}-${host_os}" in *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; esac - { $as_echo "$as_me:$LINENO: result: ${flag}" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 $as_echo "${flag}" >&6; } if test "x$flag" != xno; then PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" @@ -21844,9 +19769,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then +if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$PTHREAD_CC"; then @@ -21857,24 +19782,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_PTHREAD_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi PTHREAD_CC=$ac_cv_prog_PTHREAD_CC if test -n "$PTHREAD_CC"; then - { $as_echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 $as_echo "$PTHREAD_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -21897,9 +19822,7 @@ # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: if test x"$acx_pthread_ok" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD 1 -_ACEOF +$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h ot_posix="yes" DEFINES="$DEFINES -DOMNITHREAD_POSIX=1" @@ -21909,59 +19832,32 @@ acx_pthread_ok=no # If no POSIX support found, then check for NT threads - { $as_echo "$as_me:$LINENO: checking for NT threads" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NT threads" >&5 $as_echo_n "checking for NT threads... " >&6; } - cat >conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #include int main() { InitializeCriticalSection(NULL); return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ot_nt="yes" DEFINES="$DEFINES -DOMNITHREAD_NT=1" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: GNU Radio requires POSIX threads. pthreads not found. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: GNU Radio requires POSIX threads. pthreads not found. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "GNU Radio requires POSIX threads. pthreads not found. +See \`config.log' for more details" "$LINENO" 5 ; } fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: result: yes" >&5 +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi @@ -21990,17 +19886,13 @@ save_LIBS="$LIBS" - { $as_echo "$as_me:$LINENO: checking for library containing clock_gettime" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 $as_echo_n "checking for library containing clock_gettime... " >&6; } -if test "${ac_cv_search_clock_gettime+set}" = set; then +if test "${ac_cv_search_clock_gettime+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -22025,154 +19917,36 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_clock_gettime=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_clock_gettime+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_clock_gettime+set}" = set; then : break fi done -if test "${ac_cv_search_clock_gettime+set}" = set; then - : +if test "${ac_cv_search_clock_gettime+set}" = set; then : + else ac_cv_search_clock_gettime=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_clock_gettime" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 $as_echo "$ac_cv_search_clock_gettime" >&6; } ac_res=$ac_cv_search_clock_gettime -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" PTHREAD_LIBS="$PTHREAD_LIBS $LIBS" fi - - - -for ac_func in clock_gettime gettimeofday nanosleep -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in clock_gettime gettimeofday nanosleep +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -22202,145 +19976,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -for ac_header in sys/ipc.h sys/shm.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in sys/ipc.h sys/shm.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 @@ -22351,17 +19991,13 @@ save_LIBS="$LIBS" - { $as_echo "$as_me:$LINENO: checking for library containing shmat" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shmat" >&5 $as_echo_n "checking for library containing shmat... " >&6; } -if test "${ac_cv_search_shmat+set}" = set; then +if test "${ac_cv_search_shmat+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -22386,58 +20022,31 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_shmat=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_shmat+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_shmat+set}" = set; then : break fi done -if test "${ac_cv_search_shmat+set}" = set; then - : +if test "${ac_cv_search_shmat+set}" = set; then : + else ac_cv_search_shmat=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_shmat" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shmat" >&5 $as_echo "$ac_cv_search_shmat" >&6; } ac_res=$ac_cv_search_shmat -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" IPC_LIBS="$LIBS" else - { $as_echo "$as_me:$LINENO: WARNING: SystemV IPC support not found. " >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SystemV IPC support not found. " >&5 $as_echo "$as_me: WARNING: SystemV IPC support not found. " >&2;} fi @@ -22453,16 +20062,12 @@ -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $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 test "${ac_cv_header_stdc+set}" = set; then +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -22477,48 +20082,23 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + 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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + 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 - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -22528,18 +20108,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + 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 - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -22549,14 +20125,10 @@ 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 + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -22583,64 +20155,31 @@ return 0; } _ACEOF -rm -f 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -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 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +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:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $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 -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if test "${ac_cv_header_sys_wait_h+set}" = set; then +if test "${ac_cv_header_sys_wait_h+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -22661,188 +20200,52 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_sys_wait_h=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_sys_wait_h=no + ac_cv_header_sys_wait_h=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 $as_echo "$ac_cv_header_sys_wait_h" >&6; } if test $ac_cv_header_sys_wait_h = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_WAIT_H 1 -_ACEOF +$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h fi - - - - - - - for ac_header in fcntl.h limits.h strings.h time.h sys/ioctl.h sys/time.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +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 -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +done -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> +for ac_header in linux/ppdev.h dev/ppbus/ppi.h sys/mman.h sys/select.h sys/types.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 -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +done -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +for ac_header in sys/resource.h stdint.h sched.h signal.h sys/syscall.h malloc.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 @@ -22851,150 +20254,36 @@ done - - - - - -for ac_header in linux/ppdev.h dev/ppbus/ppi.h sys/mman.h sys/select.h sys/types.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +for ac_header in netinet/in.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" +if test "x$ac_cv_header_netinet_in_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NETINET_IN_H 1 _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +done -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> +for ac_header in windows.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" +if test "x$ac_cv_header_windows_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINDOWS_H 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +done -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +for ac_header in vec_types.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "vec_types.h" "ac_cv_header_vec_types_h" "$ac_includes_default" +if test "x$ac_cv_header_vec_types_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_VEC_TYPES_H 1 _ACEOF fi @@ -23002,605 +20291,12 @@ done - - - - - -for ac_header in sys/resource.h stdint.h sched.h signal.h sys/syscall.h malloc.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if test "${ac_cv_c_const+set}" = set; then : $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in netinet/in.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in windows.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in vec_types.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -23660,56 +20356,29 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_const=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no + ac_cv_c_const=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 $as_echo "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -cat >>confdefs.h <<\_ACEOF -#define const /**/ -_ACEOF +$as_echo "#define const /**/" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for inline" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then +if test "${ac_cv_c_inline+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; @@ -23718,41 +20387,17 @@ #endif _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_inline=$ac_kw -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext test "$ac_cv_c_inline" != no && break done fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 $as_echo "$ac_cv_c_inline" >&6; } - case $ac_cv_c_inline in inline | yes) ;; *) @@ -23768,102 +20413,9 @@ ;; esac -{ $as_echo "$as_me:$LINENO: checking for size_t" >&5 -$as_echo_n "checking for size_t... " >&6; } -if test "${ac_cv_type_size_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_size_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof (size_t)) - return 0; - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof ((size_t))) - return 0; - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_size_t=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = x""yes; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -$as_echo "$ac_cv_type_size_t" >&6; } -if test "x$ac_cv_type_size_t" = x""yes; then - : else cat >>confdefs.h <<_ACEOF @@ -23872,16 +20424,12 @@ fi -{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if test "${ac_cv_header_time+set}" = set; then +if test "${ac_cv_header_time+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -23896,57 +20444,29 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_time=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_time=no + ac_cv_header_time=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 $as_echo "$ac_cv_header_time" >&6; } if test $ac_cv_header_time = yes; then -cat >>confdefs.h <<\_ACEOF -#define TIME_WITH_SYS_TIME 1 -_ACEOF +$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h fi - - { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then +if test "${ac_cv_c_bigendian+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __APPLE_CC__ not a universal capable compiler @@ -23954,46 +20474,34 @@ typedef int dummy; _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # Check for potential -arch flags. It is not universal unless - # there are some -arch flags. Note that *ppc* also matches - # ppc64. This check is also rather less than ideal. - case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( - *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; - esac -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -24011,30 +20519,9 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -24050,49 +20537,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -24107,30 +20563,9 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to _BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -24145,51 +20580,20 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : # Try to guess by grepping values from an object file. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; @@ -24215,24 +20619,7 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -24244,20 +20631,10 @@ ac_cv_c_bigendian=unknown fi fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -24277,45 +20654,18 @@ return 0; } _ACEOF -rm -f 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_bigendian=no 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 - -( exit $ac_status ) -ac_cv_c_bigendian=yes + ac_cv_c_bigendian=yes fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +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:$LINENO: result: $ac_cv_c_bigendian" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 $as_echo "$ac_cv_c_bigendian" >&6; } case $ac_cv_c_bigendian in #( yes) @@ -24324,30 +20674,21 @@ GR_ARCH_BIGENDIAN=0 ;; #( universal) -cat >>confdefs.h <<\_ACEOF -#define AC_APPLE_UNIVERSAL_BUILD 1 -_ACEOF +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) - { { $as_echo "$as_me:$LINENO: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -$as_echo "$as_me: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac -{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } -if test "${ac_cv_struct_tm+set}" = set; then +if test "${ac_cv_struct_tm+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -24362,57 +20703,30 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_struct_tm=time.h else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_struct_tm=sys/time.h + ac_cv_struct_tm=sys/time.h fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 $as_echo "$ac_cv_struct_tm" >&6; } if test $ac_cv_struct_tm = sys/time.h; then -cat >>confdefs.h <<\_ACEOF -#define TM_IN_SYS_TIME 1 -_ACEOF +$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 $as_echo_n "checking for working alloca.h... " >&6; } -if test "${ac_cv_working_alloca_h+set}" = set; then +if test "${ac_cv_working_alloca_h+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -24424,59 +20738,28 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_working_alloca_h=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_working_alloca_h=no + ac_cv_working_alloca_h=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 $as_echo "$ac_cv_working_alloca_h" >&6; } if test $ac_cv_working_alloca_h = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALLOCA_H 1 -_ACEOF +$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for alloca" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 $as_echo_n "checking for alloca... " >&6; } -if test "${ac_cv_func_alloca_works+set}" = set; then +if test "${ac_cv_func_alloca_works+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __GNUC__ # define alloca __builtin_alloca @@ -24508,47 +20791,20 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_func_alloca_works=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_alloca_works=no + ac_cv_func_alloca_works=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 $as_echo "$ac_cv_func_alloca_works" >&6; } if test $ac_cv_func_alloca_works = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALLOCA 1 -_ACEOF +$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h else # The SVR3 libPW and SVR4 libucb both contain incompatible functions @@ -24558,21 +20814,15 @@ ALLOCA=\${LIBOBJDIR}alloca.$ac_objext -cat >>confdefs.h <<\_ACEOF -#define C_ALLOCA 1 -_ACEOF +$as_echo "#define C_ALLOCA 1" >>confdefs.h -{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if test "${ac_cv_os_cray+set}" = set; then +if test "${ac_cv_os_cray+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined CRAY && ! defined CRAY2 webecray @@ -24582,7 +20832,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then + $EGREP "webecray" >/dev/null 2>&1; then : ac_cv_os_cray=yes else ac_cv_os_cray=no @@ -24590,101 +20840,13 @@ rm -f conftest* fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 $as_echo "$ac_cv_os_cray" >&6; } if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func @@ -24696,19 +20858,15 @@ done fi -{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 $as_echo_n "checking stack direction for C alloca... " >&6; } -if test "${ac_cv_c_stack_direction+set}" = set; then +if test "${ac_cv_c_stack_direction+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_c_stack_direction=0 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -24731,46 +20889,18 @@ return find_stack_direction () < 0; } _ACEOF -rm -f 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_stack_direction=1 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 - -( exit $ac_status ) -ac_cv_c_stack_direction=-1 + ac_cv_c_stack_direction=-1 fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 $as_echo "$ac_cv_c_stack_direction" >&6; } - cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction _ACEOF @@ -24783,204 +20913,24 @@ # Check for allocing memory alignment functions # If 'posix_memalign' is available, use it solely. - -for ac_func in posix_memalign -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in posix_memalign +do : + ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign" +if test "x$ac_cv_func_posix_memalign" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_POSIX_MEMALIGN 1 _ACEOF else # Otherwise, check for valloc and the # (a-priori known) alignment of 'malloc' - -for ac_func in valloc -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in valloc +do : + ac_fn_c_check_func "$LINENO" "valloc" "ac_cv_func_valloc" +if test "x$ac_cv_func_valloc" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_VALLOC 1 _ACEOF fi @@ -24994,10 +20944,10 @@ *) ;; esac if test $aligned_malloc = 0; then - { $as_echo "$as_me:$LINENO: result: malloc has unknown alignment." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: malloc has unknown alignment." >&5 $as_echo "malloc has unknown alignment." >&6; } else - { $as_echo "$as_me:$LINENO: result: malloc is $aligned_malloc-byte aligned." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: malloc is $aligned_malloc-byte aligned." >&5 $as_echo "malloc is $aligned_malloc-byte aligned." >&6; } fi @@ -25010,201 +20960,25 @@ done -if test "${ac_cv_func_setvbuf_reversed+set}" = set; then +if test "${ac_cv_func_setvbuf_reversed+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_func_setvbuf_reversed=no fi - for ac_func in vprintf -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" +if test "x$ac_cv_func_vprintf" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -{ $as_echo "$as_me:$LINENO: checking for _doprnt" >&5 -$as_echo_n "checking for _doprnt... " >&6; } -if test "${ac_cv_func__doprnt+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define _doprnt to an innocuous variant, in case declares _doprnt. - For example, HP-UX 11i declares gettimeofday. */ -#define _doprnt innocuous__doprnt - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef _doprnt - -/* 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 _doprnt (); -/* 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__doprnt || defined __stub____doprnt -choke me -#endif - -int -main () -{ -return _doprnt (); - ; - return 0; -} +#define HAVE_VPRINTF 1 _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func__doprnt=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func__doprnt=no -fi +ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" +if test "x$ac_cv_func__doprnt" = x""yes; then : -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 -$as_echo "$ac_cv_func__doprnt" >&6; } -if test "x$ac_cv_func__doprnt" = x""yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DOPRNT 1 -_ACEOF +$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h fi @@ -25212,107 +20986,11 @@ done - - - - - - - - for ac_func in mmap select socket strcspn strerror strspn getpagesize sysconf -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -25320,103 +20998,11 @@ fi done - - - - for ac_func in snprintf gettimeofday nanosleep sched_setscheduler -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -25424,104 +21010,11 @@ fi done - - - - - for ac_func in modf sqrt sigaction sigprocmask pthread_sigmask -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -25529,120 +21022,26 @@ fi done - for ac_func in sched_setaffinity -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + ac_fn_c_check_func "$LINENO" "sched_setaffinity" "ac_cv_func_sched_setaffinity" +if test "x$ac_cv_func_sched_setaffinity" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_SCHED_SETAFFINITY 1 _ACEOF fi done -{ $as_echo "$as_me:$LINENO: checking for sincos in -lm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sincos in -lm" >&5 $as_echo_n "checking for sincos in -lm... " >&6; } -if test "${ac_cv_lib_m_sincos+set}" = set; then +if test "${ac_cv_lib_m_sincos+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -25660,62 +21059,31 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_sincos=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_m_sincos=no + ac_cv_lib_m_sincos=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sincos" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sincos" >&5 $as_echo "$ac_cv_lib_m_sincos" >&6; } -if test "x$ac_cv_lib_m_sincos" = x""yes; then +if test "x$ac_cv_lib_m_sincos" = x""yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_SINCOS 1 -_ACEOF +$as_echo "#define HAVE_SINCOS 1" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for sincosf in -lm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sincosf in -lm" >&5 $as_echo_n "checking for sincosf in -lm... " >&6; } -if test "${ac_cv_lib_m_sincosf+set}" = set; then +if test "${ac_cv_lib_m_sincosf+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -25733,62 +21101,31 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_sincosf=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_m_sincosf=no + ac_cv_lib_m_sincosf=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sincosf" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sincosf" >&5 $as_echo "$ac_cv_lib_m_sincosf" >&6; } -if test "x$ac_cv_lib_m_sincosf" = x""yes; then +if test "x$ac_cv_lib_m_sincosf" = x""yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_SINCOSF 1 -_ACEOF +$as_echo "#define HAVE_SINCOSF 1" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for sinf in -lm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sinf in -lm" >&5 $as_echo_n "checking for sinf in -lm... " >&6; } -if test "${ac_cv_lib_m_sinf+set}" = set; then +if test "${ac_cv_lib_m_sinf+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -25806,62 +21143,31 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_sinf=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_m_sinf=no + ac_cv_lib_m_sinf=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sinf" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sinf" >&5 $as_echo "$ac_cv_lib_m_sinf" >&6; } -if test "x$ac_cv_lib_m_sinf" = x""yes; then +if test "x$ac_cv_lib_m_sinf" = x""yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_SINF 1 -_ACEOF +$as_echo "#define HAVE_SINF 1" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for cosf in -lm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cosf in -lm" >&5 $as_echo_n "checking for cosf in -lm... " >&6; } -if test "${ac_cv_lib_m_cosf+set}" = set; then +if test "${ac_cv_lib_m_cosf+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -25875,66 +21181,35 @@ main () { return cosf (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_cosf=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_m_cosf=no + ac_cv_lib_m_cosf=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_cosf" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cosf" >&5 $as_echo "$ac_cv_lib_m_cosf" >&6; } -if test "x$ac_cv_lib_m_cosf" = x""yes; then +if test "x$ac_cv_lib_m_cosf" = x""yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_COSF 1 -_ACEOF +$as_echo "#define HAVE_COSF 1" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for trunc in -lm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for trunc in -lm" >&5 $as_echo_n "checking for trunc in -lm... " >&6; } -if test "${ac_cv_lib_m_trunc+set}" = set; then +if test "${ac_cv_lib_m_trunc+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -25952,62 +21227,31 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_trunc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_m_trunc=no + ac_cv_lib_m_trunc=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_trunc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_trunc" >&5 $as_echo "$ac_cv_lib_m_trunc" >&6; } -if test "x$ac_cv_lib_m_trunc" = x""yes; then +if test "x$ac_cv_lib_m_trunc" = x""yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_TRUNC 1 -_ACEOF +$as_echo "#define HAVE_TRUNC 1" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for exp10 in -lm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exp10 in -lm" >&5 $as_echo_n "checking for exp10 in -lm... " >&6; } -if test "${ac_cv_lib_m_exp10+set}" = set; then +if test "${ac_cv_lib_m_exp10+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -26025,62 +21269,31 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_exp10=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_m_exp10=no + ac_cv_lib_m_exp10=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_exp10" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_exp10" >&5 $as_echo "$ac_cv_lib_m_exp10" >&6; } -if test "x$ac_cv_lib_m_exp10" = x""yes; then +if test "x$ac_cv_lib_m_exp10" = x""yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_EXP10 1 -_ACEOF +$as_echo "#define HAVE_EXP10 1" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for log2 in -lm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5 $as_echo_n "checking for log2 in -lm... " >&6; } -if test "${ac_cv_lib_m_log2+set}" = set; then +if test "${ac_cv_lib_m_log2+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -26098,47 +21311,20 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_log2=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_m_log2=no + ac_cv_lib_m_log2=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_log2" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_log2" >&5 $as_echo "$ac_cv_lib_m_log2" >&6; } -if test "x$ac_cv_lib_m_log2" = x""yes; then +if test "x$ac_cv_lib_m_log2" = x""yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_LOG2 1 -_ACEOF +$as_echo "#define HAVE_LOG2 1" >>confdefs.h fi @@ -26147,20 +21333,15 @@ - SHM_OPEN_LIBS="" save_LIBS="$LIBS" - { $as_echo "$as_me:$LINENO: checking for library containing shm_open" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5 $as_echo_n "checking for library containing shm_open... " >&6; } -if test "${ac_cv_search_shm_open+set}" = set; then +if test "${ac_cv_search_shm_open+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -26185,154 +21366,37 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_shm_open=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_shm_open+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_shm_open+set}" = set; then : break fi done -if test "${ac_cv_search_shm_open+set}" = set; then - : +if test "${ac_cv_search_shm_open+set}" = set; then : + else ac_cv_search_shm_open=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_shm_open" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shm_open" >&5 $as_echo "$ac_cv_search_shm_open" >&6; } ac_res=$ac_cv_search_shm_open -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" SHM_OPEN_LIBS="$LIBS" fi - -for ac_func in shm_open -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in shm_open +do : + ac_fn_c_check_func "$LINENO" "shm_open" "ac_cv_func_shm_open" +if test "x$ac_cv_func_shm_open" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_SHM_OPEN 1 _ACEOF fi @@ -26344,7 +21408,7 @@ # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -26353,7 +21417,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -26383,13 +21447,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then +if test "${lt_cv_path_LD+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -26420,18 +21484,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then +if test "${lt_cv_prog_gnu_ld+set}" = set; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -26444,7 +21506,7 @@ ;; esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -26458,16 +21520,16 @@ # on Mingw32 extra LDFLAGS are required to ease global variable linking LIBGNURADIO_CORE_EXTRA_LDFLAGS="" -{ $as_echo "$as_me:$LINENO: checking whether $LD accepts --enable-runtime-pseudo-reloc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts --enable-runtime-pseudo-reloc" >&5 $as_echo_n "checking whether $LD accepts --enable-runtime-pseudo-reloc... " >&6; } if ${LD} --enable-runtime-pseudo-reloc --version >/dev/null 2>&1 then # libtool requires the quotes LIBGNURADIO_CORE_EXTRA_LDFLAGS="\"-Wl,--enable-runtime-pseudo-reloc\"" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -26475,9 +21537,10 @@ - { $as_echo "$as_me:$LINENO: checking for CreateFileMapping function" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CreateFileMapping function" >&5 $as_echo_n "checking for CreateFileMapping function... " >&6; } - cat >conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include int main (int argc, char **argv) @@ -26496,40 +21559,17 @@ } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : HAVE_CREATEFILEMAPPING=yes -cat >>confdefs.h <<\_ACEOF -#define HAVE_CREATEFILEMAPPING 1 -_ACEOF +$as_echo "#define HAVE_CREATEFILEMAPPING 1" >>confdefs.h else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - HAVE_CREATEFILEMAPPING=no + HAVE_CREATEFILEMAPPING=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: result: $HAVE_CREATEFILEMAPPING" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_CREATEFILEMAPPING" >&5 $as_echo "$HAVE_CREATEFILEMAPPING" >&6; } if test x$HAVE_CREATEFILEMAPPING = xyes; then HAVE_CREATEFILEMAPPING_TRUE= @@ -26543,146 +21583,11 @@ - - - for ac_header in sys/types.h fcntl.h io.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +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 @@ -26691,524 +21596,50 @@ done - for ac_header in windows.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" +if test "x$ac_cv_header_windows_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_WINDOWS_H 1 _ACEOF fi done - - for ac_header in winioctl.h winbase.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.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" " #if HAVE_WINDOWS_H #include #endif - -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +" +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_func in getopt usleep gettimeofday nanosleep rand srand random srandom sleep sigaction -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -{ $as_echo "$as_me:$LINENO: checking for struct timezone" >&5 -$as_echo_n "checking for struct timezone... " >&6; } -if test "${ac_cv_type_struct_timezone+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_struct_timezone=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #if HAVE_SYS_TYPES_H - # include - #endif - #if TIME_WITH_SYS_TIME - # include - # include - #else - # if HAVE_SYS_TIME_H - # include - # else - # include - # endif - #endif - - -int -main () -{ -if (sizeof (struct timezone)) - return 0; - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #if HAVE_SYS_TYPES_H - # include - #endif - #if TIME_WITH_SYS_TIME - # include - # include - #else - # if HAVE_SYS_TIME_H - # include - # else - # include - # endif - #endif - - -int -main () -{ -if (sizeof ((struct timezone))) - return 0; - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_struct_timezone=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_timezone" >&5 -$as_echo "$ac_cv_type_struct_timezone" >&6; } -if test "x$ac_cv_type_struct_timezone" = x""yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_TIMEZONE 1 -_ACEOF - - -fi -{ $as_echo "$as_me:$LINENO: checking for struct timespec" >&5 -$as_echo_n "checking for struct timespec... " >&6; } -if test "${ac_cv_type_struct_timespec+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_struct_timespec=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #if HAVE_SYS_TYPES_H - # include - #endif - #if TIME_WITH_SYS_TIME - # include - # include - #else - # if HAVE_SYS_TIME_H - # include - # else - # include - # endif - #endif - - -int -main () -{ -if (sizeof (struct timespec)) - return 0; - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + +done + + +for ac_func in getopt usleep gettimeofday nanosleep rand srand random srandom sleep sigaction +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +fi +done + +ac_fn_c_check_type "$LINENO" "struct timezone" "ac_cv_type_struct_timezone" " #if HAVE_SYS_TYPES_H # include #endif @@ -27223,75 +21654,16 @@ # endif #endif - -int -main () -{ -if (sizeof ((struct timespec))) - return 0; - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_struct_timespec=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_timespec" >&5 -$as_echo "$ac_cv_type_struct_timespec" >&6; } -if test "x$ac_cv_type_struct_timespec" = x""yes; then +" +if test "x$ac_cv_type_struct_timezone" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_TIMESPEC 1 +#define HAVE_STRUCT_TIMEZONE 1 _ACEOF fi -{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5 -$as_echo_n "checking for ssize_t... " >&6; } -if test "${ac_cv_type_ssize_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_ssize_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - +ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" " #if HAVE_SYS_TYPES_H # include #endif @@ -27306,41 +21678,16 @@ # endif #endif +" +if test "x$ac_cv_type_struct_timespec" = x""yes; then : -int -main () -{ -if (sizeof (ssize_t)) - return 0; - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_TIMESPEC 1 _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + +fi +ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" " #if HAVE_SYS_TYPES_H # include #endif @@ -27355,55 +21702,8 @@ # endif #endif - -int -main () -{ -if (sizeof ((ssize_t))) - return 0; - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_ssize_t=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 -$as_echo "$ac_cv_type_ssize_t" >&6; } -if test "x$ac_cv_type_ssize_t" = x""yes; then +" +if test "x$ac_cv_type_ssize_t" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SSIZE_T 1 @@ -27413,126 +21713,51 @@ fi +ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt" +if test "x$ac_cv_func_getopt" = x""yes; then : + $as_echo "#define HAVE_GETOPT 1" >>confdefs.h - - -for ac_func in getopt usleep gettimeofday -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif + case " $LIBOBJS " in + *" getopt.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS getopt.$ac_objext" + ;; +esac -#undef $ac_func +fi -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif +ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep" +if test "x$ac_cv_func_usleep" = x""yes; then : + $as_echo "#define HAVE_USLEEP 1" >>confdefs.h -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + case " $LIBOBJS " in + *" usleep.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS usleep.$ac_objext" + ;; +esac - eval "$as_ac_var=no" fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" +if test "x$ac_cv_func_gettimeofday" = x""yes; then : + $as_echo "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h else case " $LIBOBJS " in - *" $ac_func.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + *" gettimeofday.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS gettimeofday.$ac_objext" ;; esac fi -done -{ $as_echo "$as_me:$LINENO: checking for Sleep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Sleep" >&5 $as_echo_n "checking for Sleep... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -27545,54 +21770,23 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_SSLEEP 1 -_ACEOF +$as_echo "#define HAVE_SSLEEP 1" >>confdefs.h - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -{ $as_echo "$as_me:$LINENO: checking whether mkdir accepts only one arg" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir accepts only one arg" >&5 $as_echo_n "checking whether mkdir accepts only one arg... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -27607,40 +21801,17 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define MKDIR_TAKES_ONE_ARG /**/ -_ACEOF +$as_echo "#define MKDIR_TAKES_ONE_ARG /**/" >>confdefs.h else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -27648,12 +21819,11 @@ - # Extract the first word of "dot", so it can be a program name with args. set dummy dot; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_HAVE_DOT+set}" = set; then +if test "${ac_cv_prog_HAVE_DOT+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$HAVE_DOT"; then @@ -27664,14 +21834,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_HAVE_DOT="YES" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_prog_HAVE_DOT" && ac_cv_prog_HAVE_DOT="NO" @@ -27679,10 +21849,10 @@ fi HAVE_DOT=$ac_cv_prog_HAVE_DOT if test -n "$HAVE_DOT"; then - { $as_echo "$as_me:$LINENO: result: $HAVE_DOT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_DOT" >&5 $as_echo "$HAVE_DOT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -27690,13 +21860,17 @@ + + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -27709,14 +21883,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -27724,10 +21898,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 $as_echo "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -27737,9 +21911,9 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -27752,14 +21926,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -27767,10 +21941,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 $as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -27779,7 +21953,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -27791,117 +21965,61 @@ fi if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.18 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } PKG_CONFIG="" fi - fi - - pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for FFTW3F" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFTW3F" >&5 $as_echo_n "checking for FFTW3F... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$FFTW3F_CFLAGS"; then - pkg_cv_FFTW3F_CFLAGS="$FFTW3F_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\"") >&5 +if test -n "$FFTW3F_CFLAGS"; then + pkg_cv_FFTW3F_CFLAGS="$FFTW3F_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "fftw3f >= 3.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_FFTW3F_CFLAGS=`$PKG_CONFIG --cflags "fftw3f >= 3.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi - -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$FFTW3F_LIBS"; then - pkg_cv_FFTW3F_LIBS="$FFTW3F_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "fftw3f >= 3.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_FFTW3F_LIBS=`$PKG_CONFIG --libs --static "fftw3f >= 3.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_FFTW3F_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_FFTW3F_LIBS="$_pkg_tmp" -else - if test -n "$PKG_CONFIG"; then - if test -n "$FFTW3F_LIBS"; then - pkg_cv_FFTW3F_LIBS="$FFTW3F_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "fftw3f >= 3.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_FFTW3F_LIBS=`$PKG_CONFIG --libs --static "fftw3f >= 3.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -fi - -if test -n "$PKG_CONFIG"; then - if test -n "$FFTW3F_INCLUDEDIR"; then - pkg_cv_FFTW3F_INCLUDEDIR="$FFTW3F_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\"") >&5 +if test -n "$FFTW3F_LIBS"; then + pkg_cv_FFTW3F_LIBS="$FFTW3F_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "fftw3f >= 3.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_FFTW3F_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "fftw3f >= 3.0" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FFTW3F_LIBS=`$PKG_CONFIG --libs "fftw3f >= 3.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi - if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -27909,25 +22027,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FFTW3F_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fftw3f >= 3.0"` + FFTW3F_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fftw3f >= 3.0" 2>&1` else - FFTW3F_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fftw3f >= 3.0"` + FFTW3F_PKG_ERRORS=`$PKG_CONFIG --print-errors "fftw3f >= 3.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$FFTW3F_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (fftw3f >= 3.0) were not met: - -$FFTW3F_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables FFTW3F_CFLAGS -and FFTW3F_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -$as_echo "$as_me: error: Package requirements (fftw3f >= 3.0) were not met: + as_fn_error $? "Package requirements (fftw3f >= 3.0) were not met: $FFTW3F_PKG_ERRORS @@ -27936,23 +22043,13 @@ Alternatively, you may set the environment variables FFTW3F_CFLAGS and FFTW3F_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables FFTW3F_CFLAGS -and FFTW3F_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -27961,36 +22058,24 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details" "$LINENO" 5 ; } else FFTW3F_CFLAGS=$pkg_cv_FFTW3F_CFLAGS FFTW3F_LIBS=$pkg_cv_FFTW3F_LIBS - FFTW3F_INCLUDEDIR=$pkg_cv_FFTW3F_INCLUDEDIR - - FFTW3F_CPPFLAGS="" - for flag in $FFTW3F_CFLAGS; do - case $flag in - -I* | -D* | -U*) FFTW3F_CPPFLAGS="$FFTW3F_CPPFLAGS $flag" ;; - esac - done - pkg_cv_FFTW3F_CPPFLAGS=$FFTW3F_CPPFLAGS - - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi # Check whether --enable-doxygen was given. -if test "${enable_doxygen+set}" = set; then +if test "${enable_doxygen+set}" = set; then : enableval=$enable_doxygen; fi # Check whether --enable-dot was given. -if test "${enable_dot+set}" = set; then +if test "${enable_dot+set}" = set; then : enableval=$enable_dot; fi @@ -28000,9 +22085,9 @@ else # Extract the first word of "doxygen", so it can be a program name with args. set dummy doxygen; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_DOXYGEN+set}" = set; then +if test "${ac_cv_path_DOXYGEN+set}" = set; then : $as_echo_n "(cached) " >&6 else case $DOXYGEN in @@ -28015,14 +22100,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -28030,19 +22115,17 @@ fi DOXYGEN=$ac_cv_path_DOXYGEN if test -n "$DOXYGEN"; then - { $as_echo "$as_me:$LINENO: result: $DOXYGEN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 $as_echo "$DOXYGEN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test x$DOXYGEN = x; then if test "x$enable_doxygen" = xyes; then - { { $as_echo "$as_me:$LINENO: error: could not find doxygen" >&5 -$as_echo "$as_me: error: could not find doxygen" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not find doxygen" "$LINENO" 5 fi enable_doc=no generate_docs= @@ -28051,9 +22134,9 @@ generate_docs=docs # Extract the first word of "dot", so it can be a program name with args. set dummy dot; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_DOT+set}" = set; then +if test "${ac_cv_path_DOT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $DOT in @@ -28066,14 +22149,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -28081,10 +22164,10 @@ fi DOT=$ac_cv_path_DOT if test -n "$DOT"; then - { $as_echo "$as_me:$LINENO: result: $DOT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5 $as_echo "$DOT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -28103,9 +22186,7 @@ if test x$DOT = x; then if test "x$enable_dot" = xyes; then - { { $as_echo "$as_me:$LINENO: error: could not find dot" >&5 -$as_echo "$as_me: error: could not find dot" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not find dot" "$LINENO" 5 fi enable_dot=no else @@ -28124,7 +22205,7 @@ # Check whether --with-md-cpu was given. -if test "${with_md_cpu+set}" = set; then +if test "${with_md_cpu+set}" = set; then : withval=$with_md_cpu; cf_with_md_cpu="$withval" else cf_with_md_cpu="$host_cpu" @@ -28139,7 +22220,7 @@ esac # Check whether --enable-altivec was given. -if test "${enable_altivec+set}" = set; then +if test "${enable_altivec+set}" = set; then : enableval=$enable_altivec; if test $MD_CPU = powerpc; then case "$enableval" in (no) MD_CPU=generic ;; @@ -28148,15 +22229,15 @@ echo 'void f(){}' > conftest.c for i in -mabi=altivec -maltivec do - { $as_echo "$as_me:$LINENO: checking whether $CC accepts $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts $i" >&5 $as_echo_n "checking whether $CC accepts $i... " >&6; } if test -z "`${CC} $i -c conftest.c 2>&1`" then lf_CFLAGS="${lf_CFLAGS} $i" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi done @@ -28167,15 +22248,15 @@ echo 'void f(){}' > conftest.cc for i in -mabi=altivec -maltivec do - { $as_echo "$as_me:$LINENO: checking whether $CXX accepts $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts $i" >&5 $as_echo_n "checking whether $CXX accepts $i... " >&6; } if test -z "`${CXX} $i -c conftest.cc 2>&1`" then lf_CXXFLAGS="${lf_CXXFLAGS} $i" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi done @@ -28183,9 +22264,7 @@ ;; - (*) { { $as_echo "$as_me:$LINENO: error: Invalid argument ($enableval) to --enable-altivec" >&5 -$as_echo "$as_me: error: Invalid argument ($enableval) to --enable-altivec" >&2;} - { (exit 1); exit 1; }; } ;; + (*) as_fn_error $? "Invalid argument ($enableval) to --enable-altivec" "$LINENO" 5 ;; esac fi else @@ -28194,15 +22273,15 @@ echo 'void f(){}' > conftest.c for i in -mabi=altivec -maltivec do - { $as_echo "$as_me:$LINENO: checking whether $CC accepts $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts $i" >&5 $as_echo_n "checking whether $CC accepts $i... " >&6; } if test -z "`${CC} $i -c conftest.c 2>&1`" then lf_CFLAGS="${lf_CFLAGS} $i" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi done @@ -28213,15 +22292,15 @@ echo 'void f(){}' > conftest.cc for i in -mabi=altivec -maltivec do - { $as_echo "$as_me:$LINENO: checking whether $CXX accepts $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts $i" >&5 $as_echo_n "checking whether $CXX accepts $i... " >&6; } if test -z "`${CXX} $i -c conftest.cc 2>&1`" then lf_CXXFLAGS="${lf_CXXFLAGS} $i" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi done @@ -28233,9 +22312,9 @@ - { $as_echo "$as_me:$LINENO: checking for machine dependent speedups" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for machine dependent speedups" >&5 $as_echo_n "checking for machine dependent speedups... " >&6; } - { $as_echo "$as_me:$LINENO: result: $MD_CPU" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MD_CPU" >&5 $as_echo "$MD_CPU" >&6; } @@ -28275,109 +22354,54 @@ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cppunit\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit\""; } >&5 ($PKG_CONFIG --exists --print-errors "cppunit") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - - + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for CPPUNIT" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPPUNIT" >&5 $as_echo_n "checking for CPPUNIT... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$CPPUNIT_CFLAGS"; then - pkg_cv_CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\"") >&5 +if test -n "$CPPUNIT_CFLAGS"; then + pkg_cv_CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\""; } >&5 ($PKG_CONFIG --exists --print-errors "cppunit >= 1.9.14") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.9.14" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi - -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$CPPUNIT_LIBS"; then - pkg_cv_CPPUNIT_LIBS="$CPPUNIT_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\"") >&5 - ($PKG_CONFIG --exists --print-errors "cppunit >= 1.9.14") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs --static "cppunit >= 1.9.14" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_CPPUNIT_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_CPPUNIT_LIBS="$_pkg_tmp" -else - if test -n "$PKG_CONFIG"; then - if test -n "$CPPUNIT_LIBS"; then - pkg_cv_CPPUNIT_LIBS="$CPPUNIT_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\"") >&5 - ($PKG_CONFIG --exists --print-errors "cppunit >= 1.9.14") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs --static "cppunit >= 1.9.14" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi + else + pkg_failed=untried fi - -if test -n "$PKG_CONFIG"; then - if test -n "$CPPUNIT_INCLUDEDIR"; then - pkg_cv_CPPUNIT_INCLUDEDIR="$CPPUNIT_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\"") >&5 +if test -n "$CPPUNIT_LIBS"; then + pkg_cv_CPPUNIT_LIBS="$CPPUNIT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\""; } >&5 ($PKG_CONFIG --exists --print-errors "cppunit >= 1.9.14") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_CPPUNIT_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "cppunit >= 1.9.14" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.9.14" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi - if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28385,25 +22409,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cppunit >= 1.9.14"` + CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cppunit >= 1.9.14" 2>&1` else - CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cppunit >= 1.9.14"` + CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "cppunit >= 1.9.14" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$CPPUNIT_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (cppunit >= 1.9.14) were not met: - -$CPPUNIT_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables CPPUNIT_CFLAGS -and CPPUNIT_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -$as_echo "$as_me: error: Package requirements (cppunit >= 1.9.14) were not met: + as_fn_error $? "Package requirements (cppunit >= 1.9.14) were not met: $CPPUNIT_PKG_ERRORS @@ -28412,23 +22425,13 @@ Alternatively, you may set the environment variables CPPUNIT_CFLAGS and CPPUNIT_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables CPPUNIT_CFLAGS -and CPPUNIT_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28437,32 +22440,20 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details" "$LINENO" 5 ; } else CPPUNIT_CFLAGS=$pkg_cv_CPPUNIT_CFLAGS CPPUNIT_LIBS=$pkg_cv_CPPUNIT_LIBS - CPPUNIT_INCLUDEDIR=$pkg_cv_CPPUNIT_INCLUDEDIR - - CPPUNIT_CPPFLAGS="" - for flag in $CPPUNIT_CFLAGS; do - case $flag in - -I* | -D* | -U*) CPPUNIT_CPPFLAGS="$CPPUNIT_CPPFLAGS $flag" ;; - esac - done - pkg_cv_CPPUNIT_CPPFLAGS=$CPPUNIT_CPPFLAGS - - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi else # Check whether --with-cppunit-prefix was given. -if test "${with_cppunit_prefix+set}" = set; then +if test "${with_cppunit_prefix+set}" = set; then : withval=$with_cppunit_prefix; cppunit_config_prefix="$withval" else cppunit_config_prefix="" @@ -28470,7 +22461,7 @@ # Check whether --with-cppunit-exec-prefix was given. -if test "${with_cppunit_exec_prefix+set}" = set; then +if test "${with_cppunit_exec_prefix+set}" = set; then : withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval" else cppunit_config_exec_prefix="" @@ -28492,9 +22483,9 @@ # Extract the first word of "cppunit-config", so it can be a program name with args. set dummy cppunit-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then +if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $CPPUNIT_CONFIG in @@ -28507,14 +22498,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no" @@ -28523,17 +22514,17 @@ fi CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG if test -n "$CPPUNIT_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $CPPUNIT_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5 $as_echo "$CPPUNIT_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi cppunit_version_min=1.9.14 - { $as_echo "$as_me:$LINENO: checking for Cppunit - version >= $cppunit_version_min" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cppunit - version >= $cppunit_version_min" >&5 $as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; } no_cppunit="" if test "$CPPUNIT_CONFIG" = "no" ; then @@ -28566,10 +22557,10 @@ $cppunit_micro_version \>= $cppunit_micro_min ` if test "$cppunit_version_proper" = "1" ; then - { $as_echo "$as_me:$LINENO: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5 $as_echo "$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } no_cppunit=yes fi @@ -28580,9 +22571,7 @@ else CPPUNIT_CFLAGS="" CPPUNIT_LIBS="" - { { $as_echo "$as_me:$LINENO: error: GNU Radio requires cppunit. Stop" >&5 -$as_echo "$as_me: error: GNU Radio requires cppunit. Stop" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "GNU Radio requires cppunit. Stop" "$LINENO" 5 fi @@ -28595,9 +22584,9 @@ # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GUILE+set}" = set; then +if test "${ac_cv_path_GUILE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GUILE in @@ -28610,14 +22599,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GUILE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -28625,10 +22614,10 @@ fi GUILE=$ac_cv_path_GUILE if test -n "$GUILE"; then - { $as_echo "$as_me:$LINENO: result: $GUILE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUILE" >&5 $as_echo "$GUILE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -28638,7 +22627,7 @@ # Check whether --with-boost was given. -if test "${with_boost+set}" = set; then +if test "${with_boost+set}" = set; then : withval=$with_boost; if test "$withval" = "no"; then want_boost="no" @@ -28658,15 +22647,13 @@ # Check whether --with-boost-libdir was given. -if test "${with_boost_libdir+set}" = set; then +if test "${with_boost_libdir+set}" = set; then : withval=$with_boost_libdir; if test -d $withval then ac_boost_lib_path="$withval" else - { { $as_echo "$as_me:$LINENO: error: --with-boost-libdir expected directory name" >&5 -$as_echo "$as_me: error: --with-boost-libdir expected directory name" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "--with-boost-libdir expected directory name" "$LINENO" 5 fi else @@ -28685,7 +22672,7 @@ boost_lib_version_req_sub_minor="0" fi WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` - { $as_echo "$as_me:$LINENO: checking for boost >= $boost_lib_version_req" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boost >= $boost_lib_version_req" >&5 $as_echo_n "checking for boost >= $boost_lib_version_req... " >&6; } succeeded=no @@ -28728,11 +22715,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -28751,36 +22734,13 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } succeeded=yes found_system=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -28835,11 +22795,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -28858,36 +22814,13 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } succeeded=yes found_system=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -28900,26 +22833,19 @@ fi if test "$succeeded" != "yes" ; then - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if test "$_version" = "0" ; then - { { $as_echo "$as_me:$LINENO: error: we could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). -If you are sure you have boost installed, then check your version number looking in ." >&5 -$as_echo "$as_me: error: we could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). -If you are sure you have boost installed, then check your version number looking in ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "we could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). +If you are sure you have boost installed, then check your version number looking in ." "$LINENO" 5 else - { { $as_echo "$as_me:$LINENO: error: your boost libraries seem to old (version $_version)." >&5 -$as_echo "$as_me: error: your boost libraries seem to old (version $_version)." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "your boost libraries seem to old (version $_version)." "$LINENO" 5 fi else -cat >>confdefs.h <<\_ACEOF -#define HAVE_BOOST 1 -_ACEOF +$as_echo "#define HAVE_BOOST 1" >>confdefs.h fi fi @@ -28932,7 +22858,7 @@ # Check whether --with-boost-thread was given. -if test "${with_boost_thread+set}" = set; then +if test "${with_boost_thread+set}" = set; then : withval=$with_boost_thread; if test "$withval" = "no"; then want_boost="no" @@ -28964,9 +22890,9 @@ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS $PTHREAD_LIBS" CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" - { $as_echo "$as_me:$LINENO: checking whether the boost::thread includes are available" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the boost::thread includes are available" >&5 $as_echo_n "checking whether the boost::thread includes are available... " >&6; } -if test "${ax_cv_boost_thread+set}" = set; then +if test "${ax_cv_boost_thread+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_ext=cpp @@ -28975,11 +22901,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -28991,32 +22913,11 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ax_cv_boost_thread=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ax_cv_boost_thread=no + ax_cv_boost_thread=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -29026,7 +22927,7 @@ fi -{ $as_echo "$as_me:$LINENO: result: $ax_cv_boost_thread" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_thread" >&5 $as_echo "$ax_cv_boost_thread" >&6; } if test "$ax_cv_boost_thread" = "yes"; then @@ -29041,9 +22942,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -cat >>confdefs.h <<\_ACEOF -#define HAVE_BOOST_THREAD 1 -_ACEOF +$as_echo "#define HAVE_BOOST_THREAD 1" >>confdefs.h BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` @@ -29051,18 +22950,14 @@ if test "$ax_boost_user_lib" != ""; then for ax_lib in $ax_boost_user_lib boost_thread-${ax_boost_user_lib}; do as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 $as_echo_n "checking for exit in -l$ax_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -29080,47 +22975,19 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_THREAD_LIB="-l$ax_lib"; link_ok="yes"; break fi @@ -29136,18 +23003,14 @@ ax_lib=$f as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 $as_echo_n "checking for exit in -l$ax_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -29165,47 +23028,19 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_THREAD_LIB="-l$ax_lib"; link_ok="yes"; break fi @@ -29213,9 +23048,7 @@ fi if test "$link_ok" != "yes"; then - { { $as_echo "$as_me:$LINENO: error: Could not link against libboost_thread!" >&5 -$as_echo "$as_me: error: Could not link against libboost_thread!" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Could not link against libboost_thread!" "$LINENO" 5 fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -29244,7 +23077,7 @@ # Check whether --with-boost-date-time was given. -if test "${with_boost_date_time+set}" = set; then +if test "${with_boost_date_time+set}" = set; then : withval=$with_boost_date_time; if test "$withval" = "no"; then want_boost="no" @@ -29269,9 +23102,9 @@ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" LDFLAGS_SAVED="$LDFLAGS" LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - { $as_echo "$as_me:$LINENO: checking whether the boost::date_time includes are available" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the boost::date_time includes are available" >&5 $as_echo_n "checking whether the boost::date_time includes are available... " >&6; } -if test "${ax_cv_boost_date_time+set}" = set; then +if test "${ax_cv_boost_date_time+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_ext=cpp @@ -29280,11 +23113,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -29295,32 +23124,11 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ax_cv_boost_date_time=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ax_cv_boost_date_time=no + ax_cv_boost_date_time=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -29330,7 +23138,7 @@ fi -{ $as_echo "$as_me:$LINENO: result: $ax_cv_boost_date_time" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_date_time" >&5 $as_echo "$ax_cv_boost_date_time" >&6; } if test "$ax_cv_boost_date_time" = "yes"; then @@ -29342,9 +23150,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -cat >>confdefs.h <<\_ACEOF -#define HAVE_BOOST_DATE_TIME 1 -_ACEOF +$as_echo "#define HAVE_BOOST_DATE_TIME 1" >>confdefs.h BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` @@ -29352,18 +23158,14 @@ if test "$ax_boost_user_lib" != ""; then for ax_lib in $ax_boost_user_lib boost_date_time-${ax_boost_user_lib}; do as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 $as_echo_n "checking for exit in -l$ax_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -29381,47 +23183,19 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_DATE_TIME_LIB="-l$ax_lib"; link_ok="yes"; break fi @@ -29437,18 +23211,14 @@ ax_lib=$f as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 $as_echo_n "checking for exit in -l$ax_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -29466,47 +23236,19 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_DATE_TIME_LIB="-l$ax_lib"; link_ok="yes"; break fi @@ -29514,9 +23256,7 @@ fi if test "$link_ok" != "yes"; then - { { $as_echo "$as_me:$LINENO: error: Could not link against libboost_date_time!" >&5 -$as_echo "$as_me: error: Could not link against libboost_date_time!" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Could not link against libboost_date_time!" "$LINENO" 5 fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -29541,7 +23281,7 @@ # Check whether --with-boost-program-options was given. -if test "${with_boost_program_options+set}" = set; then +if test "${with_boost_program_options+set}" = set; then : withval=$with_boost_program_options; if test "$withval" = "no"; then want_boost="no" @@ -29566,9 +23306,9 @@ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" LDFLAGS_SAVED="$LDFLAGS" LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - { $as_echo "$as_me:$LINENO: checking whether the boost::program_options includes are available" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the boost::program_options includes are available" >&5 $as_echo_n "checking whether the boost::program_options includes are available... " >&6; } -if test "${ax_cv_boost_program_options+set}" = set; then +if test "${ax_cv_boost_program_options+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_ext=cpp @@ -29577,11 +23317,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -29593,32 +23329,11 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ax_cv_boost_program_options=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ax_cv_boost_program_options=no + ax_cv_boost_program_options=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -29628,7 +23343,7 @@ fi -{ $as_echo "$as_me:$LINENO: result: $ax_cv_boost_program_options" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_program_options" >&5 $as_echo "$ax_cv_boost_program_options" >&6; } if test "$ax_cv_boost_program_options" = "yes"; then @@ -29640,9 +23355,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -cat >>confdefs.h <<\_ACEOF -#define HAVE_BOOST_PROGRAM_OPTIONS 1 -_ACEOF +$as_echo "#define HAVE_BOOST_PROGRAM_OPTIONS 1" >>confdefs.h BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` @@ -29650,18 +23363,14 @@ if test "$ax_boost_user_lib" != ""; then for ax_lib in $ax_boost_user_lib boost_program_options-${ax_boost_user_lib}; do as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 $as_echo_n "checking for exit in -l$ax_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -29676,50 +23385,22 @@ { return exit (); ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; link_ok="yes"; break fi @@ -29735,18 +23416,14 @@ ax_lib=$f as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 $as_echo_n "checking for exit in -l$ax_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -29764,47 +23441,19 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; link_ok="yes"; break fi @@ -29812,9 +23461,7 @@ fi if test "$link_ok" != "yes"; then - { { $as_echo "$as_me:$LINENO: error: Could not link against libboost_program_options!" >&5 -$as_echo "$as_me: error: Could not link against libboost_program_options!" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Could not link against libboost_program_options!" "$LINENO" 5 fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -29836,9 +23483,9 @@ # Extract the first word of "svn", so it can be a program name with args. set dummy svn; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SVN+set}" = set; then +if test "${ac_cv_path_SVN+set}" = set; then : $as_echo_n "(cached) " >&6 else case $SVN in @@ -29851,14 +23498,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SVN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -29866,10 +23513,10 @@ fi SVN=$ac_cv_path_SVN if test -n "$SVN"; then - { $as_echo "$as_me:$LINENO: result: $SVN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SVN" >&5 $as_echo "$SVN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -29885,7 +23532,7 @@ # Check whether --enable-all-components was given. -if test "${enable_all_components+set}" = set; then +if test "${enable_all_components+set}" = set; then : enableval=$enable_all_components; fi @@ -29896,7 +23543,7 @@ passed=yes # Check whether --enable-gruel was given. -if test "${enable_gruel+set}" = set; then +if test "${enable_gruel+set}" = set; then : enableval=$enable_gruel; else @@ -29918,7 +23565,7 @@ # Check whether --with-gruel was given. -if test "${with_gruel+set}" = set; then +if test "${with_gruel+set}" = set; then : withval=$with_gruel; if test "x$withval" != "xyes"; then with_gruel_val=$withval with_gruel=yes @@ -29927,9 +23574,7 @@ if test x$with_gruel = xyes; then if test x$enable_gruel = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gruel: Cannot use both --enable and --with" >&5 -$as_echo "$as_me: error: Component gruel: Cannot use both --enable and --with" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gruel: Cannot use both --enable and --with" "$LINENO" 5 else s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -29939,18 +23584,16 @@ export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - { { $as_echo "$as_me:$LINENO: error: Component gruel: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component gruel: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gruel: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 fi fi if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with; check1=yes else @@ -29959,11 +23602,11 @@ if test "x$s_PKG_CONFIG_PATH" != "x"; then export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with else passed=no @@ -29971,9 +23614,7 @@ fi fi if test $passed != with; then - { { $as_echo "$as_me:$LINENO: error: Component gruel: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component gruel: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gruel: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 fi s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -30006,402 +23647,24 @@ ac_config_files="$ac_config_files gruel/Makefile gruel/gruel.pc gruel/src/Makefile gruel/src/include/Makefile gruel/src/include/gruel/Makefile gruel/src/include/gruel/inet.h gruel/src/lib/Makefile" - if test "${ac_cv_header_arpa_inet_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for arpa/inet.h" >&5 -$as_echo_n "checking for arpa/inet.h... " >&6; } -if test "${ac_cv_header_arpa_inet_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5 -$as_echo "$ac_cv_header_arpa_inet_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking arpa/inet.h usability" >&5 -$as_echo_n "checking arpa/inet.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking arpa/inet.h presence" >&5 -$as_echo_n "checking arpa/inet.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: arpa/inet.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: arpa/inet.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: arpa/inet.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for arpa/inet.h" >&5 -$as_echo_n "checking for arpa/inet.h... " >&6; } -if test "${ac_cv_header_arpa_inet_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_arpa_inet_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5 -$as_echo "$ac_cv_header_arpa_inet_h" >&6; } - -fi -if test "x$ac_cv_header_arpa_inet_h" = x""yes; then + ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" +if test "x$ac_cv_header_arpa_inet_h" = x""yes; then : GR_HAVE_ARPA_INET=1 else GR_HAVE_ARPA_INET=0 fi - if test "${ac_cv_header_netinet_in_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for netinet/in.h" >&5 -$as_echo_n "checking for netinet/in.h... " >&6; } -if test "${ac_cv_header_netinet_in_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 -$as_echo "$ac_cv_header_netinet_in_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking netinet/in.h usability" >&5 -$as_echo_n "checking netinet/in.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking netinet/in.h presence" >&5 -$as_echo_n "checking netinet/in.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: netinet/in.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: netinet/in.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: netinet/in.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: netinet/in.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for netinet/in.h" >&5 -$as_echo_n "checking for netinet/in.h... " >&6; } -if test "${ac_cv_header_netinet_in_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_netinet_in_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 -$as_echo "$ac_cv_header_netinet_in_h" >&6; } - -fi -if test "x$ac_cv_header_netinet_in_h" = x""yes; then + ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" +if test "x$ac_cv_header_netinet_in_h" = x""yes; then : GR_HAVE_NETINET_IN=1 else GR_HAVE_NETINET_IN=0 fi - if test "${ac_cv_header_byteswap_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for byteswap.h" >&5 -$as_echo_n "checking for byteswap.h... " >&6; } -if test "${ac_cv_header_byteswap_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_byteswap_h" >&5 -$as_echo "$ac_cv_header_byteswap_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking byteswap.h usability" >&5 -$as_echo_n "checking byteswap.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking byteswap.h presence" >&5 -$as_echo_n "checking byteswap.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: byteswap.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: byteswap.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: byteswap.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: byteswap.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: byteswap.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: byteswap.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: byteswap.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: byteswap.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: byteswap.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: byteswap.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: byteswap.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: byteswap.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: byteswap.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: byteswap.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: byteswap.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: byteswap.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for byteswap.h" >&5 -$as_echo_n "checking for byteswap.h... " >&6; } -if test "${ac_cv_header_byteswap_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_byteswap_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_byteswap_h" >&5 -$as_echo "$ac_cv_header_byteswap_h" >&6; } - -fi -if test "x$ac_cv_header_byteswap_h" = x""yes; then + ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default" +if test "x$ac_cv_header_byteswap_h" = x""yes; then : GR_HAVE_BYTESWAP=1 else GR_HAVE_BYTESWAP=0 @@ -30417,11 +23680,9 @@ gruel_with=no if test $passed = no; then if test x$enable_gruel = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gruel has errors; stopping." >&5 -$as_echo "$as_me: error: Component gruel has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gruel has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gruel." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gruel." >&5 $as_echo "Not building component gruel." >&6; } fi else @@ -30477,7 +23738,7 @@ gruel_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gruel will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gruel will be included from a pre-installed library and includes." >&5 $as_echo "Component gruel will be included from a pre-installed library and includes." >&6; } gruel_with=yes else @@ -30485,11 +23746,11 @@ if test x$enable_gruel != xno; then : build_dirs="$build_dirs gruel" - { $as_echo "$as_me:$LINENO: result: Component gruel passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gruel passed configuration checks; building." >&5 $as_echo "Component gruel passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gruel passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gruel passed configuration checks; but not building." >&5 $as_echo "Component gruel passed configuration checks; but not building." >&6; } fi fi @@ -30512,7 +23773,7 @@ passed=yes # Check whether --enable-omnithread was given. -if test "${enable_omnithread+set}" = set; then +if test "${enable_omnithread+set}" = set; then : enableval=$enable_omnithread; else @@ -30535,7 +23796,7 @@ # Check whether --with-omnithread was given. -if test "${with_omnithread+set}" = set; then +if test "${with_omnithread+set}" = set; then : withval=$with_omnithread; if test "x$withval" != "xyes"; then with_omnithread_val=$withval with_omnithread=yes @@ -30544,9 +23805,7 @@ if test x$with_omnithread = xyes; then if test x$enable_omnithread = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component omnithread: Cannot use both --enable and --with" >&5 -$as_echo "$as_me: error: Component omnithread: Cannot use both --enable and --with" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component omnithread: Cannot use both --enable and --with" "$LINENO" 5 else s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -30556,18 +23815,16 @@ export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - { { $as_echo "$as_me:$LINENO: error: Component omnithread: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component omnithread: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component omnithread: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 fi fi if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with; check1=yes else @@ -30576,11 +23833,11 @@ if test "x$s_PKG_CONFIG_PATH" != "x"; then export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with else passed=no @@ -30588,9 +23845,7 @@ fi fi if test $passed != with; then - { { $as_echo "$as_me:$LINENO: error: Component omnithread: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component omnithread: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component omnithread: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 fi s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -30626,11 +23881,9 @@ omnithread_with=no if test $passed = no; then if test x$enable_omnithread = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component omnithread has errors; stopping." >&5 -$as_echo "$as_me: error: Component omnithread has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component omnithread has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component omnithread." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component omnithread." >&5 $as_echo "Not building component omnithread." >&6; } fi else @@ -30686,7 +23939,7 @@ omnithread_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component omnithread will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component omnithread will be included from a pre-installed library and includes." >&5 $as_echo "Component omnithread will be included from a pre-installed library and includes." >&6; } omnithread_with=yes else @@ -30694,11 +23947,11 @@ if test x$enable_omnithread != xno; then build_dirs="$build_dirs omnithread" - { $as_echo "$as_me:$LINENO: result: Component omnithread passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component omnithread passed configuration checks; building." >&5 $as_echo "Component omnithread passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component omnithread passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component omnithread passed configuration checks; but not building." >&5 $as_echo "Component omnithread passed configuration checks; but not building." >&6; } fi fi @@ -30721,7 +23974,7 @@ passed=yes # Check whether --enable-gcell was given. -if test "${enable_gcell+set}" = set; then +if test "${enable_gcell+set}" = set; then : enableval=$enable_gcell; else @@ -30739,40 +23992,38 @@ if test $passed != no; then if test $passed = yes; then if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gcell requires omnithread, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gcell requires omnithread, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gcell requires omnithread, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$omnithread_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gcell requires omnithread to be included as --with-omnithread[=arg]" >&5 -$as_echo "$as_me: error: Component gcell requires omnithread to be included as --with-omnithread[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gcell requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 fi fi fi if test $passed = yes; then - { $as_echo "$as_me:$LINENO: checking whether host_cpu is powerpc*" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether host_cpu is powerpc*" >&5 $as_echo_n "checking whether host_cpu is powerpc*... " >&6; } case "$host_cpu" in powerpc*) - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } ;; *) passed=no - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ;; esac # Extract the first word of "spu-gcc", so it can be a program name with args. set dummy spu-gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_SPU_GCC_PROG+set}" = set; then +if test "${ac_cv_prog_SPU_GCC_PROG+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$SPU_GCC_PROG"; then @@ -30783,14 +24034,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_SPU_GCC_PROG="yes" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_prog_SPU_GCC_PROG" && ac_cv_prog_SPU_GCC_PROG="no" @@ -30798,10 +24049,10 @@ fi SPU_GCC_PROG=$ac_cv_prog_SPU_GCC_PROG if test -n "$SPU_GCC_PROG"; then - { $as_echo "$as_me:$LINENO: result: $SPU_GCC_PROG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SPU_GCC_PROG" >&5 $as_echo "$SPU_GCC_PROG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -30829,11 +24080,9 @@ gcell_with=no if test $passed = no; then if test x$enable_gcell = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gcell has errors; stopping." >&5 -$as_echo "$as_me: error: Component gcell has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gcell has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gcell." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gcell." >&5 $as_echo "Not building component gcell." >&6; } fi else @@ -30889,7 +24138,7 @@ gcell_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gcell will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gcell will be included from a pre-installed library and includes." >&5 $as_echo "Component gcell will be included from a pre-installed library and includes." >&6; } gcell_with=yes else @@ -30897,11 +24146,11 @@ if test x$enable_gcell != xno; then : build_dirs="$build_dirs gcell" - { $as_echo "$as_me:$LINENO: result: Component gcell passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gcell passed configuration checks; building." >&5 $as_echo "Component gcell passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gcell passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gcell passed configuration checks; but not building." >&5 $as_echo "Component gcell passed configuration checks; but not building." >&6; } fi fi @@ -30925,7 +24174,7 @@ passed=yes # Check whether --enable-gnuradio-core was given. -if test "${enable_gnuradio_core+set}" = set; then +if test "${enable_gnuradio_core+set}" = set; then : enableval=$enable_gnuradio_core; else @@ -30948,7 +24197,7 @@ # Check whether --with-gnuradio-core was given. -if test "${with_gnuradio_core+set}" = set; then +if test "${with_gnuradio_core+set}" = set; then : withval=$with_gnuradio_core; if test "x$withval" != "xyes"; then with_gnuradio_core_val=$withval with_gnuradio_core=yes @@ -30957,9 +24206,7 @@ if test x$with_gnuradio_core = xyes; then if test x$enable_gnuradio_core = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gnuradio-core: Cannot use both --enable and --with" >&5 -$as_echo "$as_me: error: Component gnuradio-core: Cannot use both --enable and --with" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gnuradio-core: Cannot use both --enable and --with" "$LINENO" 5 else s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -30969,18 +24216,16 @@ export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - { { $as_echo "$as_me:$LINENO: error: Component gnuradio-core: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component gnuradio-core: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gnuradio-core: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 fi fi if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with; check1=yes else @@ -30989,11 +24234,11 @@ if test "x$s_PKG_CONFIG_PATH" != "x"; then export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with else passed=no @@ -31001,9 +24246,7 @@ fi fi if test $passed != with; then - { { $as_echo "$as_me:$LINENO: error: Component gnuradio-core: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component gnuradio-core: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gnuradio-core: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 fi s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -31034,15 +24277,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gruel_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gnuradio-core requires gruel, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core requires gruel, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gnuradio-core requires gruel, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gruel_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gnuradio-core requires gruel to be included as --with-gruel[=arg]" >&5 -$as_echo "$as_me: error: Component gnuradio-core requires gruel to be included as --with-gruel[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gnuradio-core requires gruel to be included as --with-gruel[=arg]" "$LINENO" 5 fi fi fi @@ -31051,15 +24292,13 @@ if test $passed != no; then if test $passed = yes; then if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gnuradio-core requires omnithread, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core requires omnithread, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gnuradio-core requires omnithread, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$omnithread_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gnuradio-core requires omnithread to be included as --with-omnithread[=arg]" >&5 -$as_echo "$as_me: error: Component gnuradio-core requires omnithread to be included as --with-omnithread[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gnuradio-core requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 fi fi fi @@ -31073,7 +24312,7 @@ # Check whether --with-cblas was given. -if test "${with_cblas+set}" = set; then +if test "${with_cblas+set}" = set; then : withval=$with_cblas; fi @@ -31092,13 +24331,9 @@ if test $acx_cblas_ok = no; then if test "x$CBLAS_LIBS" != x; then save_LIBS="$LIBS"; LIBS="$CBLAS_LIBS $LIBS" - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in $CBLAS_LIBS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in $CBLAS_LIBS" >&5 $as_echo_n "checking for cblas_sgemm in $CBLAS_LIBS... " >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31116,39 +24351,14 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : acx_cblas_ok=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CBLAS_LIBS="" + CBLAS_LIBS="" fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: result: $acx_cblas_ok" >&5 +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cblas_ok" >&5 $as_echo "$acx_cblas_ok" >&6; } LIBS="$save_LIBS" fi @@ -31157,92 +24367,8 @@ # CBLAS linked to by default? (happens on some supercomputers) if test $acx_cblas_ok = no; then save_LIBS="$LIBS"; LIBS="$LIBS" - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm" >&5 -$as_echo_n "checking for cblas_sgemm... " >&6; } -if test "${ac_cv_func_cblas_sgemm+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define cblas_sgemm to an innocuous variant, in case declares cblas_sgemm. - For example, HP-UX 11i declares gettimeofday. */ -#define cblas_sgemm innocuous_cblas_sgemm - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char cblas_sgemm (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef cblas_sgemm - -/* 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 cblas_sgemm (); -/* 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_cblas_sgemm || defined __stub___cblas_sgemm -choke me -#endif - -int -main () -{ -return cblas_sgemm (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_cblas_sgemm=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_cblas_sgemm=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_cblas_sgemm" >&5 -$as_echo "$ac_cv_func_cblas_sgemm" >&6; } -if test "x$ac_cv_func_cblas_sgemm" = x""yes; then + ac_fn_c_check_func "$LINENO" "cblas_sgemm" "ac_cv_func_cblas_sgemm" +if test "x$ac_cv_func_cblas_sgemm" = x""yes; then : acx_cblas_ok=yes fi @@ -31251,18 +24377,14 @@ # CBLAS in ATLAS library? (http://math-atlas.sourceforge.net/) if test $acx_cblas_ok = no; then - { $as_echo "$as_me:$LINENO: checking for ATL_xerbla in -latlas" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 $as_echo_n "checking for ATL_xerbla in -latlas... " >&6; } -if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then +if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-latlas -latlas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31280,55 +24402,26 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_atlas_ATL_xerbla=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_atlas_ATL_xerbla=no + ac_cv_lib_atlas_ATL_xerbla=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_atlas_ATL_xerbla" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atlas_ATL_xerbla" >&5 $as_echo "$ac_cv_lib_atlas_ATL_xerbla" >&6; } -if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for cblas_dgemm in -lcblas" >&5 +if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lcblas" >&5 $as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } -if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then +if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcblas -latlas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31346,43 +24439,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_cblas_cblas_dgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_cblas_cblas_dgemm=no + ac_cv_lib_cblas_cblas_dgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cblas_cblas_dgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_dgemm" >&5 $as_echo "$ac_cv_lib_cblas_cblas_dgemm" >&6; } -if test "x$ac_cv_lib_cblas_cblas_dgemm" = x""yes; then +if test "x$ac_cv_lib_cblas_cblas_dgemm" = x""yes; then : acx_cblas_ok=yes CBLAS_LIBS="-lcblas -latlas" fi @@ -31395,18 +24463,14 @@ if test $acx_cblas_ok = no && test "$cross_compiling" = no; then unset ac_cv_lib_atlas_ATL_xerbla unset ac_cv_lib_cblas_cblas_dgemm - { $as_echo "$as_me:$LINENO: checking for ATL_xerbla in -latlas" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 $as_echo_n "checking for ATL_xerbla in -latlas... " >&6; } -if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then +if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-latlas -L/usr/lib64/atlas -latlas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31424,55 +24488,26 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_atlas_ATL_xerbla=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_atlas_ATL_xerbla=no + ac_cv_lib_atlas_ATL_xerbla=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_atlas_ATL_xerbla" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atlas_ATL_xerbla" >&5 $as_echo "$ac_cv_lib_atlas_ATL_xerbla" >&6; } -if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for cblas_dgemm in -lcblas" >&5 +if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lcblas" >&5 $as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } -if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then +if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcblas -L/usr/lib64/atlas -latlas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31490,43 +24525,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_cblas_cblas_dgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_cblas_cblas_dgemm=no + ac_cv_lib_cblas_cblas_dgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cblas_cblas_dgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_dgemm" >&5 $as_echo "$ac_cv_lib_cblas_cblas_dgemm" >&6; } -if test "x$ac_cv_lib_cblas_cblas_dgemm" = x""yes; then +if test "x$ac_cv_lib_cblas_cblas_dgemm" = x""yes; then : acx_cblas_ok=yes CBLAS_LIBS="-L/usr/lib64/atlas -lcblas -latlas" fi @@ -31539,18 +24549,14 @@ if test $acx_cblas_ok = no && test "$cross_compiling" = no; then unset ac_cv_lib_atlas_ATL_xerbla unset ac_cv_lib_cblas_cblas_dgemm - { $as_echo "$as_me:$LINENO: checking for ATL_xerbla in -latlas" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 $as_echo_n "checking for ATL_xerbla in -latlas... " >&6; } -if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then +if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-latlas -L/usr/lib/atlas -latlas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31568,55 +24574,26 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_atlas_ATL_xerbla=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_atlas_ATL_xerbla=no + ac_cv_lib_atlas_ATL_xerbla=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_atlas_ATL_xerbla" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atlas_ATL_xerbla" >&5 $as_echo "$ac_cv_lib_atlas_ATL_xerbla" >&6; } -if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for cblas_dgemm in -lcblas" >&5 +if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lcblas" >&5 $as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } -if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then +if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcblas -L/usr/lib/atlas -latlas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31634,43 +24611,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_cblas_cblas_dgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_cblas_cblas_dgemm=no + ac_cv_lib_cblas_cblas_dgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cblas_cblas_dgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_dgemm" >&5 $as_echo "$ac_cv_lib_cblas_cblas_dgemm" >&6; } -if test "x$ac_cv_lib_cblas_cblas_dgemm" = x""yes; then +if test "x$ac_cv_lib_cblas_cblas_dgemm" = x""yes; then : acx_cblas_ok=yes CBLAS_LIBS="-L/usr/lib/atlas -lcblas -latlas" fi @@ -31682,18 +24634,14 @@ # CBLAS in PhiPACK libraries? (requires generic BLAS lib, too) if test $acx_cblas_ok = no; then - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in -lcblas" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcblas" >&5 $as_echo_n "checking for cblas_sgemm in -lcblas... " >&6; } -if test "${ac_cv_lib_cblas_cblas_sgemm+set}" = set; then +if test "${ac_cv_lib_cblas_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcblas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31711,55 +24659,26 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_cblas_cblas_sgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_cblas_cblas_sgemm=no + ac_cv_lib_cblas_cblas_sgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cblas_cblas_sgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_sgemm" >&5 $as_echo "$ac_cv_lib_cblas_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_cblas_cblas_sgemm" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for cblas_dgemm in -ldgemm" >&5 +if test "x$ac_cv_lib_cblas_cblas_sgemm" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -ldgemm" >&5 $as_echo_n "checking for cblas_dgemm in -ldgemm... " >&6; } -if test "${ac_cv_lib_dgemm_cblas_dgemm+set}" = set; then +if test "${ac_cv_lib_dgemm_cblas_dgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldgemm -lblas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31777,55 +24696,26 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dgemm_cblas_dgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dgemm_cblas_dgemm=no + ac_cv_lib_dgemm_cblas_dgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dgemm_cblas_dgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dgemm_cblas_dgemm" >&5 $as_echo "$ac_cv_lib_dgemm_cblas_dgemm" >&6; } -if test "x$ac_cv_lib_dgemm_cblas_dgemm" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in -lsgemm" >&5 +if test "x$ac_cv_lib_dgemm_cblas_dgemm" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lsgemm" >&5 $as_echo_n "checking for cblas_sgemm in -lsgemm... " >&6; } -if test "${ac_cv_lib_sgemm_cblas_sgemm+set}" = set; then +if test "${ac_cv_lib_sgemm_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsgemm -lblas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31843,43 +24733,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sgemm_cblas_sgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_sgemm_cblas_sgemm=no + ac_cv_lib_sgemm_cblas_sgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sgemm_cblas_sgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sgemm_cblas_sgemm" >&5 $as_echo "$ac_cv_lib_sgemm_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_sgemm_cblas_sgemm" = x""yes; then +if test "x$ac_cv_lib_sgemm_cblas_sgemm" = x""yes; then : acx_cblas_ok=yes; CBLAS_LIBS="-lsgemm -ldgemm -lblas" fi @@ -31891,18 +24756,14 @@ # BLAS in Intel MKL library? if test $acx_cblas_ok = no; then - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in -lmkl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lmkl" >&5 $as_echo_n "checking for cblas_sgemm in -lmkl... " >&6; } -if test "${ac_cv_lib_mkl_cblas_sgemm+set}" = set; then +if test "${ac_cv_lib_mkl_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmkl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31920,43 +24781,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_mkl_cblas_sgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_mkl_cblas_sgemm=no + ac_cv_lib_mkl_cblas_sgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mkl_cblas_sgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mkl_cblas_sgemm" >&5 $as_echo "$ac_cv_lib_mkl_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_mkl_cblas_sgemm" = x""yes; then +if test "x$ac_cv_lib_mkl_cblas_sgemm" = x""yes; then : acx_cblas_ok=yes;CBLAS_LIBS="-lmkl" fi @@ -31965,92 +24801,8 @@ # CBLAS in Apple vecLib library? if test $acx_cblas_ok = no; then save_LIBS="$LIBS"; LIBS="-framework vecLib $LIBS" - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm" >&5 -$as_echo_n "checking for cblas_sgemm... " >&6; } -if test "${ac_cv_func_cblas_sgemm+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define cblas_sgemm to an innocuous variant, in case declares cblas_sgemm. - For example, HP-UX 11i declares gettimeofday. */ -#define cblas_sgemm innocuous_cblas_sgemm - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char cblas_sgemm (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef cblas_sgemm - -/* 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 cblas_sgemm (); -/* 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_cblas_sgemm || defined __stub___cblas_sgemm -choke me -#endif - -int -main () -{ -return cblas_sgemm (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_cblas_sgemm=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_cblas_sgemm=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_cblas_sgemm" >&5 -$as_echo "$ac_cv_func_cblas_sgemm" >&6; } -if test "x$ac_cv_func_cblas_sgemm" = x""yes; then + ac_fn_c_check_func "$LINENO" "cblas_sgemm" "ac_cv_func_cblas_sgemm" +if test "x$ac_cv_func_cblas_sgemm" = x""yes; then : acx_cblas_ok=yes;CBLAS_LIBS="-framework vecLib" fi @@ -32059,18 +24811,14 @@ # CBLAS in Alpha CXML library? if test $acx_cblas_ok = no; then - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in -lcxml" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcxml" >&5 $as_echo_n "checking for cblas_sgemm in -lcxml... " >&6; } -if test "${ac_cv_lib_cxml_cblas_sgemm+set}" = set; then +if test "${ac_cv_lib_cxml_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcxml $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32085,46 +24833,21 @@ { return cblas_sgemm (); ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_cxml_cblas_sgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_cxml_cblas_sgemm=no + ac_cv_lib_cxml_cblas_sgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cxml_cblas_sgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cxml_cblas_sgemm" >&5 $as_echo "$ac_cv_lib_cxml_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_cxml_cblas_sgemm" = x""yes; then +if test "x$ac_cv_lib_cxml_cblas_sgemm" = x""yes; then : acx_cblas_ok=yes;CBLAS_LIBS="-lcxml" fi @@ -32132,18 +24855,14 @@ # CBLAS in Alpha DXML library? (now called CXML, see above) if test $acx_cblas_ok = no; then - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in -ldxml" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -ldxml" >&5 $as_echo_n "checking for cblas_sgemm in -ldxml... " >&6; } -if test "${ac_cv_lib_dxml_cblas_sgemm+set}" = set; then +if test "${ac_cv_lib_dxml_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldxml $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32161,43 +24880,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dxml_cblas_sgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dxml_cblas_sgemm=no + ac_cv_lib_dxml_cblas_sgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dxml_cblas_sgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dxml_cblas_sgemm" >&5 $as_echo "$ac_cv_lib_dxml_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_dxml_cblas_sgemm" = x""yes; then +if test "x$ac_cv_lib_dxml_cblas_sgemm" = x""yes; then : acx_cblas_ok=yes;CBLAS_LIBS="-ldxml" fi @@ -32206,18 +24900,14 @@ # CBLAS in Sun Performance library? if test $acx_cblas_ok = no; then if test "x$GCC" != xyes; then # only works with Sun CC - { $as_echo "$as_me:$LINENO: checking for acosp in -lsunmath" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acosp in -lsunmath" >&5 $as_echo_n "checking for acosp in -lsunmath... " >&6; } -if test "${ac_cv_lib_sunmath_acosp+set}" = set; then +if test "${ac_cv_lib_sunmath_acosp+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsunmath $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32235,55 +24925,26 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sunmath_acosp=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_sunmath_acosp=no + ac_cv_lib_sunmath_acosp=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sunmath_acosp" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sunmath_acosp" >&5 $as_echo "$ac_cv_lib_sunmath_acosp" >&6; } -if test "x$ac_cv_lib_sunmath_acosp" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in -lsunperf" >&5 +if test "x$ac_cv_lib_sunmath_acosp" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lsunperf" >&5 $as_echo_n "checking for cblas_sgemm in -lsunperf... " >&6; } -if test "${ac_cv_lib_sunperf_cblas_sgemm+set}" = set; then +if test "${ac_cv_lib_sunperf_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsunperf -lsunmath $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32301,43 +24962,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sunperf_cblas_sgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_sunperf_cblas_sgemm=no + ac_cv_lib_sunperf_cblas_sgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sunperf_cblas_sgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sunperf_cblas_sgemm" >&5 $as_echo "$ac_cv_lib_sunperf_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_sunperf_cblas_sgemm" = x""yes; then +if test "x$ac_cv_lib_sunperf_cblas_sgemm" = x""yes; then : CBLAS_LIBS="-xlic_lib=sunperf -lsunmath" acx_cblas_ok=yes fi @@ -32349,18 +24985,14 @@ # CBLAS in SCSL library? (SGI/Cray Scientific Library) if test $acx_cblas_ok = no; then - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in -lscs" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lscs" >&5 $as_echo_n "checking for cblas_sgemm in -lscs... " >&6; } -if test "${ac_cv_lib_scs_cblas_sgemm+set}" = set; then +if test "${ac_cv_lib_scs_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lscs $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32378,43 +25010,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_scs_cblas_sgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_scs_cblas_sgemm=no + ac_cv_lib_scs_cblas_sgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_scs_cblas_sgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_scs_cblas_sgemm" >&5 $as_echo "$ac_cv_lib_scs_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_scs_cblas_sgemm" = x""yes; then +if test "x$ac_cv_lib_scs_cblas_sgemm" = x""yes; then : acx_cblas_ok=yes; CBLAS_LIBS="-lscs" fi @@ -32422,18 +25029,14 @@ # CBLAS in SGIMATH library? if test $acx_cblas_ok = no; then - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in -lcomplib.sgimath" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcomplib.sgimath" >&5 $as_echo_n "checking for cblas_sgemm in -lcomplib.sgimath... " >&6; } -if test "${ac_cv_lib_complib_sgimath_cblas_sgemm+set}" = set; then +if test "${ac_cv_lib_complib_sgimath_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcomplib.sgimath $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32451,43 +25054,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_complib_sgimath_cblas_sgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_complib_sgimath_cblas_sgemm=no + ac_cv_lib_complib_sgimath_cblas_sgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_complib_sgimath_cblas_sgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_complib_sgimath_cblas_sgemm" >&5 $as_echo "$ac_cv_lib_complib_sgimath_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_complib_sgimath_cblas_sgemm" = x""yes; then +if test "x$ac_cv_lib_complib_sgimath_cblas_sgemm" = x""yes; then : acx_cblas_ok=yes; CBLAS_LIBS="-lcomplib.sgimath" fi @@ -32495,18 +25073,14 @@ # CBLAS in IBM ESSL library? (requires generic CBLAS lib, too) if test $acx_cblas_ok = no; then - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in -lcblas" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcblas" >&5 $as_echo_n "checking for cblas_sgemm in -lcblas... " >&6; } -if test "${ac_cv_lib_cblas_cblas_sgemm+set}" = set; then +if test "${ac_cv_lib_cblas_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcblas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32524,55 +25098,26 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_cblas_cblas_sgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_cblas_cblas_sgemm=no + ac_cv_lib_cblas_cblas_sgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cblas_cblas_sgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_sgemm" >&5 $as_echo "$ac_cv_lib_cblas_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_cblas_cblas_sgemm" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in -lessl" >&5 +if test "x$ac_cv_lib_cblas_cblas_sgemm" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lessl" >&5 $as_echo_n "checking for cblas_sgemm in -lessl... " >&6; } -if test "${ac_cv_lib_essl_cblas_sgemm+set}" = set; then +if test "${ac_cv_lib_essl_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lessl -lblas $FLIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32590,43 +25135,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_essl_cblas_sgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_essl_cblas_sgemm=no + ac_cv_lib_essl_cblas_sgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_essl_cblas_sgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_essl_cblas_sgemm" >&5 $as_echo "$ac_cv_lib_essl_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_essl_cblas_sgemm" = x""yes; then +if test "x$ac_cv_lib_essl_cblas_sgemm" = x""yes; then : acx_cblas_ok=yes; CBLAS_LIBS="-lessl -lblas" fi @@ -32636,18 +25156,14 @@ # Generic CBLAS library? if test $acx_cblas_ok = no; then - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in -lcblas" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcblas" >&5 $as_echo_n "checking for cblas_sgemm in -lcblas... " >&6; } -if test "${ac_cv_lib_cblas_cblas_sgemm+set}" = set; then +if test "${ac_cv_lib_cblas_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcblas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32665,43 +25181,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_cblas_cblas_sgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_cblas_cblas_sgemm=no + ac_cv_lib_cblas_cblas_sgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cblas_cblas_sgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_sgemm" >&5 $as_echo "$ac_cv_lib_cblas_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_cblas_cblas_sgemm" = x""yes; then +if test "x$ac_cv_lib_cblas_cblas_sgemm" = x""yes; then : acx_cblas_ok=yes; CBLAS_LIBS="-lcblas" fi @@ -32709,18 +25200,14 @@ # Generic BLAS library? if test $acx_cblas_ok = no; then - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in -lblas" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lblas" >&5 $as_echo_n "checking for cblas_sgemm in -lblas... " >&6; } -if test "${ac_cv_lib_blas_cblas_sgemm+set}" = set; then +if test "${ac_cv_lib_blas_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lblas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32738,43 +25225,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_blas_cblas_sgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_blas_cblas_sgemm=no + ac_cv_lib_blas_cblas_sgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_blas_cblas_sgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blas_cblas_sgemm" >&5 $as_echo "$ac_cv_lib_blas_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_blas_cblas_sgemm" = x""yes; then +if test "x$ac_cv_lib_blas_cblas_sgemm" = x""yes; then : acx_cblas_ok=yes; CBLAS_LIBS="-lblas" fi @@ -32782,18 +25244,14 @@ # GSL generic CBLAS library? if test $acx_cblas_ok = no; then - { $as_echo "$as_me:$LINENO: checking for cblas_sgemm in -lgslcblas" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lgslcblas" >&5 $as_echo_n "checking for cblas_sgemm in -lgslcblas... " >&6; } -if test "${ac_cv_lib_gslcblas_cblas_sgemm+set}" = set; then +if test "${ac_cv_lib_gslcblas_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgslcblas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32811,43 +25269,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_gslcblas_cblas_sgemm=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_gslcblas_cblas_sgemm=no + ac_cv_lib_gslcblas_cblas_sgemm=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gslcblas_cblas_sgemm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gslcblas_cblas_sgemm" >&5 $as_echo "$ac_cv_lib_gslcblas_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_gslcblas_cblas_sgemm" = x""yes; then +if test "x$ac_cv_lib_gslcblas_cblas_sgemm" = x""yes; then : acx_cblas_ok=yes; CBLAS_LIBS="-lgslcblas" fi @@ -32860,9 +25293,7 @@ # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: if test x"$acx_cblas_ok" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_CBLAS 1 -_ACEOF +$as_echo "#define HAVE_CBLAS 1" >>confdefs.h : else @@ -32871,103 +25302,48 @@ fi - - pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for GSL" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSL" >&5 $as_echo_n "checking for GSL... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GSL_CFLAGS"; then - pkg_cv_GSL_CFLAGS="$GSL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\"") >&5 +if test -n "$GSL_CFLAGS"; then + pkg_cv_GSL_CFLAGS="$GSL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\""; } >&5 ($PKG_CONFIG --exists --print-errors "gsl >= 1.10") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_GSL_CFLAGS=`$PKG_CONFIG --cflags "gsl >= 1.10" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi - -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$GSL_LIBS"; then - pkg_cv_GSL_LIBS="$GSL_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\"") >&5 - ($PKG_CONFIG --exists --print-errors "gsl >= 1.10") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GSL_LIBS=`$PKG_CONFIG --libs --static "gsl >= 1.10" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_GSL_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_GSL_LIBS="$_pkg_tmp" -else - if test -n "$PKG_CONFIG"; then - if test -n "$GSL_LIBS"; then - pkg_cv_GSL_LIBS="$GSL_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\"") >&5 - ($PKG_CONFIG --exists --print-errors "gsl >= 1.10") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GSL_LIBS=`$PKG_CONFIG --libs --static "gsl >= 1.10" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi + else + pkg_failed=untried fi - -if test -n "$PKG_CONFIG"; then - if test -n "$GSL_INCLUDEDIR"; then - pkg_cv_GSL_INCLUDEDIR="$GSL_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\"") >&5 +if test -n "$GSL_LIBS"; then + pkg_cv_GSL_LIBS="$GSL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\""; } >&5 ($PKG_CONFIG --exists --print-errors "gsl >= 1.10") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GSL_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "gsl >= 1.10" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GSL_LIBS=`$PKG_CONFIG --libs "gsl >= 1.10" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi - if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -32975,37 +25351,26 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gsl >= 1.10"` + GSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gsl >= 1.10" 2>&1` else - GSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gsl >= 1.10"` + GSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gsl >= 1.10" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GSL_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - passed=no;{ $as_echo "$as_me:$LINENO: result: gnuradio-core requires package gsl >= 1.10, not found." >&5 + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gnuradio-core requires package gsl >= 1.10, not found." >&5 $as_echo "gnuradio-core requires package gsl >= 1.10, not found." >&6; } elif test $pkg_failed = untried; then - passed=no;{ $as_echo "$as_me:$LINENO: result: gnuradio-core requires package gsl >= 1.10, not found." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gnuradio-core requires package gsl >= 1.10, not found." >&5 $as_echo "gnuradio-core requires package gsl >= 1.10, not found." >&6; } else GSL_CFLAGS=$pkg_cv_GSL_CFLAGS GSL_LIBS=$pkg_cv_GSL_LIBS - GSL_INCLUDEDIR=$pkg_cv_GSL_INCLUDEDIR - - GSL_CPPFLAGS="" - for flag in $GSL_CFLAGS; do - case $flag in - -I* | -D* | -U*) GSL_CPPFLAGS="$GSL_CPPFLAGS $flag" ;; - esac - done - pkg_cv_GSL_CPPFLAGS=$GSL_CPPFLAGS - - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi fi @@ -33046,11 +25411,9 @@ gnuradio_core_with=no if test $passed = no; then if test x$enable_gnuradio_core = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gnuradio-core has errors; stopping." >&5 -$as_echo "$as_me: error: Component gnuradio-core has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gnuradio-core has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gnuradio-core." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gnuradio-core." >&5 $as_echo "Not building component gnuradio-core." >&6; } fi else @@ -33106,7 +25469,7 @@ gnuradio_core_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gnuradio-core will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core will be included from a pre-installed library and includes." >&5 $as_echo "Component gnuradio-core will be included from a pre-installed library and includes." >&6; } gnuradio_core_with=yes else @@ -33116,11 +25479,11 @@ build_dirs="$build_dirs gnuradio-core" - { $as_echo "$as_me:$LINENO: result: Component gnuradio-core passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core passed configuration checks; building." >&5 $as_echo "Component gnuradio-core passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gnuradio-core passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core passed configuration checks; but not building." >&5 $as_echo "Component gnuradio-core passed configuration checks; but not building." >&6; } fi fi @@ -33144,7 +25507,7 @@ passed=yes # Check whether --enable-pmt was given. -if test "${enable_pmt+set}" = set; then +if test "${enable_pmt+set}" = set; then : enableval=$enable_pmt; else @@ -33166,7 +25529,7 @@ # Check whether --with-pmt was given. -if test "${with_pmt+set}" = set; then +if test "${with_pmt+set}" = set; then : withval=$with_pmt; if test "x$withval" != "xyes"; then with_pmt_val=$withval with_pmt=yes @@ -33175,9 +25538,7 @@ if test x$with_pmt = xyes; then if test x$enable_pmt = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component pmt: Cannot use both --enable and --with" >&5 -$as_echo "$as_me: error: Component pmt: Cannot use both --enable and --with" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component pmt: Cannot use both --enable and --with" "$LINENO" 5 else s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -33187,18 +25548,16 @@ export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - { { $as_echo "$as_me:$LINENO: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 fi fi if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with; check1=yes else @@ -33207,11 +25566,11 @@ if test "x$s_PKG_CONFIG_PATH" != "x"; then export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with else passed=no @@ -33219,9 +25578,7 @@ fi fi if test $passed != with; then - { { $as_echo "$as_me:$LINENO: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 fi s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -33247,15 +25604,13 @@ if test $passed != no; then if test $passed = yes; then if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&5 $as_echo "Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$omnithread_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component pmt requires omnithread to be included as --with-omnithread[=arg]" >&5 -$as_echo "$as_me: error: Component pmt requires omnithread to be included as --with-omnithread[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component pmt requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 fi fi fi @@ -33264,7 +25619,7 @@ if test $passed = yes; then if test x"$GUILE" = x; then - { $as_echo "$as_me:$LINENO: result: Component pmt requires guile, which was not found." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component pmt requires guile, which was not found." >&5 $as_echo "Component pmt requires guile, which was not found." >&6; } passed=no fi @@ -33283,11 +25638,9 @@ pmt_with=no if test $passed = no; then if test x$enable_pmt = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component pmt has errors; stopping." >&5 -$as_echo "$as_me: error: Component pmt has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component pmt has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component pmt." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component pmt." >&5 $as_echo "Not building component pmt." >&6; } fi else @@ -33343,7 +25696,7 @@ pmt_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component pmt will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component pmt will be included from a pre-installed library and includes." >&5 $as_echo "Component pmt will be included from a pre-installed library and includes." >&6; } pmt_with=yes else @@ -33351,11 +25704,11 @@ if test x$enable_pmt != xno; then build_dirs="$build_dirs pmt" - { $as_echo "$as_me:$LINENO: result: Component pmt passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component pmt passed configuration checks; building." >&5 $as_echo "Component pmt passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component pmt passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component pmt passed configuration checks; but not building." >&5 $as_echo "Component pmt passed configuration checks; but not building." >&6; } fi fi @@ -33379,7 +25732,7 @@ passed=yes # Check whether --enable-mblock was given. -if test "${enable_mblock+set}" = set; then +if test "${enable_mblock+set}" = set; then : enableval=$enable_mblock; else @@ -33402,7 +25755,7 @@ # Check whether --with-mblock was given. -if test "${with_mblock+set}" = set; then +if test "${with_mblock+set}" = set; then : withval=$with_mblock; if test "x$withval" != "xyes"; then with_mblock_val=$withval with_mblock=yes @@ -33411,9 +25764,7 @@ if test x$with_mblock = xyes; then if test x$enable_mblock = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component mblock: Cannot use both --enable and --with" >&5 -$as_echo "$as_me: error: Component mblock: Cannot use both --enable and --with" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component mblock: Cannot use both --enable and --with" "$LINENO" 5 else s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -33423,18 +25774,16 @@ export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - { { $as_echo "$as_me:$LINENO: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 fi fi if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with; check1=yes else @@ -33443,11 +25792,11 @@ if test "x$s_PKG_CONFIG_PATH" != "x"; then export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with else passed=no @@ -33455,9 +25804,7 @@ fi fi if test $passed != with; then - { { $as_echo "$as_me:$LINENO: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 fi s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -33483,15 +25830,13 @@ if test $passed != no; then if test $passed = yes; then if test x$pmt_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component mblock requires pmt, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component mblock requires pmt, which is not being built or specified via pre-installed files." >&5 $as_echo "Component mblock requires pmt, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$pmt_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component mblock requires pmt to be included as --with-pmt[=arg]" >&5 -$as_echo "$as_me: error: Component mblock requires pmt to be included as --with-pmt[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component mblock requires pmt to be included as --with-pmt[=arg]" "$LINENO" 5 fi fi fi @@ -33500,15 +25845,13 @@ if test $passed != no; then if test $passed = yes; then if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&5 $as_echo "Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$omnithread_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component mblock requires omnithread to be included as --with-omnithread[=arg]" >&5 -$as_echo "$as_me: error: Component mblock requires omnithread to be included as --with-omnithread[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component mblock requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 fi fi fi @@ -33517,7 +25860,7 @@ if test $passed = yes; then if test x"$GUILE" = x; then - { $as_echo "$as_me:$LINENO: result: Component mblock requires guile, which was not found." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component mblock requires guile, which was not found." >&5 $as_echo "Component mblock requires guile, which was not found." >&6; } passed=no fi @@ -33536,11 +25879,9 @@ mblock_with=no if test $passed = no; then if test x$enable_mblock = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component mblock has errors; stopping." >&5 -$as_echo "$as_me: error: Component mblock has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component mblock has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component mblock." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component mblock." >&5 $as_echo "Not building component mblock." >&6; } fi else @@ -33596,7 +25937,7 @@ mblock_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component mblock will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component mblock will be included from a pre-installed library and includes." >&5 $as_echo "Component mblock will be included from a pre-installed library and includes." >&6; } mblock_with=yes else @@ -33604,11 +25945,11 @@ if test x$enable_mblock != xno; then build_dirs="$build_dirs mblock" - { $as_echo "$as_me:$LINENO: result: Component mblock passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component mblock passed configuration checks; building." >&5 $as_echo "Component mblock passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component mblock passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component mblock passed configuration checks; but not building." >&5 $as_echo "Component mblock passed configuration checks; but not building." >&6; } fi fi @@ -33626,16 +25967,12 @@ - { $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 $as_echo_n "checking whether stat file-mode macros are broken... " >&6; } -if test "${ac_cv_header_stat_broken+set}" = set; then +if test "${ac_cv_header_stat_broken+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -33657,185 +25994,28 @@ #endif _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stat_broken=no else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stat_broken=yes + ac_cv_header_stat_broken=yes fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5 $as_echo "$ac_cv_header_stat_broken" >&6; } if test $ac_cv_header_stat_broken = yes; then -cat >>confdefs.h <<\_ACEOF -#define STAT_MACROS_BROKEN 1 -_ACEOF - -fi - - - -for ac_header in fcntl.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in fcntl.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" +if test "x$ac_cv_header_fcntl_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_FCNTL_H 1 _ACEOF fi @@ -33844,146 +26024,12 @@ - -for ac_header in sys/time.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in sys/time.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_time_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_SYS_TIME_H 1 _ACEOF fi @@ -33992,146 +26038,12 @@ - -for ac_header in unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in unistd.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" +if test "x$ac_cv_header_unistd_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_UNISTD_H 1 _ACEOF fi @@ -34140,82 +26052,24 @@ - { $as_echo "$as_me:$LINENO: checking whether getenv is declared" >&5 -$as_echo_n "checking whether getenv is declared... " >&6; } -if test "${ac_cv_have_decl_getenv+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -#ifndef getenv - (void) getenv; -#endif - - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl_getenv=yes + ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default" +if test "x$ac_cv_have_decl_getenv" = x""yes; then : + ac_have_decl=1 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl_getenv=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_have_decl=0 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getenv" >&5 -$as_echo "$ac_cv_have_decl_getenv" >&6; } -if test "x$ac_cv_have_decl_getenv" = x""yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETENV 1 -_ACEOF - - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETENV 0 +#define HAVE_DECL_GETENV $ac_have_decl _ACEOF -fi - - - passed=yes # Check whether --enable-usrp was given. -if test "${enable_usrp+set}" = set; then +if test "${enable_usrp+set}" = set; then : enableval=$enable_usrp; else @@ -34238,7 +26092,7 @@ # Check whether --with-usrp was given. -if test "${with_usrp+set}" = set; then +if test "${with_usrp+set}" = set; then : withval=$with_usrp; if test "x$withval" != "xyes"; then with_usrp_val=$withval with_usrp=yes @@ -34247,9 +26101,7 @@ if test x$with_usrp = xyes; then if test x$enable_usrp = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component usrp: Cannot use both --enable and --with" >&5 -$as_echo "$as_me: error: Component usrp: Cannot use both --enable and --with" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component usrp: Cannot use both --enable and --with" "$LINENO" 5 else s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -34259,18 +26111,16 @@ export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - { { $as_echo "$as_me:$LINENO: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 fi fi if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with; check1=yes else @@ -34279,11 +26129,11 @@ if test "x$s_PKG_CONFIG_PATH" != "x"; then export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with else passed=no @@ -34291,9 +26141,7 @@ fi fi if test $passed != with; then - { { $as_echo "$as_me:$LINENO: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 fi s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -34319,15 +26167,13 @@ if test $passed != no; then if test $passed = yes; then if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component usrp requires omnithread, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp requires omnithread, which is not being built or specified via pre-installed files." >&5 $as_echo "Component usrp requires omnithread, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$omnithread_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component usrp requires omnithread to be included as --with-omnithread[=arg]" >&5 -$as_echo "$as_me: error: Component usrp requires omnithread to be included as --with-omnithread[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component usrp requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 fi fi fi @@ -34335,144 +26181,18 @@ -# Check whether --with-fusb-tech was given. -if test "${with_fusb_tech+set}" = set; then - withval=$with_fusb_tech; cf_with_fusb_tech="$withval" -else - cf_with_fusb_tech="$host_os" -fi - - if test x${enable_usrp} != xno; then - case "$cf_with_fusb_tech" in - linux*) - if test "${ac_cv_header_linux_usbdevice_fs_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for linux/usbdevice_fs.h" >&5 -$as_echo_n "checking for linux/usbdevice_fs.h... " >&6; } -if test "${ac_cv_header_linux_usbdevice_fs_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_usbdevice_fs_h" >&5 -$as_echo "$ac_cv_header_linux_usbdevice_fs_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking linux/usbdevice_fs.h usability" >&5 -$as_echo_n "checking linux/usbdevice_fs.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking linux/usbdevice_fs.h presence" >&5 -$as_echo_n "checking linux/usbdevice_fs.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: linux/usbdevice_fs.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: linux/usbdevice_fs.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/usbdevice_fs.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: linux/usbdevice_fs.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: linux/usbdevice_fs.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: linux/usbdevice_fs.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/usbdevice_fs.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: linux/usbdevice_fs.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/usbdevice_fs.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: linux/usbdevice_fs.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/usbdevice_fs.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: linux/usbdevice_fs.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/usbdevice_fs.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: linux/usbdevice_fs.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/usbdevice_fs.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: linux/usbdevice_fs.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for linux/usbdevice_fs.h" >&5 -$as_echo_n "checking for linux/usbdevice_fs.h... " >&6; } -if test "${ac_cv_header_linux_usbdevice_fs_h+set}" = set; then - $as_echo_n "(cached) " >&6 +# Check whether --with-fusb-tech was given. +if test "${with_fusb_tech+set}" = set; then : + withval=$with_fusb_tech; cf_with_fusb_tech="$withval" else - ac_cv_header_linux_usbdevice_fs_h=$ac_header_preproc + cf_with_fusb_tech="$host_os" fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_usbdevice_fs_h" >&5 -$as_echo "$ac_cv_header_linux_usbdevice_fs_h" >&6; } -fi -if test "x$ac_cv_header_linux_usbdevice_fs_h" = x""yes; then + if test x${enable_usrp} != xno; then + case "$cf_with_fusb_tech" in + linux*) + ac_fn_c_check_header_mongrel "$LINENO" "linux/usbdevice_fs.h" "ac_cv_header_linux_usbdevice_fs_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_usbdevice_fs_h" = x""yes; then : x_have_usbdevice_fs_h=yes else x_have_usbdevice_fs_h=no @@ -34492,13 +26212,9 @@ FUSB_TECH=win32 ;; *bsd*) - { $as_echo "$as_me:$LINENO: checking for RA/WB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RA/WB" >&5 $as_echo_n "checking for RA/WB... " >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -34510,32 +26226,11 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : FUSB_TECH=ra_wb else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - FUSB_TECH=generic + FUSB_TECH=generic fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; *) @@ -34543,9 +26238,9 @@ ;; esac - { $as_echo "$as_me:$LINENO: checking for fast usb technique to use" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fast usb technique to use" >&5 $as_echo_n "checking for fast usb technique to use... " >&6; } - { $as_echo "$as_me:$LINENO: result: $FUSB_TECH" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FUSB_TECH" >&5 $as_echo "$FUSB_TECH" >&6; } fi @@ -34593,133 +26288,34 @@ if test $passed = yes; then - -for ac_func in mkstemp -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp" +if test "x$ac_cv_func_mkstemp" = x""yes; then : + $as_echo "#define HAVE_MKSTEMP 1" >>confdefs.h else case " $LIBOBJS " in - *" $ac_func.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + *" mkstemp.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" ;; esac fi -done if test $ac_cv_func_mkstemp = no; then utils_cv_func_mkstemp_limitations=yes else - { $as_echo "$as_me:$LINENO: checking for mkstemp limitations" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mkstemp limitations" >&5 $as_echo_n "checking for mkstemp limitations... " >&6; } -if test "${utils_cv_func_mkstemp_limitations+set}" = set; then +if test "${utils_cv_func_mkstemp_limitations+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : utils_cv_func_mkstemp_limitations=yes else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # include @@ -34738,46 +26334,19 @@ } _ACEOF -rm -f 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : utils_cv_func_mkstemp_limitations=no 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 - -( exit $ac_status ) -utils_cv_func_mkstemp_limitations=yes + utils_cv_func_mkstemp_limitations=yes fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ $as_echo "$as_me:$LINENO: result: $utils_cv_func_mkstemp_limitations" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $utils_cv_func_mkstemp_limitations" >&5 $as_echo "$utils_cv_func_mkstemp_limitations" >&6; } fi @@ -34795,10 +26364,7 @@ esac -cat >>confdefs.h <<\_ACEOF -#define mkstemp rpl_mkstemp -_ACEOF - +$as_echo "#define mkstemp rpl_mkstemp" >>confdefs.h @@ -34818,248 +26384,23 @@ - -for ac_header in stdint.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in stdint.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" +if test "x$ac_cv_header_stdint_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_STDINT_H 1 _ACEOF fi done - - - -for ac_func in __secure_getenv gettimeofday lstat -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in __secure_getenv gettimeofday lstat +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -35076,13 +26417,9 @@ # AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) - { $as_echo "$as_me:$LINENO: checking whether mkdir accepts only one arg" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir accepts only one arg" >&5 $as_echo_n "checking whether mkdir accepts only one arg... " >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -35097,58 +26434,30 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define MKDIR_TAKES_ONE_ARG /**/ -_ACEOF +$as_echo "#define MKDIR_TAKES_ONE_ARG /**/" >>confdefs.h else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - - { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then +if test "${ac_cv_c_bigendian+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __APPLE_CC__ not a universal capable compiler @@ -35156,46 +26465,34 @@ typedef int dummy; _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # Check for potential -arch flags. It is not universal unless - # there are some -arch flags. Note that *ppc* also matches - # ppc64. This check is also rather less than ideal. - case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( - *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; - esac -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -35213,30 +26510,9 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -35252,49 +26528,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -35309,30 +26554,9 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to _BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -35347,51 +26571,20 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : # Try to guess by grepping values from an object file. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; @@ -35417,24 +26610,7 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -35446,20 +26622,10 @@ ac_cv_c_bigendian=unknown fi fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -35479,414 +26645,65 @@ return 0; } _ACEOF -rm -f 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_bigendian=no 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 - -( exit $ac_status ) -ac_cv_c_bigendian=yes + ac_cv_c_bigendian=yes fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +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:$LINENO: result: $ac_cv_c_bigendian" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 $as_echo "$ac_cv_c_bigendian" >&6; } case $ac_cv_c_bigendian in #( yes) - cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 -_ACEOF + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h ;; #( no) ;; #( universal) -cat >>confdefs.h <<\_ACEOF -#define AC_APPLE_UNIVERSAL_BUILD 1 -_ACEOF +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) - { { $as_echo "$as_me:$LINENO: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -$as_echo "$as_me: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac - - -for ac_header in byteswap.h linux/compiler.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - -for ac_func in getrusage sched_setscheduler pthread_setschedparam -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in byteswap.h linux/compiler.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_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - -for ac_func in sigaction snprintf -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -#undef $ac_func +fi -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif +done -int -main () -{ -return $ac_func (); - ; - return 0; -} + for ac_func in getrusage sched_setscheduler pthread_setschedparam +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" fi +done -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in sigaction snprintf +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -35898,103 +26715,48 @@ libusbok=yes - - pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for USB" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB" >&5 $as_echo_n "checking for USB... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$USB_CFLAGS"; then - pkg_cv_USB_CFLAGS="$USB_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5 +if test -n "$USB_CFLAGS"; then + pkg_cv_USB_CFLAGS="$USB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5 ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi - -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$USB_LIBS"; then - pkg_cv_USB_LIBS="$USB_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5 - ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_USB_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_USB_LIBS="$_pkg_tmp" -else - if test -n "$PKG_CONFIG"; then - if test -n "$USB_LIBS"; then - pkg_cv_USB_LIBS="$USB_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5 - ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi + else + pkg_failed=untried fi - -if test -n "$PKG_CONFIG"; then - if test -n "$USB_INCLUDEDIR"; then - pkg_cv_USB_INCLUDEDIR="$USB_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5 +if test -n "$USB_LIBS"; then + pkg_cv_USB_LIBS="$USB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5 ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_USB_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "libusb" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_USB_LIBS=`$PKG_CONFIG --libs "libusb" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi - if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36002,15 +26764,13 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb"` + USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libusb" 2>&1` else - USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb"` + USB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libusb" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$USB_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -36019,150 +26779,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - -for ac_header in usb.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in usb.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default" +if test "x$ac_cv_header_usb_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_USB_H 1 _ACEOF else - libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5 + libusbok=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5 $as_echo "USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&6; } fi @@ -36177,17 +26803,13 @@ *) ;; esac - { $as_echo "$as_me:$LINENO: checking for library containing usb_bulk_write" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing usb_bulk_write" >&5 $as_echo_n "checking for library containing usb_bulk_write... " >&6; } -if test "${ac_cv_search_usb_bulk_write+set}" = set; then +if test "${ac_cv_search_usb_bulk_write+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -36212,58 +26834,31 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_usb_bulk_write=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_usb_bulk_write+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_usb_bulk_write+set}" = set; then : break fi done -if test "${ac_cv_search_usb_bulk_write+set}" = set; then - : +if test "${ac_cv_search_usb_bulk_write+set}" = set; then : + else ac_cv_search_usb_bulk_write=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_usb_bulk_write" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_usb_bulk_write" >&5 $as_echo "$ac_cv_search_usb_bulk_write" >&6; } ac_res=$ac_cv_search_usb_bulk_write -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" USB_LIBS="$LIBS" else - libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5 + libusbok=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5 $as_echo "USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&6; } fi @@ -36278,6 +26873,8 @@ elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -36286,150 +26883,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - -for ac_header in usb.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in usb.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default" +if test "x$ac_cv_header_usb_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_USB_H 1 _ACEOF else - libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5 + libusbok=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5 $as_echo "USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&6; } fi @@ -36444,17 +26907,13 @@ *) ;; esac - { $as_echo "$as_me:$LINENO: checking for library containing usb_bulk_write" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing usb_bulk_write" >&5 $as_echo_n "checking for library containing usb_bulk_write... " >&6; } -if test "${ac_cv_search_usb_bulk_write+set}" = set; then +if test "${ac_cv_search_usb_bulk_write+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -36479,58 +26938,31 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_usb_bulk_write=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_usb_bulk_write+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_usb_bulk_write+set}" = set; then : break fi done -if test "${ac_cv_search_usb_bulk_write+set}" = set; then - : +if test "${ac_cv_search_usb_bulk_write+set}" = set; then : + else ac_cv_search_usb_bulk_write=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_usb_bulk_write" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_usb_bulk_write" >&5 $as_echo "$ac_cv_search_usb_bulk_write" >&6; } ac_res=$ac_cv_search_usb_bulk_write -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" USB_LIBS="$LIBS" else - libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5 + libusbok=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5 $as_echo "USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&6; } fi @@ -36547,27 +26979,16 @@ else USB_CFLAGS=$pkg_cv_USB_CFLAGS USB_LIBS=$pkg_cv_USB_LIBS - USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR - - USB_CPPFLAGS="" - for flag in $USB_CFLAGS; do - case $flag in - -I* | -D* | -U*) USB_CPPFLAGS="$USB_CPPFLAGS $flag" ;; - esac - done - pkg_cv_USB_CPPFLAGS=$USB_CPPFLAGS - - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi if test x$libusbok = xyes; then : else - passed=no;{ $as_echo "$as_me:$LINENO: result: Unable to find dependency libusb." >&5 + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Unable to find dependency libusb." >&5 $as_echo "Unable to find dependency libusb." >&6; } fi @@ -36576,9 +26997,9 @@ sdccok=yes # Extract the first word of "sdcc", so it can be a program name with args. set dummy sdcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_XCC+set}" = set; then +if test "${ac_cv_prog_XCC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$XCC"; then @@ -36589,14 +27010,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_XCC="sdcc -mmcs51 --no-xinit-opt" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_prog_XCC" && ac_cv_prog_XCC="no" @@ -36604,19 +27025,19 @@ fi XCC=$ac_cv_prog_XCC if test -n "$XCC"; then - { $as_echo "$as_me:$LINENO: result: $XCC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCC" >&5 $as_echo "$XCC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "asx8051", so it can be a program name with args. set dummy asx8051; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_XAS+set}" = set; then +if test "${ac_cv_prog_XAS+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$XAS"; then @@ -36627,14 +27048,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_XAS="asx8051 -plosgff" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_prog_XAS" && ac_cv_prog_XAS="no" @@ -36642,17 +27063,17 @@ fi XAS=$ac_cv_prog_XAS if test -n "$XAS"; then - { $as_echo "$as_me:$LINENO: result: $XAS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XAS" >&5 $as_echo "$XAS" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test "$XCC" = "no" -o "$XAS" = "no" ; then - { $as_echo "$as_me:$LINENO: result: USRP requires sdcc. sdcc not found. See http://sdcc.sf.net" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires sdcc. sdcc not found. See http://sdcc.sf.net" >&5 $as_echo "USRP requires sdcc. sdcc not found. See http://sdcc.sf.net" >&6; } sdccok=no else @@ -36661,7 +27082,7 @@ sdcc_version=`sdcc --version 2>&1 | \ sed 's/\(SDCC.* \)\([0-9]*\.[0-9]*\.[0-9]*\)\( .*$\)/\2/'` - { $as_echo "$as_me:$LINENO: checking sdcc_version \"$sdcc_version\"" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking sdcc_version \"$sdcc_version\"" >&5 $as_echo_n "checking sdcc_version \"$sdcc_version\"... " >&6; } sdcc_major_version=`echo $sdcc_version | \ @@ -36687,11 +27108,11 @@ "$sdcc_micro_version" \>= "$sdcc_micro_min" ` if test "$sdcc_version_proper" = "1" ; then - { $as_echo "$as_me:$LINENO: result: $sdcc_major_version.$sdcc_minor_version.$sdcc_micro_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sdcc_major_version.$sdcc_minor_version.$sdcc_micro_version" >&5 $as_echo "$sdcc_major_version.$sdcc_minor_version.$sdcc_micro_version" >&6; } else sdccok=no - { $as_echo "$as_me:$LINENO: result: USRP requires sdcc >= $sdcc_version_min. sdcc not found. See http://sdcc.sf.net" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires sdcc >= $sdcc_version_min. sdcc not found. See http://sdcc.sf.net" >&5 $as_echo "USRP requires sdcc >= $sdcc_version_min. sdcc not found. See http://sdcc.sf.net" >&6; } fi @@ -36702,7 +27123,7 @@ if test $sdccok = yes; then : else - passed=no;{ $as_echo "$as_me:$LINENO: result: Unable to find firmware compiler SDCC." >&5 + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Unable to find firmware compiler SDCC." >&5 $as_echo "Unable to find firmware compiler SDCC." >&6; } fi @@ -36731,11 +27152,9 @@ usrp_with=no if test $passed = no; then if test x$enable_usrp = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component usrp has errors; stopping." >&5 -$as_echo "$as_me: error: Component usrp has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component usrp has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component usrp." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component usrp." >&5 $as_echo "Not building component usrp." >&6; } fi else @@ -36791,7 +27210,7 @@ usrp_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component usrp will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp will be included from a pre-installed library and includes." >&5 $as_echo "Component usrp will be included from a pre-installed library and includes." >&6; } usrp_with=yes else @@ -36799,11 +27218,11 @@ if test x$enable_usrp != xno; then : build_dirs="$build_dirs usrp" - { $as_echo "$as_me:$LINENO: result: Component usrp passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp passed configuration checks; building." >&5 $as_echo "Component usrp passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component usrp passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp passed configuration checks; but not building." >&5 $as_echo "Component usrp passed configuration checks; but not building." >&6; } fi fi @@ -36826,665 +27245,132 @@ - - passed=yes - # Check whether --enable-usrp2 was given. -if test "${enable_usrp2+set}" = set; then - enableval=$enable_usrp2; -else - - enable_usrp2=$enable_all_components - if test x$enable_all_components = xno; then - passed=no - fi - -fi - - - - - subdirs="$subdirs usrp2/firmware" - - - - if test $passed != no; then - if test $passed = yes; then - if test x$gruel_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component usrp2 requires gruel, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component usrp2 requires gruel, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi - else - if test x$gruel_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component usrp2 requires gruel to be included as --with-gruel[=arg]" >&5 -$as_echo "$as_me: error: Component usrp2 requires gruel to be included as --with-gruel[=arg]" >&2;} - { (exit 1); exit 1; }; } - fi - fi - fi - - - if test $passed != no; then - if test $passed = yes; then - if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component usrp2 requires omnithread, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component usrp2 requires omnithread, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi - else - if test x$omnithread_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component usrp2 requires omnithread to be included as --with-omnithread[=arg]" >&5 -$as_echo "$as_me: error: Component usrp2 requires omnithread to be included as --with-omnithread[=arg]" >&2;} - { (exit 1); exit 1; }; } - fi - fi - fi - - - { $as_echo "$as_me:$LINENO: checking whether host_os is linux*" >&5 -$as_echo_n "checking whether host_os is linux*... " >&6; } - case "$host_os" in - linux*) - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - ;; - *) - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: USRP2 currently requires Linux host OS, not found" >&5 -$as_echo "$as_me: USRP2 currently requires Linux host OS, not found" >&6;} - passed="no" - ;; - esac - - if test $passed = yes; then - - - - - -for ac_header in arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h sys/un.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - { $as_echo "$as_me:$LINENO: checking for struct msghdr.msg_control" >&5 -$as_echo_n "checking for struct msghdr.msg_control... " >&6; } -if test "${ac_cv_member_struct_msghdr_msg_control+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define __USE_GNU 1 - #include - #include - #include - -int -main () -{ -static struct msghdr ac_aggr; -if (ac_aggr.msg_control) -return 0; - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_msghdr_msg_control=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define __USE_GNU 1 - #include - #include - #include - -int -main () -{ -static struct msghdr ac_aggr; -if (sizeof ac_aggr.msg_control) -return 0; - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_msghdr_msg_control=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_member_struct_msghdr_msg_control=no -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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_msghdr_msg_control" >&5 -$as_echo "$ac_cv_member_struct_msghdr_msg_control" >&6; } -if test "x$ac_cv_member_struct_msghdr_msg_control" = x""yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1 -_ACEOF - - -fi -{ $as_echo "$as_me:$LINENO: checking for struct msghdr.msg_accrights" >&5 -$as_echo_n "checking for struct msghdr.msg_accrights... " >&6; } -if test "${ac_cv_member_struct_msghdr_msg_accrights+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define __USE_GNU 1 - #include - #include - #include - -int -main () -{ -static struct msghdr ac_aggr; -if (ac_aggr.msg_accrights) -return 0; - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_msghdr_msg_accrights=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define __USE_GNU 1 - #include - #include - #include - -int -main () -{ -static struct msghdr ac_aggr; -if (sizeof ac_aggr.msg_accrights) -return 0; - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_msghdr_msg_accrights=yes + + passed=yes + # Check whether --enable-usrp2 was given. +if test "${enable_usrp2+set}" = set; then : + enableval=$enable_usrp2; else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_member_struct_msghdr_msg_accrights=no -fi + enable_usrp2=$enable_all_components + if test x$enable_all_components = xno; then + passed=no + 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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_msghdr_msg_accrights" >&5 -$as_echo "$ac_cv_member_struct_msghdr_msg_accrights" >&6; } -if test "x$ac_cv_member_struct_msghdr_msg_accrights" = x""yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS 1 -_ACEOF -fi -{ $as_echo "$as_me:$LINENO: checking for struct cmsgcred.cmcred_uid" >&5 -$as_echo_n "checking for struct cmsgcred.cmcred_uid... " >&6; } -if test "${ac_cv_member_struct_cmsgcred_cmcred_uid+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define __USE_GNU 1 - #include - #include - #include + subdirs="$subdirs usrp2/firmware" -int -main () -{ -static struct cmsgcred ac_aggr; -if (ac_aggr.cmcred_uid) -return 0; - ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_cmsgcred_cmcred_uid=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define __USE_GNU 1 - #include - #include - #include -int -main () -{ -static struct cmsgcred ac_aggr; -if (sizeof ac_aggr.cmcred_uid) -return 0; - ; - return 0; -} + if test $passed != no; then + if test $passed = yes; then + if test x$gruel_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 requires gruel, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component usrp2 requires gruel, which is not being built or specified via pre-installed files." >&6; } + passed=no + fi + else + if test x$gruel_with = xno; then + as_fn_error $? "Component usrp2 requires gruel to be included as --with-gruel[=arg]" "$LINENO" 5 + fi + fi + fi + + + if test $passed != no; then + if test $passed = yes; then + if test x$omnithread_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 requires omnithread, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component usrp2 requires omnithread, which is not being built or specified via pre-installed files." >&6; } + passed=no + fi + else + if test x$omnithread_with = xno; then + as_fn_error $? "Component usrp2 requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 + fi + fi + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether host_os is linux*" >&5 +$as_echo_n "checking whether host_os is linux*... " >&6; } + case "$host_os" in + linux*) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: USRP2 currently requires Linux host OS, not found" >&5 +$as_echo "$as_me: USRP2 currently requires Linux host OS, not found" >&6;} + passed="no" + ;; + esac + + if test $passed = yes; then + for ac_header in arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h sys/un.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 -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_cmsgcred_cmcred_uid=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_member_struct_cmsgcred_cmcred_uid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi +done -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_cmsgcred_cmcred_uid" >&5 -$as_echo "$ac_cv_member_struct_cmsgcred_cmcred_uid" >&6; } -if test "x$ac_cv_member_struct_cmsgcred_cmcred_uid" = x""yes; then + ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_control" "ac_cv_member_struct_msghdr_msg_control" "#define __USE_GNU 1 + #include + #include + #include +" +if test "x$ac_cv_member_struct_msghdr_msg_control" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_CMSGCRED_CMCRED_UID 1 +#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1 _ACEOF fi -{ $as_echo "$as_me:$LINENO: checking for struct ucred.uid" >&5 -$as_echo_n "checking for struct ucred.uid... " >&6; } -if test "${ac_cv_member_struct_ucred_uid+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define __USE_GNU 1 +ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_accrights" "ac_cv_member_struct_msghdr_msg_accrights" "#define __USE_GNU 1 #include #include #include +" +if test "x$ac_cv_member_struct_msghdr_msg_accrights" = x""yes; then : -int -main () -{ -static struct ucred ac_aggr; -if (ac_aggr.uid) -return 0; - ; - return 0; -} +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS 1 _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_ucred_uid=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define __USE_GNU 1 + +fi +ac_fn_c_check_member "$LINENO" "struct cmsgcred" "cmcred_uid" "ac_cv_member_struct_cmsgcred_cmcred_uid" "#define __USE_GNU 1 #include #include #include +" +if test "x$ac_cv_member_struct_cmsgcred_cmcred_uid" = x""yes; then : -int -main () -{ -static struct ucred ac_aggr; -if (sizeof ac_aggr.uid) -return 0; - ; - return 0; -} +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_CMSGCRED_CMCRED_UID 1 _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_ucred_uid=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_member_struct_ucred_uid=no -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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ucred_uid" >&5 -$as_echo "$ac_cv_member_struct_ucred_uid" >&6; } -if test "x$ac_cv_member_struct_ucred_uid" = x""yes; then +ac_fn_c_check_member "$LINENO" "struct ucred" "uid" "ac_cv_member_struct_ucred_uid" "#define __USE_GNU 1 + #include + #include + #include +" +if test "x$ac_cv_member_struct_ucred_uid" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_UCRED_UID 1 @@ -37511,11 +27397,9 @@ usrp2_with=no if test $passed = no; then if test x$enable_usrp2 = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component usrp2 has errors; stopping." >&5 -$as_echo "$as_me: error: Component usrp2 has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component usrp2 has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component usrp2." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component usrp2." >&5 $as_echo "Not building component usrp2." >&6; } fi else @@ -37571,7 +27455,7 @@ usrp2_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component usrp2 will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 will be included from a pre-installed library and includes." >&5 $as_echo "Component usrp2 will be included from a pre-installed library and includes." >&6; } usrp2_with=yes else @@ -37579,11 +27463,11 @@ if test x$enable_usrp2 != xno; then : build_dirs="$build_dirs usrp2" - { $as_echo "$as_me:$LINENO: result: Component usrp2 passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 passed configuration checks; building." >&5 $as_echo "Component usrp2 passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component usrp2 passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 passed configuration checks; but not building." >&5 $as_echo "Component usrp2 passed configuration checks; but not building." >&6; } fi fi @@ -37607,7 +27491,7 @@ passed=yes # Check whether --enable-gr-usrp was given. -if test "${enable_gr_usrp+set}" = set; then +if test "${enable_gr_usrp+set}" = set; then : enableval=$enable_gr_usrp; else @@ -37625,15 +27509,13 @@ if test $passed != no; then if test $passed = yes; then if test x$usrp_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-usrp requires usrp, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp requires usrp, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-usrp requires usrp, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$usrp_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-usrp requires usrp to be included as --with-usrp[=arg]" >&5 -$as_echo "$as_me: error: Component gr-usrp requires usrp to be included as --with-usrp[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-usrp requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 fi fi fi @@ -37642,15 +27524,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-usrp requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-usrp requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-usrp requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-usrp requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-usrp requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -37664,11 +27544,9 @@ gr_usrp_with=no if test $passed = no; then if test x$enable_gr_usrp = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-usrp has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-usrp has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-usrp has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-usrp." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-usrp." >&5 $as_echo "Not building component gr-usrp." >&6; } fi else @@ -37724,7 +27602,7 @@ gr_usrp_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-usrp will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-usrp will be included from a pre-installed library and includes." >&6; } gr_usrp_with=yes else @@ -37734,11 +27612,11 @@ build_dirs="$build_dirs gr-usrp" - { $as_echo "$as_me:$LINENO: result: Component gr-usrp passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp passed configuration checks; building." >&5 $as_echo "Component gr-usrp passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-usrp passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp passed configuration checks; but not building." >&5 $as_echo "Component gr-usrp passed configuration checks; but not building." >&6; } fi fi @@ -37761,7 +27639,7 @@ passed=yes # Check whether --enable-gr-usrp2 was given. -if test "${enable_gr_usrp2+set}" = set; then +if test "${enable_gr_usrp2+set}" = set; then : enableval=$enable_gr_usrp2; else @@ -37779,15 +27657,13 @@ if test $passed != no; then if test $passed = yes; then if test x$usrp2_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-usrp2 requires usrp2, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 requires usrp2, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-usrp2 requires usrp2, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$usrp2_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-usrp2 requires usrp2 to be included as --with-usrp2[=arg]" >&5 -$as_echo "$as_me: error: Component gr-usrp2 requires usrp2 to be included as --with-usrp2[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-usrp2 requires usrp2 to be included as --with-usrp2[=arg]" "$LINENO" 5 fi fi fi @@ -37796,15 +27672,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-usrp2 requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-usrp2 requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-usrp2 requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-usrp2 requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-usrp2 requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -37818,11 +27692,9 @@ gr_usrp2_with=no if test $passed = no; then if test x$enable_gr_usrp2 = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-usrp2 has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-usrp2 has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-usrp2 has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-usrp2." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-usrp2." >&5 $as_echo "Not building component gr-usrp2." >&6; } fi else @@ -37878,7 +27750,7 @@ gr_usrp2_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-usrp2 will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-usrp2 will be included from a pre-installed library and includes." >&6; } gr_usrp2_with=yes else @@ -37888,11 +27760,11 @@ build_dirs="$build_dirs gr-usrp2" - { $as_echo "$as_me:$LINENO: result: Component gr-usrp2 passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 passed configuration checks; building." >&5 $as_echo "Component gr-usrp2 passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-usrp2 passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 passed configuration checks; but not building." >&5 $as_echo "Component gr-usrp2 passed configuration checks; but not building." >&6; } fi fi @@ -37916,7 +27788,7 @@ passed=yes # Check whether --enable-gr-gcell was given. -if test "${enable_gr_gcell+set}" = set; then +if test "${enable_gr_gcell+set}" = set; then : enableval=$enable_gr_gcell; else @@ -37934,15 +27806,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gcell_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-gcell requires gcell, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell requires gcell, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-gcell requires gcell, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gcell_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-gcell requires gcell to be included as --with-gcell[=arg]" >&5 -$as_echo "$as_me: error: Component gr-gcell requires gcell to be included as --with-gcell[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-gcell requires gcell to be included as --with-gcell[=arg]" "$LINENO" 5 fi fi fi @@ -37951,15 +27821,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-gcell requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-gcell requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-gcell requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-gcell requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-gcell requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -37973,11 +27841,9 @@ gr_gcell_with=no if test $passed = no; then if test x$enable_gr_gcell = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-gcell has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-gcell has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-gcell has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-gcell." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-gcell." >&5 $as_echo "Not building component gr-gcell." >&6; } fi else @@ -38033,7 +27899,7 @@ gr_gcell_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-gcell will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-gcell will be included from a pre-installed library and includes." >&6; } gr_gcell_with=yes else @@ -38043,11 +27909,11 @@ build_dirs="$build_dirs gr-gcell" - { $as_echo "$as_me:$LINENO: result: Component gr-gcell passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell passed configuration checks; building." >&5 $as_echo "Component gr-gcell passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-gcell passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell passed configuration checks; but not building." >&5 $as_echo "Component gr-gcell passed configuration checks; but not building." >&6; } fi fi @@ -38070,7 +27936,7 @@ passed=yes # Check whether --enable-gr-audio-alsa was given. -if test "${enable_gr_audio_alsa+set}" = set; then +if test "${enable_gr_audio_alsa+set}" = set; then : enableval=$enable_gr_audio_alsa; else @@ -38088,15 +27954,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-audio-alsa requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-alsa requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-audio-alsa requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-audio-alsa requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-audio-alsa requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-audio-alsa requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -38104,103 +27968,48 @@ if test $passed = yes; then - - pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for ALSA" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5 $as_echo_n "checking for ALSA... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$ALSA_CFLAGS"; then - pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\"") >&5 +if test -n "$ALSA_CFLAGS"; then + pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\""; } >&5 ($PKG_CONFIG --exists --print-errors "alsa >= 0.9") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 0.9" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi - -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$ALSA_LIBS"; then - pkg_cv_ALSA_LIBS="$ALSA_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\"") >&5 - ($PKG_CONFIG --exists --print-errors "alsa >= 0.9") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs --static "alsa >= 0.9" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_ALSA_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_ALSA_LIBS="$_pkg_tmp" -else - if test -n "$PKG_CONFIG"; then - if test -n "$ALSA_LIBS"; then - pkg_cv_ALSA_LIBS="$ALSA_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\"") >&5 - ($PKG_CONFIG --exists --print-errors "alsa >= 0.9") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs --static "alsa >= 0.9" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi + else + pkg_failed=untried fi - -if test -n "$PKG_CONFIG"; then - if test -n "$ALSA_INCLUDEDIR"; then - pkg_cv_ALSA_INCLUDEDIR="$ALSA_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\"") >&5 +if test -n "$ALSA_LIBS"; then + pkg_cv_ALSA_LIBS="$ALSA_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\""; } >&5 ($PKG_CONFIG --exists --print-errors "alsa >= 0.9") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_ALSA_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "alsa >= 0.9" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 0.9" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi - if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -38208,37 +28017,26 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "alsa >= 0.9"` + ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa >= 0.9" 2>&1` else - ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa >= 0.9"` + ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa >= 0.9" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ALSA_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - passed=no;{ $as_echo "$as_me:$LINENO: result: gr-audio-alsa requires package alsa, not found." >&5 + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-alsa requires package alsa, not found." >&5 $as_echo "gr-audio-alsa requires package alsa, not found." >&6; } elif test $pkg_failed = untried; then - passed=no;{ $as_echo "$as_me:$LINENO: result: gr-audio-alsa requires package alsa, not found." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-alsa requires package alsa, not found." >&5 $as_echo "gr-audio-alsa requires package alsa, not found." >&6; } else ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS ALSA_LIBS=$pkg_cv_ALSA_LIBS - ALSA_INCLUDEDIR=$pkg_cv_ALSA_INCLUDEDIR - - ALSA_CPPFLAGS="" - for flag in $ALSA_CFLAGS; do - case $flag in - -I* | -D* | -U*) ALSA_CPPFLAGS="$ALSA_CPPFLAGS $flag" ;; - esac - done - pkg_cv_ALSA_CPPFLAGS=$ALSA_CPPFLAGS - - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi fi @@ -38250,11 +28048,9 @@ gr_audio_alsa_with=no if test $passed = no; then if test x$enable_gr_audio_alsa = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-audio-alsa has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-audio-alsa has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-audio-alsa has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-audio-alsa." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-alsa." >&5 $as_echo "Not building component gr-audio-alsa." >&6; } fi else @@ -38310,7 +28106,7 @@ gr_audio_alsa_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-audio-alsa will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-alsa will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-audio-alsa will be included from a pre-installed library and includes." >&6; } gr_audio_alsa_with=yes else @@ -38320,11 +28116,11 @@ build_dirs="$build_dirs gr-audio-alsa" - { $as_echo "$as_me:$LINENO: result: Component gr-audio-alsa passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-alsa passed configuration checks; building." >&5 $as_echo "Component gr-audio-alsa passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-audio-alsa passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-alsa passed configuration checks; but not building." >&5 $as_echo "Component gr-audio-alsa passed configuration checks; but not building." >&6; } fi fi @@ -38348,7 +28144,7 @@ passed=yes # Check whether --enable-gr-audio-jack was given. -if test "${enable_gr_audio_jack+set}" = set; then +if test "${enable_gr_audio_jack+set}" = set; then : enableval=$enable_gr_audio_jack; else @@ -38366,15 +28162,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-audio-jack requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-jack requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-audio-jack requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-audio-jack requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-audio-jack requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-audio-jack requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -38382,103 +28176,48 @@ if test $passed = yes; then - - pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for JACK" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5 $as_echo_n "checking for JACK... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$JACK_CFLAGS"; then - pkg_cv_JACK_CFLAGS="$JACK_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\"") >&5 +if test -n "$JACK_CFLAGS"; then + pkg_cv_JACK_CFLAGS="$JACK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\""; } >&5 ($PKG_CONFIG --exists --print-errors "jack >= 0.8") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 0.8" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi - -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$JACK_LIBS"; then - pkg_cv_JACK_LIBS="$JACK_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\"") >&5 - ($PKG_CONFIG --exists --print-errors "jack >= 0.8") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs --static "jack >= 0.8" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_JACK_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_JACK_LIBS="$_pkg_tmp" -else - if test -n "$PKG_CONFIG"; then - if test -n "$JACK_LIBS"; then - pkg_cv_JACK_LIBS="$JACK_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\"") >&5 - ($PKG_CONFIG --exists --print-errors "jack >= 0.8") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs --static "jack >= 0.8" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi + else + pkg_failed=untried fi - -if test -n "$PKG_CONFIG"; then - if test -n "$JACK_INCLUDEDIR"; then - pkg_cv_JACK_INCLUDEDIR="$JACK_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\"") >&5 +if test -n "$JACK_LIBS"; then + pkg_cv_JACK_LIBS="$JACK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\""; } >&5 ($PKG_CONFIG --exists --print-errors "jack >= 0.8") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_JACK_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "jack >= 0.8" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= 0.8" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi - if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -38486,37 +28225,26 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "jack >= 0.8"` + JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "jack >= 0.8" 2>&1` else - JACK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "jack >= 0.8"` + JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors "jack >= 0.8" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$JACK_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - passed=no;{ $as_echo "$as_me:$LINENO: result: gr-audio-jack requires package jack, not found." >&5 + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-jack requires package jack, not found." >&5 $as_echo "gr-audio-jack requires package jack, not found." >&6; } elif test $pkg_failed = untried; then - passed=no;{ $as_echo "$as_me:$LINENO: result: gr-audio-jack requires package jack, not found." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-jack requires package jack, not found." >&5 $as_echo "gr-audio-jack requires package jack, not found." >&6; } else JACK_CFLAGS=$pkg_cv_JACK_CFLAGS JACK_LIBS=$pkg_cv_JACK_LIBS - JACK_INCLUDEDIR=$pkg_cv_JACK_INCLUDEDIR - - JACK_CPPFLAGS="" - for flag in $JACK_CFLAGS; do - case $flag in - -I* | -D* | -U*) JACK_CPPFLAGS="$JACK_CPPFLAGS $flag" ;; - esac - done - pkg_cv_JACK_CPPFLAGS=$JACK_CPPFLAGS - - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi fi @@ -38528,11 +28256,9 @@ gr_audio_jack_with=no if test $passed = no; then if test x$enable_gr_audio_jack = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-audio-jack has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-audio-jack has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-audio-jack has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-audio-jack." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-jack." >&5 $as_echo "Not building component gr-audio-jack." >&6; } fi else @@ -38588,7 +28314,7 @@ gr_audio_jack_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-audio-jack will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-jack will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-audio-jack will be included from a pre-installed library and includes." >&6; } gr_audio_jack_with=yes else @@ -38598,11 +28324,11 @@ build_dirs="$build_dirs gr-audio-jack" - { $as_echo "$as_me:$LINENO: result: Component gr-audio-jack passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-jack passed configuration checks; building." >&5 $as_echo "Component gr-audio-jack passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-audio-jack passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-jack passed configuration checks; but not building." >&5 $as_echo "Component gr-audio-jack passed configuration checks; but not building." >&6; } fi fi @@ -38626,7 +28352,7 @@ passed=yes # Check whether --enable-gr-audio-oss was given. -if test "${enable_gr_audio_oss+set}" = set; then +if test "${enable_gr_audio_oss+set}" = set; then : enableval=$enable_gr_audio_oss; else @@ -38644,15 +28370,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-audio-oss requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-oss requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-audio-oss requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-audio-oss requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-audio-oss requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-audio-oss requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -38661,19 +28385,14 @@ if test $passed = yes; then case $host_os in netbsd*) - -{ $as_echo "$as_me:$LINENO: checking for main in -lossaudio" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lossaudio" >&5 $as_echo_n "checking for main in -lossaudio... " >&6; } -if test "${ac_cv_lib_ossaudio_main+set}" = set; then +if test "${ac_cv_lib_ossaudio_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lossaudio $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -38685,43 +28404,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ossaudio_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ossaudio_main=no + ac_cv_lib_ossaudio_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio_main" >&5 $as_echo "$ac_cv_lib_ossaudio_main" >&6; } -if test "x$ac_cv_lib_ossaudio_main" = x""yes; then +if test "x$ac_cv_lib_ossaudio_main" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBOSSAUDIO 1 _ACEOF @@ -38729,7 +28423,7 @@ LIBS="-lossaudio $LIBS" else - passed=no;{ $as_echo "$as_me:$LINENO: result: gr-audio-oss requires library ossaudio, not found." >&5 + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-oss requires library ossaudio, not found." >&5 $as_echo "gr-audio-oss requires library ossaudio, not found." >&6; } fi ac_cv_lib_ossaudio=ac_cv_lib_ossaudio_main @@ -38737,7 +28431,7 @@ if test $passed != no; then OSS_LIBS=-lossaudio - { $as_echo "$as_me:$LINENO: result: Using OSS library $OSS_LIBS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using OSS library $OSS_LIBS" >&5 $as_echo "Using OSS library $OSS_LIBS" >&6; } fi ;; @@ -38745,137 +28439,11 @@ passed=no ;; *) - if test "${ac_cv_header_sys_soundcard_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 -$as_echo_n "checking for sys/soundcard.h... " >&6; } -if test "${ac_cv_header_sys_soundcard_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 -$as_echo "$ac_cv_header_sys_soundcard_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5 -$as_echo_n "checking sys/soundcard.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5 -$as_echo_n "checking sys/soundcard.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: sys/soundcard.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: sys/soundcard.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 -$as_echo_n "checking for sys/soundcard.h... " >&6; } -if test "${ac_cv_header_sys_soundcard_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_sys_soundcard_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 -$as_echo "$ac_cv_header_sys_soundcard_h" >&6; } + ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_soundcard_h" = x""yes; then : -fi -if test "x$ac_cv_header_sys_soundcard_h" = x""yes; then - : else - passed=no;{ $as_echo "$as_me:$LINENO: result: gr-audio-oss requires sys/soundcard.h, not found." >&5 + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-oss requires sys/soundcard.h, not found." >&5 $as_echo "gr-audio-oss requires sys/soundcard.h, not found." >&6; } fi @@ -38891,11 +28459,9 @@ gr_audio_oss_with=no if test $passed = no; then if test x$enable_gr_audio_oss = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-audio-oss has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-audio-oss has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-audio-oss has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-audio-oss." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-oss." >&5 $as_echo "Not building component gr-audio-oss." >&6; } fi else @@ -38951,7 +28517,7 @@ gr_audio_oss_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-audio-oss will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-oss will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-audio-oss will be included from a pre-installed library and includes." >&6; } gr_audio_oss_with=yes else @@ -38961,11 +28527,11 @@ build_dirs="$build_dirs gr-audio-oss" - { $as_echo "$as_me:$LINENO: result: Component gr-audio-oss passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-oss passed configuration checks; building." >&5 $as_echo "Component gr-audio-oss passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-audio-oss passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-oss passed configuration checks; but not building." >&5 $as_echo "Component gr-audio-oss passed configuration checks; but not building." >&6; } fi fi @@ -38989,7 +28555,7 @@ passed=yes # Check whether --enable-gr-audio-osx was given. -if test "${enable_gr_audio_osx+set}" = set; then +if test "${enable_gr_audio_osx+set}" = set; then : enableval=$enable_gr_audio_osx; else @@ -39007,15 +28573,13 @@ if test $passed != no; then if test $passed = yes; then if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-audio-osx requires omnithread, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx requires omnithread, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-audio-osx requires omnithread, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$omnithread_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-audio-osx requires omnithread to be included as --with-omnithread[=arg]" >&5 -$as_echo "$as_me: error: Component gr-audio-osx requires omnithread to be included as --with-omnithread[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-audio-osx requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 fi fi fi @@ -39024,15 +28588,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-audio-osx requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-audio-osx requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-audio-osx requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-audio-osx requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-audio-osx requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -39047,304 +28609,36 @@ darwin*);; *) audiounitok=no - { $as_echo "$as_me:$LINENO: result: gr-audio-osx requires darwin or MacOS X." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx requires darwin or MacOS X." >&5 $as_echo "gr-audio-osx requires darwin or MacOS X." >&6; } esac - -for ac_header in AudioUnit/AudioUnit.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in AudioUnit/AudioUnit.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "AudioUnit/AudioUnit.h" "ac_cv_header_AudioUnit_AudioUnit_h" "$ac_includes_default" +if test "x$ac_cv_header_AudioUnit_AudioUnit_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_AUDIOUNIT_AUDIOUNIT_H 1 _ACEOF else - audiounitok=no;{ $as_echo "$as_me:$LINENO: result: gr-audio-osx requires AudioUnit/AudioUnit.h, which is available on MacOS X." >&5 + audiounitok=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx requires AudioUnit/AudioUnit.h, which is available on MacOS X." >&5 $as_echo "gr-audio-osx requires AudioUnit/AudioUnit.h, which is available on MacOS X." >&6; } fi done - -for ac_header in AudioToolbox/AudioToolbox.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in AudioToolbox/AudioToolbox.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "AudioToolbox/AudioToolbox.h" "ac_cv_header_AudioToolbox_AudioToolbox_h" "$ac_includes_default" +if test "x$ac_cv_header_AudioToolbox_AudioToolbox_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_AUDIOTOOLBOX_AUDIOTOOLBOX_H 1 _ACEOF else - audiounitok=no;{ $as_echo "$as_me:$LINENO: result: gr-audio-osx requires AudioToolbox/AudioToolbox.h, which is available on MacOS X." >&5 + audiounitok=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx requires AudioToolbox/AudioToolbox.h, which is available on MacOS X." >&5 $as_echo "gr-audio-osx requires AudioToolbox/AudioToolbox.h, which is available on MacOS X." >&6; } fi @@ -39354,13 +28648,13 @@ if test $audiounitok = yes; then : else - passed=no;{ $as_echo "$as_me:$LINENO: result: gr-audio-osx requires AudioUnit, not found." >&5 + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx requires AudioUnit, not found." >&5 $as_echo "gr-audio-osx requires AudioUnit, not found." >&6; } fi ;; *) - { $as_echo "$as_me:$LINENO: result: gr-audio-osx will build on Mac OS X and Darwin only." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx will build on Mac OS X and Darwin only." >&5 $as_echo "gr-audio-osx will build on Mac OS X and Darwin only." >&6; } passed=no ;; @@ -39375,11 +28669,9 @@ gr_audio_osx_with=no if test $passed = no; then if test x$enable_gr_audio_osx = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-audio-osx has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-audio-osx has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-audio-osx has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-audio-osx." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-osx." >&5 $as_echo "Not building component gr-audio-osx." >&6; } fi else @@ -39435,7 +28727,7 @@ gr_audio_osx_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-audio-osx will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-audio-osx will be included from a pre-installed library and includes." >&6; } gr_audio_osx_with=yes else @@ -39445,11 +28737,11 @@ build_dirs="$build_dirs gr-audio-osx" - { $as_echo "$as_me:$LINENO: result: Component gr-audio-osx passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx passed configuration checks; building." >&5 $as_echo "Component gr-audio-osx passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-audio-osx passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx passed configuration checks; but not building." >&5 $as_echo "Component gr-audio-osx passed configuration checks; but not building." >&6; } fi fi @@ -39473,7 +28765,7 @@ passed=yes # Check whether --enable-gr-audio-portaudio was given. -if test "${enable_gr_audio_portaudio+set}" = set; then +if test "${enable_gr_audio_portaudio+set}" = set; then : enableval=$enable_gr_audio_portaudio; else @@ -39491,15 +28783,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-audio-portaudio requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-portaudio requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-audio-portaudio requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-audio-portaudio requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-audio-portaudio requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-audio-portaudio requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -39507,103 +28797,48 @@ if test $passed = yes; then - - pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for PORTAUDIO" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5 $as_echo_n "checking for PORTAUDIO... " >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$PORTAUDIO_CFLAGS"; then - pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\"") >&5 - ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_PORTAUDIO_CFLAGS=`$PKG_CONFIG --cflags "portaudio-2.0 >= 19" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$PORTAUDIO_LIBS"; then - pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\"") >&5 - ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs --static "portaudio-2.0 >= 19" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_PORTAUDIO_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_PORTAUDIO_LIBS="$_pkg_tmp" -else - if test -n "$PKG_CONFIG"; then - if test -n "$PORTAUDIO_LIBS"; then - pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\"") >&5 + +if test -n "$PORTAUDIO_CFLAGS"; then + pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5 ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs --static "portaudio-2.0 >= 19" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PORTAUDIO_CFLAGS=`$PKG_CONFIG --cflags "portaudio-2.0 >= 19" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi + else + pkg_failed=untried fi - -if test -n "$PKG_CONFIG"; then - if test -n "$PORTAUDIO_INCLUDEDIR"; then - pkg_cv_PORTAUDIO_INCLUDEDIR="$PORTAUDIO_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\"") >&5 +if test -n "$PORTAUDIO_LIBS"; then + pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5 ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_PORTAUDIO_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "portaudio-2.0 >= 19" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs "portaudio-2.0 >= 19" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi - if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -39611,37 +28846,26 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "portaudio-2.0 >= 19"` + PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "portaudio-2.0 >= 19" 2>&1` else - PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "portaudio-2.0 >= 19"` + PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "portaudio-2.0 >= 19" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PORTAUDIO_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - passed=no;{ $as_echo "$as_me:$LINENO: result: gr-audio-portaudio requires package portaudio, not found." >&5 + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-portaudio requires package portaudio, not found." >&5 $as_echo "gr-audio-portaudio requires package portaudio, not found." >&6; } elif test $pkg_failed = untried; then - passed=no;{ $as_echo "$as_me:$LINENO: result: gr-audio-portaudio requires package portaudio, not found." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-portaudio requires package portaudio, not found." >&5 $as_echo "gr-audio-portaudio requires package portaudio, not found." >&6; } else PORTAUDIO_CFLAGS=$pkg_cv_PORTAUDIO_CFLAGS PORTAUDIO_LIBS=$pkg_cv_PORTAUDIO_LIBS - PORTAUDIO_INCLUDEDIR=$pkg_cv_PORTAUDIO_INCLUDEDIR - - PORTAUDIO_CPPFLAGS="" - for flag in $PORTAUDIO_CFLAGS; do - case $flag in - -I* | -D* | -U*) PORTAUDIO_CPPFLAGS="$PORTAUDIO_CPPFLAGS $flag" ;; - esac - done - pkg_cv_PORTAUDIO_CPPFLAGS=$PORTAUDIO_CPPFLAGS - - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi fi @@ -39653,11 +28877,9 @@ gr_audio_portaudio_with=no if test $passed = no; then if test x$enable_gr_audio_portaudio = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-audio-portaudio has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-audio-portaudio has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-audio-portaudio has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-audio-portaudio." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-portaudio." >&5 $as_echo "Not building component gr-audio-portaudio." >&6; } fi else @@ -39713,7 +28935,7 @@ gr_audio_portaudio_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-audio-portaudio will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-portaudio will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-audio-portaudio will be included from a pre-installed library and includes." >&6; } gr_audio_portaudio_with=yes else @@ -39723,11 +28945,11 @@ build_dirs="$build_dirs gr-audio-portaudio" - { $as_echo "$as_me:$LINENO: result: Component gr-audio-portaudio passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-portaudio passed configuration checks; building." >&5 $as_echo "Component gr-audio-portaudio passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-audio-portaudio passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-portaudio passed configuration checks; but not building." >&5 $as_echo "Component gr-audio-portaudio passed configuration checks; but not building." >&6; } fi fi @@ -39751,7 +28973,7 @@ passed=yes # Check whether --enable-gr-audio-windows was given. -if test "${enable_gr_audio_windows+set}" = set; then +if test "${enable_gr_audio_windows+set}" = set; then : enableval=$enable_gr_audio_windows; else @@ -39769,15 +28991,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-audio-windows requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-windows requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-audio-windows requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-audio-windows requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-audio-windows requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-audio-windows requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -39786,19 +29006,14 @@ if test $passed = yes; then case "$host_os" in cygwin*|win*|mingw*) - -{ $as_echo "$as_me:$LINENO: checking for main in -lwinmm" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lwinmm" >&5 $as_echo_n "checking for main in -lwinmm... " >&6; } -if test "${ac_cv_lib_winmm_main+set}" = set; then +if test "${ac_cv_lib_winmm_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lwinmm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -39810,43 +29025,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_winmm_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_winmm_main=no + ac_cv_lib_winmm_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_winmm_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_winmm_main" >&5 $as_echo "$ac_cv_lib_winmm_main" >&6; } -if test "x$ac_cv_lib_winmm_main" = x""yes; then +if test "x$ac_cv_lib_winmm_main" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBWINMM 1 _ACEOF @@ -39854,14 +29044,14 @@ LIBS="-lwinmm $LIBS" else - passed=no;{ $as_echo "$as_me:$LINENO: result: gr-audio-windows requires library winmm, not found." >&5 + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-windows requires library winmm, not found." >&5 $as_echo "gr-audio-windows requires library winmm, not found." >&6; } fi ac_cv_lib_winmm=ac_cv_lib_winmm_main ;; *) - { $as_echo "$as_me:$LINENO: result: gr-audio-windows will build on a Windows Unix environment only." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-windows will build on a Windows Unix environment only." >&5 $as_echo "gr-audio-windows will build on a Windows Unix environment only." >&6; } passed=no ;; @@ -39876,11 +29066,9 @@ gr_audio_windows_with=no if test $passed = no; then if test x$enable_gr_audio_windows = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-audio-windows has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-audio-windows has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-audio-windows has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-audio-windows." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-windows." >&5 $as_echo "Not building component gr-audio-windows." >&6; } fi else @@ -39936,7 +29124,7 @@ gr_audio_windows_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-audio-windows will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-windows will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-audio-windows will be included from a pre-installed library and includes." >&6; } gr_audio_windows_with=yes else @@ -39948,11 +29136,11 @@ build_dirs="$build_dirs gr-audio-windows" - { $as_echo "$as_me:$LINENO: result: Component gr-audio-windows passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-windows passed configuration checks; building." >&5 $as_echo "Component gr-audio-windows passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-audio-windows passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-windows passed configuration checks; but not building." >&5 $as_echo "Component gr-audio-windows passed configuration checks; but not building." >&6; } fi fi @@ -39976,7 +29164,7 @@ passed=yes # Check whether --enable-gr-cvsd-vocoder was given. -if test "${enable_gr_cvsd_vocoder+set}" = set; then +if test "${enable_gr_cvsd_vocoder+set}" = set; then : enableval=$enable_gr_cvsd_vocoder; else @@ -39994,15 +29182,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-cvsd-vocoder requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-cvsd-vocoder requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-cvsd-vocoder requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-cvsd-vocoder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-cvsd-vocoder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-cvsd-vocoder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -40016,11 +29202,9 @@ gr_cvsd_vocoder_with=no if test $passed = no; then if test x$enable_gr_cvsd_vocoder = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-cvsd-vocoder has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-cvsd-vocoder has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-cvsd-vocoder has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-cvsd-vocoder." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-cvsd-vocoder." >&5 $as_echo "Not building component gr-cvsd-vocoder." >&6; } fi else @@ -40076,7 +29260,7 @@ gr_cvsd_vocoder_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-cvsd-vocoder will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-cvsd-vocoder will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-cvsd-vocoder will be included from a pre-installed library and includes." >&6; } gr_cvsd_vocoder_with=yes else @@ -40086,11 +29270,11 @@ build_dirs="$build_dirs gr-cvsd-vocoder" - { $as_echo "$as_me:$LINENO: result: Component gr-cvsd-vocoder passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-cvsd-vocoder passed configuration checks; building." >&5 $as_echo "Component gr-cvsd-vocoder passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-cvsd-vocoder passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-cvsd-vocoder passed configuration checks; but not building." >&5 $as_echo "Component gr-cvsd-vocoder passed configuration checks; but not building." >&6; } fi fi @@ -40114,7 +29298,7 @@ passed=yes # Check whether --enable-gr-gpio was given. -if test "${enable_gr_gpio+set}" = set; then +if test "${enable_gr_gpio+set}" = set; then : enableval=$enable_gr_gpio; else @@ -40132,15 +29316,13 @@ if test $passed != no; then if test $passed = yes; then if test x$usrp_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-gpio requires usrp, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gpio requires usrp, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-gpio requires usrp, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$usrp_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-gpio requires usrp to be included as --with-usrp[=arg]" >&5 -$as_echo "$as_me: error: Component gr-gpio requires usrp to be included as --with-usrp[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-gpio requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 fi fi fi @@ -40154,11 +29336,9 @@ gr_gpio_with=no if test $passed = no; then if test x$enable_gr_gpio = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-gpio has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-gpio has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-gpio has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-gpio." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-gpio." >&5 $as_echo "Not building component gr-gpio." >&6; } fi else @@ -40214,7 +29394,7 @@ gr_gpio_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-gpio will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gpio will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-gpio will be included from a pre-installed library and includes." >&6; } gr_gpio_with=yes else @@ -40222,11 +29402,11 @@ if test x$enable_gr_gpio != xno; then : build_dirs="$build_dirs gr-gpio" - { $as_echo "$as_me:$LINENO: result: Component gr-gpio passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gpio passed configuration checks; building." >&5 $as_echo "Component gr-gpio passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-gpio passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gpio passed configuration checks; but not building." >&5 $as_echo "Component gr-gpio passed configuration checks; but not building." >&6; } fi fi @@ -40250,7 +29430,7 @@ passed=yes # Check whether --enable-gr-gsm-fr-vocoder was given. -if test "${enable_gr_gsm_fr_vocoder+set}" = set; then +if test "${enable_gr_gsm_fr_vocoder+set}" = set; then : enableval=$enable_gr_gsm_fr_vocoder; else @@ -40268,15 +29448,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-gsm-fr-vocoder requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gsm-fr-vocoder requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-gsm-fr-vocoder requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-gsm-fr-vocoder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-gsm-fr-vocoder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-gsm-fr-vocoder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -40290,11 +29468,9 @@ gr_gsm_fr_vocoder_with=no if test $passed = no; then if test x$enable_gr_gsm_fr_vocoder = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-gsm-fr-vocoder has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-gsm-fr-vocoder has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-gsm-fr-vocoder has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-gsm-fr-vocoder." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-gsm-fr-vocoder." >&5 $as_echo "Not building component gr-gsm-fr-vocoder." >&6; } fi else @@ -40350,7 +29526,7 @@ gr_gsm_fr_vocoder_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-gsm-fr-vocoder will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gsm-fr-vocoder will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-gsm-fr-vocoder will be included from a pre-installed library and includes." >&6; } gr_gsm_fr_vocoder_with=yes else @@ -40360,11 +29536,11 @@ build_dirs="$build_dirs gr-gsm-fr-vocoder" - { $as_echo "$as_me:$LINENO: result: Component gr-gsm-fr-vocoder passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gsm-fr-vocoder passed configuration checks; building." >&5 $as_echo "Component gr-gsm-fr-vocoder passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-gsm-fr-vocoder passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gsm-fr-vocoder passed configuration checks; but not building." >&5 $as_echo "Component gr-gsm-fr-vocoder passed configuration checks; but not building." >&6; } fi fi @@ -40388,7 +29564,7 @@ passed=yes # Check whether --enable-gr-pager was given. -if test "${enable_gr_pager+set}" = set; then +if test "${enable_gr_pager+set}" = set; then : enableval=$enable_gr_pager; else @@ -40406,15 +29582,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-pager requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-pager requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-pager requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-pager requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-pager requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-pager requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -40428,11 +29602,9 @@ gr_pager_with=no if test $passed = no; then if test x$enable_gr_pager = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-pager has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-pager has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-pager has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-pager." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-pager." >&5 $as_echo "Not building component gr-pager." >&6; } fi else @@ -40488,7 +29660,7 @@ gr_pager_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-pager will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-pager will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-pager will be included from a pre-installed library and includes." >&6; } gr_pager_with=yes else @@ -40498,11 +29670,11 @@ build_dirs="$build_dirs gr-pager" - { $as_echo "$as_me:$LINENO: result: Component gr-pager passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-pager passed configuration checks; building." >&5 $as_echo "Component gr-pager passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-pager passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-pager passed configuration checks; but not building." >&5 $as_echo "Component gr-pager passed configuration checks; but not building." >&6; } fi fi @@ -40526,7 +29698,7 @@ passed=yes # Check whether --enable-gr-radar-mono was given. -if test "${enable_gr_radar_mono+set}" = set; then +if test "${enable_gr_radar_mono+set}" = set; then : enableval=$enable_gr_radar_mono; else @@ -40544,15 +29716,13 @@ if test $passed != no; then if test $passed = yes; then if test x$usrp_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-radar-mono requires usrp, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-radar-mono requires usrp, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-radar-mono requires usrp, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$usrp_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-radar-mono requires usrp to be included as --with-usrp[=arg]" >&5 -$as_echo "$as_me: error: Component gr-radar-mono requires usrp to be included as --with-usrp[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-radar-mono requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 fi fi fi @@ -40561,15 +29731,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-radar-mono requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-radar-mono requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-radar-mono requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-radar-mono requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-radar-mono requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-radar-mono requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -40583,11 +29751,9 @@ gr_radar_mono_with=no if test $passed = no; then if test x$enable_gr_radar_mono = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-radar-mono has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-radar-mono has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-radar-mono has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-radar-mono." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-radar-mono." >&5 $as_echo "Not building component gr-radar-mono." >&6; } fi else @@ -40643,7 +29809,7 @@ gr_radar_mono_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-radar-mono will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-radar-mono will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-radar-mono will be included from a pre-installed library and includes." >&6; } gr_radar_mono_with=yes else @@ -40653,11 +29819,11 @@ build_dirs="$build_dirs gr-radar-mono" - { $as_echo "$as_me:$LINENO: result: Component gr-radar-mono passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-radar-mono passed configuration checks; building." >&5 $as_echo "Component gr-radar-mono passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-radar-mono passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-radar-mono passed configuration checks; but not building." >&5 $as_echo "Component gr-radar-mono passed configuration checks; but not building." >&6; } fi fi @@ -40681,7 +29847,7 @@ passed=yes # Check whether --enable-gr-radio-astronomy was given. -if test "${enable_gr_radio_astronomy+set}" = set; then +if test "${enable_gr_radio_astronomy+set}" = set; then : enableval=$enable_gr_radio_astronomy; else @@ -40699,15 +29865,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-radio-astronomy requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-radio-astronomy requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-radio-astronomy requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-radio-astronomy requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-radio-astronomy requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-radio-astronomy requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -40721,11 +29885,9 @@ gr_radio_astronomy_with=no if test $passed = no; then if test x$enable_gr_radio_astronomy = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-radio-astronomy has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-radio-astronomy has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-radio-astronomy has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-radio-astronomy." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-radio-astronomy." >&5 $as_echo "Not building component gr-radio-astronomy." >&6; } fi else @@ -40781,7 +29943,7 @@ gr_radio_astronomy_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-radio-astronomy will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-radio-astronomy will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-radio-astronomy will be included from a pre-installed library and includes." >&6; } gr_radio_astronomy_with=yes else @@ -40791,11 +29953,11 @@ build_dirs="$build_dirs gr-radio-astronomy" - { $as_echo "$as_me:$LINENO: result: Component gr-radio-astronomy passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-radio-astronomy passed configuration checks; building." >&5 $as_echo "Component gr-radio-astronomy passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-radio-astronomy passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-radio-astronomy passed configuration checks; but not building." >&5 $as_echo "Component gr-radio-astronomy passed configuration checks; but not building." >&6; } fi fi @@ -40819,7 +29981,7 @@ passed=yes # Check whether --enable-gr-trellis was given. -if test "${enable_gr_trellis+set}" = set; then +if test "${enable_gr_trellis+set}" = set; then : enableval=$enable_gr_trellis; else @@ -40837,15 +29999,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-trellis requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-trellis requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-trellis requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-trellis requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-trellis requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-trellis requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -40859,11 +30019,9 @@ gr_trellis_with=no if test $passed = no; then if test x$enable_gr_trellis = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-trellis has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-trellis has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-trellis has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-trellis." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-trellis." >&5 $as_echo "Not building component gr-trellis." >&6; } fi else @@ -40919,7 +30077,7 @@ gr_trellis_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-trellis will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-trellis will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-trellis will be included from a pre-installed library and includes." >&6; } gr_trellis_with=yes else @@ -40929,11 +30087,11 @@ build_dirs="$build_dirs gr-trellis" - { $as_echo "$as_me:$LINENO: result: Component gr-trellis passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-trellis passed configuration checks; building." >&5 $as_echo "Component gr-trellis passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-trellis passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-trellis passed configuration checks; but not building." >&5 $as_echo "Component gr-trellis passed configuration checks; but not building." >&6; } fi fi @@ -40957,7 +30115,7 @@ passed=yes # Check whether --enable-gr-video-sdl was given. -if test "${enable_gr_video_sdl+set}" = set; then +if test "${enable_gr_video_sdl+set}" = set; then : enableval=$enable_gr_video_sdl; else @@ -40975,15 +30133,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-video-sdl requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-video-sdl requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-video-sdl requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-video-sdl requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-video-sdl requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-video-sdl requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -40991,103 +30147,48 @@ if test $passed = yes; then - - pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for SDL" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5 $as_echo_n "checking for SDL... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$SDL_CFLAGS"; then - pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.0\"") >&5 +if test -n "$SDL_CFLAGS"; then + pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi - -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$SDL_LIBS"; then - pkg_cv_SDL_LIBS="$SDL_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs --static "sdl >= 1.2.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_SDL_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_SDL_LIBS="$_pkg_tmp" -else - if test -n "$PKG_CONFIG"; then - if test -n "$SDL_LIBS"; then - pkg_cv_SDL_LIBS="$SDL_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs --static "sdl >= 1.2.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi + else + pkg_failed=untried fi - -if test -n "$PKG_CONFIG"; then - if test -n "$SDL_INCLUDEDIR"; then - pkg_cv_SDL_INCLUDEDIR="$SDL_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.0\"") >&5 +if test -n "$SDL_LIBS"; then + pkg_cv_SDL_LIBS="$SDL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_SDL_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "sdl >= 1.2.0" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi - if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -41095,19 +30196,17 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl >= 1.2.0"` + SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl >= 1.2.0" 2>&1` else - SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl >= 1.2.0"` + SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl >= 1.2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SDL_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - SDL_VERSION=1.2.0 + SDL_VERSION=1.2.0 # Check whether --with-sdl-prefix was given. -if test "${with_sdl_prefix+set}" = set; then +if test "${with_sdl_prefix+set}" = set; then : withval=$with_sdl_prefix; sdl_prefix="$withval" else sdl_prefix="" @@ -41115,14 +30214,14 @@ # Check whether --with-sdl-exec-prefix was given. -if test "${with_sdl_exec_prefix+set}" = set; then +if test "${with_sdl_exec_prefix+set}" = set; then : withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval" else sdl_exec_prefix="" fi # Check whether --enable-sdltest was given. -if test "${enable_sdltest+set}" = set; then +if test "${enable_sdltest+set}" = set; then : enableval=$enable_sdltest; else enable_sdltest=yes @@ -41146,9 +30245,9 @@ TMP_PATH="$prefix/bin:$prefix/usr/bin:$PATH" # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SDL_CONFIG+set}" = set; then +if test "${ac_cv_path_SDL_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $SDL_CONFIG in @@ -41161,14 +30260,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" @@ -41177,16 +30276,16 @@ fi SDL_CONFIG=$ac_cv_path_SDL_CONFIG if test -n "$SDL_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5 $as_echo "$SDL_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi min_sdl_version=$SDL_VERSION - { $as_echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5 $as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; } no_sdl="" if test "$SDL_CONFIG" = "no" ; then @@ -41207,14 +30306,10 @@ CFLAGS="$CFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" rm -f conf.sdltest - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : echo $ac_n "cross compiling; assumed OK... $ac_c" else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -41275,52 +30370,25 @@ _ACEOF -rm -f 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -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 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -no_sdl=yes +else + no_sdl=yes fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_sdl" = x ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if test "$SDL_CONFIG" = "no" ; then echo "*** The sdl-config script installed by SDL could not be found" @@ -41334,11 +30402,7 @@ echo "*** Could not run SDL test program, checking why..." CFLAGS="$CFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -41357,27 +30421,7 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding SDL or finding the wrong" echo "*** version of SDL. If it is not finding SDL, you'll need to set your" @@ -41388,18 +30432,13 @@ echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means SDL was incorrectly installed" echo "*** or that you have moved SDL since it was installed. In the latter case, you" echo "*** may want to edit the sdl-config script: $SDL_CONFIG" fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi @@ -41407,7 +30446,7 @@ SDL_CFLAGS="" SDL_LIBS="" - passed=no;{ $as_echo "$as_me:$LINENO: result: gr-video-sdl requires library sdl, not found or failed test." >&5 + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-video-sdl requires library sdl, not found or failed test." >&5 $as_echo "gr-video-sdl requires library sdl, not found or failed test." >&6; } fi @@ -41415,10 +30454,12 @@ rm -f conf.sdltest elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SDL_VERSION=1.2.0 # Check whether --with-sdl-prefix was given. -if test "${with_sdl_prefix+set}" = set; then +if test "${with_sdl_prefix+set}" = set; then : withval=$with_sdl_prefix; sdl_prefix="$withval" else sdl_prefix="" @@ -41426,14 +30467,14 @@ # Check whether --with-sdl-exec-prefix was given. -if test "${with_sdl_exec_prefix+set}" = set; then +if test "${with_sdl_exec_prefix+set}" = set; then : withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval" else sdl_exec_prefix="" fi # Check whether --enable-sdltest was given. -if test "${enable_sdltest+set}" = set; then +if test "${enable_sdltest+set}" = set; then : enableval=$enable_sdltest; else enable_sdltest=yes @@ -41457,9 +30498,9 @@ TMP_PATH="$prefix/bin:$prefix/usr/bin:$PATH" # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SDL_CONFIG+set}" = set; then +if test "${ac_cv_path_SDL_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $SDL_CONFIG in @@ -41472,14 +30513,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" @@ -41488,16 +30529,16 @@ fi SDL_CONFIG=$ac_cv_path_SDL_CONFIG if test -n "$SDL_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5 $as_echo "$SDL_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi min_sdl_version=$SDL_VERSION - { $as_echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5 $as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; } no_sdl="" if test "$SDL_CONFIG" = "no" ; then @@ -41518,14 +30559,10 @@ CFLAGS="$CFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" rm -f conf.sdltest - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : echo $ac_n "cross compiling; assumed OK... $ac_c" else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -41586,52 +30623,25 @@ _ACEOF -rm -f 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -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 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -no_sdl=yes +else + no_sdl=yes fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_sdl" = x ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if test "$SDL_CONFIG" = "no" ; then echo "*** The sdl-config script installed by SDL could not be found" @@ -41645,11 +30655,7 @@ echo "*** Could not run SDL test program, checking why..." CFLAGS="$CFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -41668,27 +30674,7 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding SDL or finding the wrong" echo "*** version of SDL. If it is not finding SDL, you'll need to set your" @@ -41699,18 +30685,13 @@ echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means SDL was incorrectly installed" echo "*** or that you have moved SDL since it was installed. In the latter case, you" echo "*** may want to edit the sdl-config script: $SDL_CONFIG" fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi @@ -41718,7 +30699,7 @@ SDL_CFLAGS="" SDL_LIBS="" - passed=no;{ $as_echo "$as_me:$LINENO: result: gr-video-sdl requires library sdl, not found or failed test." >&5 + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-video-sdl requires library sdl, not found or failed test." >&5 $as_echo "gr-video-sdl requires library sdl, not found or failed test." >&6; } fi @@ -41728,20 +30709,9 @@ else SDL_CFLAGS=$pkg_cv_SDL_CFLAGS SDL_LIBS=$pkg_cv_SDL_LIBS - SDL_INCLUDEDIR=$pkg_cv_SDL_INCLUDEDIR - - SDL_CPPFLAGS="" - for flag in $SDL_CFLAGS; do - case $flag in - -I* | -D* | -U*) SDL_CPPFLAGS="$SDL_CPPFLAGS $flag" ;; - esac - done - pkg_cv_SDL_CPPFLAGS=$SDL_CPPFLAGS - - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi fi @@ -41753,11 +30723,9 @@ gr_video_sdl_with=no if test $passed = no; then if test x$enable_gr_video_sdl = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-video-sdl has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-video-sdl has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-video-sdl has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-video-sdl." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-video-sdl." >&5 $as_echo "Not building component gr-video-sdl." >&6; } fi else @@ -41813,7 +30781,7 @@ gr_video_sdl_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-video-sdl will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-video-sdl will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-video-sdl will be included from a pre-installed library and includes." >&6; } gr_video_sdl_with=yes else @@ -41823,11 +30791,11 @@ build_dirs="$build_dirs gr-video-sdl" - { $as_echo "$as_me:$LINENO: result: Component gr-video-sdl passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-video-sdl passed configuration checks; building." >&5 $as_echo "Component gr-video-sdl passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-video-sdl passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-video-sdl passed configuration checks; but not building." >&5 $as_echo "Component gr-video-sdl passed configuration checks; but not building." >&6; } fi fi @@ -41851,7 +30819,7 @@ passed=yes # Check whether --enable-gr-wxgui was given. -if test "${enable_gr_wxgui+set}" = set; then +if test "${enable_gr_wxgui+set}" = set; then : enableval=$enable_gr_wxgui; else @@ -41873,7 +30841,7 @@ # Check whether --with-gr-wxgui was given. -if test "${with_gr_wxgui+set}" = set; then +if test "${with_gr_wxgui+set}" = set; then : withval=$with_gr_wxgui; if test "x$withval" != "xyes"; then with_gr_wxgui_val=$withval with_gr_wxgui=yes @@ -41882,9 +30850,7 @@ if test x$with_gr_wxgui = xyes; then if test x$enable_gr_wxgui = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-wxgui: Cannot use both --enable and --with" >&5 -$as_echo "$as_me: error: Component gr-wxgui: Cannot use both --enable and --with" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-wxgui: Cannot use both --enable and --with" "$LINENO" 5 else s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -41894,18 +30860,16 @@ export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - { { $as_echo "$as_me:$LINENO: error: Component gr-wxgui: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component gr-wxgui: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-wxgui: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 fi fi if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with; check1=yes else @@ -41914,11 +30878,11 @@ if test "x$s_PKG_CONFIG_PATH" != "x"; then export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then passed=with else passed=no @@ -41926,9 +30890,7 @@ fi fi if test $passed != with; then - { { $as_echo "$as_me:$LINENO: error: Component gr-wxgui: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5 -$as_echo "$as_me: error: Component gr-wxgui: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-wxgui: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 fi s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -41954,15 +30916,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-wxgui requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-wxgui requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-wxgui requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-wxgui requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-wxgui requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-wxgui requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -41970,7 +30930,7 @@ if test $passed = yes; then - { $as_echo "$as_me:$LINENO: checking for Python wxWidgets wrappers >= 2.8" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python wxWidgets wrappers >= 2.8" >&5 $as_echo_n "checking for Python wxWidgets wrappers >= 2.8... " >&6; } if test "wx.version().split()[0] >= "2.8""; then python_cmd=' @@ -41984,17 +30944,17 @@ except: exit(1)' fi if ! $PYTHON -c "$python_cmd" 2> /dev/null; then - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } passed=no else - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - { $as_echo "$as_me:$LINENO: checking for Numeric Python extensions" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Numeric Python extensions" >&5 $as_echo_n "checking for Numeric Python extensions... " >&6; } if test ""; then python_cmd=' @@ -42008,11 +30968,11 @@ except: exit(1)' fi if ! $PYTHON -c "$python_cmd" 2> /dev/null; then - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } passed=no else - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi @@ -42027,11 +30987,9 @@ gr_wxgui_with=no if test $passed = no; then if test x$enable_gr_wxgui = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-wxgui has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-wxgui has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-wxgui has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-wxgui." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-wxgui." >&5 $as_echo "Not building component gr-wxgui." >&6; } fi else @@ -42087,7 +31045,7 @@ gr_wxgui_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-wxgui will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-wxgui will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-wxgui will be included from a pre-installed library and includes." >&6; } gr_wxgui_with=yes else @@ -42095,11 +31053,11 @@ if test x$enable_gr_wxgui != xno; then : build_dirs="$build_dirs gr-wxgui" - { $as_echo "$as_me:$LINENO: result: Component gr-wxgui passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-wxgui passed configuration checks; building." >&5 $as_echo "Component gr-wxgui passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-wxgui passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-wxgui passed configuration checks; but not building." >&5 $as_echo "Component gr-wxgui passed configuration checks; but not building." >&6; } fi fi @@ -42124,7 +31082,7 @@ passed=yes # Check whether --enable-gr-qtgui was given. -if test "${enable_gr_qtgui+set}" = set; then +if test "${enable_gr_qtgui+set}" = set; then : enableval=$enable_gr_qtgui; else @@ -42142,15 +31100,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-qtgui requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-qtgui requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-qtgui requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-qtgui requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-qtgui requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-qtgui requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -42158,7 +31114,7 @@ - { $as_echo "$as_me:$LINENO: checking for PyQt4 for Qt4" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PyQt4 for Qt4" >&5 $as_echo_n "checking for PyQt4 for Qt4... " >&6; } if test "\ PyQt4.QtCore.PYQT_VERSION >= 260000"; then @@ -42174,11 +31130,11 @@ except: exit(1)' fi if ! $PYTHON -c "$python_cmd" 2> /dev/null; then - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } passed=no else - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } \ passed=yes @@ -42202,103 +31158,48 @@ if test $passed = yes; then - - pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for QTCORE" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QTCORE" >&5 $as_echo_n "checking for QTCORE... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$QTCORE_CFLAGS"; then - pkg_cv_QTCORE_CFLAGS="$QTCORE_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.2\"") >&5 +if test -n "$QTCORE_CFLAGS"; then + pkg_cv_QTCORE_CFLAGS="$QTCORE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "QtCore >= 4.2") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_QTCORE_CFLAGS=`$PKG_CONFIG --cflags "QtCore >= 4.2" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi - -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$QTCORE_LIBS"; then - pkg_cv_QTCORE_LIBS="$QTCORE_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.2\"") >&5 - ($PKG_CONFIG --exists --print-errors "QtCore >= 4.2") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_QTCORE_LIBS=`$PKG_CONFIG --libs --static "QtCore >= 4.2" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_QTCORE_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_QTCORE_LIBS="$_pkg_tmp" -else - if test -n "$PKG_CONFIG"; then - if test -n "$QTCORE_LIBS"; then - pkg_cv_QTCORE_LIBS="$QTCORE_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.2\"") >&5 - ($PKG_CONFIG --exists --print-errors "QtCore >= 4.2") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_QTCORE_LIBS=`$PKG_CONFIG --libs --static "QtCore >= 4.2" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -fi - -if test -n "$PKG_CONFIG"; then - if test -n "$QTCORE_INCLUDEDIR"; then - pkg_cv_QTCORE_INCLUDEDIR="$QTCORE_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.2\"") >&5 +if test -n "$QTCORE_LIBS"; then + pkg_cv_QTCORE_LIBS="$QTCORE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "QtCore >= 4.2") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_QTCORE_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "QtCore >= 4.2" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_QTCORE_LIBS=`$PKG_CONFIG --libs "QtCore >= 4.2" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi - if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -42306,136 +31207,70 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTCORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtCore >= 4.2"` + QTCORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "QtCore >= 4.2" 2>&1` else - QTCORE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtCore >= 4.2"` + QTCORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtCore >= 4.2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$QTCORE_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - passed=no; { $as_echo "$as_me:$LINENO: result: gr-qtgui requires libQtCore >= 4.2." >&5 + passed=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-qtgui requires libQtCore >= 4.2." >&5 $as_echo "gr-qtgui requires libQtCore >= 4.2." >&6; } elif test $pkg_failed = untried; then - passed=no; { $as_echo "$as_me:$LINENO: result: gr-qtgui requires libQtCore >= 4.2." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + passed=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-qtgui requires libQtCore >= 4.2." >&5 $as_echo "gr-qtgui requires libQtCore >= 4.2." >&6; } else QTCORE_CFLAGS=$pkg_cv_QTCORE_CFLAGS QTCORE_LIBS=$pkg_cv_QTCORE_LIBS - QTCORE_INCLUDEDIR=$pkg_cv_QTCORE_INCLUDEDIR - - QTCORE_CPPFLAGS="" - for flag in $QTCORE_CFLAGS; do - case $flag in - -I* | -D* | -U*) QTCORE_CPPFLAGS="$QTCORE_CPPFLAGS $flag" ;; - esac - done - pkg_cv_QTCORE_CPPFLAGS=$QTCORE_CPPFLAGS - - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : -fi - +fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for QTGUI" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QTGUI" >&5 $as_echo_n "checking for QTGUI... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$QTGUI_CFLAGS"; then - pkg_cv_QTGUI_CFLAGS="$QTGUI_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtGui >= 4.2\"") >&5 +if test -n "$QTGUI_CFLAGS"; then + pkg_cv_QTGUI_CFLAGS="$QTGUI_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtGui >= 4.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "QtGui >= 4.2") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_QTGUI_CFLAGS=`$PKG_CONFIG --cflags "QtGui >= 4.2" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi - -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$QTGUI_LIBS"; then - pkg_cv_QTGUI_LIBS="$QTGUI_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtGui >= 4.2\"") >&5 - ($PKG_CONFIG --exists --print-errors "QtGui >= 4.2") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_QTGUI_LIBS=`$PKG_CONFIG --libs --static "QtGui >= 4.2" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_QTGUI_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_QTGUI_LIBS="$_pkg_tmp" -else - if test -n "$PKG_CONFIG"; then - if test -n "$QTGUI_LIBS"; then - pkg_cv_QTGUI_LIBS="$QTGUI_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtGui >= 4.2\"") >&5 - ($PKG_CONFIG --exists --print-errors "QtGui >= 4.2") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_QTGUI_LIBS=`$PKG_CONFIG --libs --static "QtGui >= 4.2" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi + else + pkg_failed=untried fi - -if test -n "$PKG_CONFIG"; then - if test -n "$QTGUI_INCLUDEDIR"; then - pkg_cv_QTGUI_INCLUDEDIR="$QTGUI_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtGui >= 4.2\"") >&5 +if test -n "$QTGUI_LIBS"; then + pkg_cv_QTGUI_LIBS="$QTGUI_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtGui >= 4.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "QtGui >= 4.2") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_QTGUI_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "QtGui >= 4.2" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_QTGUI_LIBS=`$PKG_CONFIG --libs "QtGui >= 4.2" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi - if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -42443,136 +31278,70 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTGUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtGui >= 4.2"` + QTGUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "QtGui >= 4.2" 2>&1` else - QTGUI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtGui >= 4.2"` + QTGUI_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtGui >= 4.2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$QTGUI_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - passed=no; { $as_echo "$as_me:$LINENO: result: gr-qtgui requires libQtGui >= 4.2." >&5 + passed=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-qtgui requires libQtGui >= 4.2." >&5 $as_echo "gr-qtgui requires libQtGui >= 4.2." >&6; } elif test $pkg_failed = untried; then - passed=no; { $as_echo "$as_me:$LINENO: result: gr-qtgui requires libQtGui >= 4.2." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + passed=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-qtgui requires libQtGui >= 4.2." >&5 $as_echo "gr-qtgui requires libQtGui >= 4.2." >&6; } else QTGUI_CFLAGS=$pkg_cv_QTGUI_CFLAGS QTGUI_LIBS=$pkg_cv_QTGUI_LIBS - QTGUI_INCLUDEDIR=$pkg_cv_QTGUI_INCLUDEDIR - - QTGUI_CPPFLAGS="" - for flag in $QTGUI_CFLAGS; do - case $flag in - -I* | -D* | -U*) QTGUI_CPPFLAGS="$QTGUI_CPPFLAGS $flag" ;; - esac - done - pkg_cv_QTGUI_CPPFLAGS=$QTGUI_CPPFLAGS - - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : -fi - +fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for QTOPENGL" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QTOPENGL" >&5 $as_echo_n "checking for QTOPENGL... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$QTOPENGL_CFLAGS"; then - pkg_cv_QTOPENGL_CFLAGS="$QTOPENGL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtOpenGL >= 4.2\"") >&5 +if test -n "$QTOPENGL_CFLAGS"; then + pkg_cv_QTOPENGL_CFLAGS="$QTOPENGL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtOpenGL >= 4.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "QtOpenGL >= 4.2") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_QTOPENGL_CFLAGS=`$PKG_CONFIG --cflags "QtOpenGL >= 4.2" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi - -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$QTOPENGL_LIBS"; then - pkg_cv_QTOPENGL_LIBS="$QTOPENGL_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtOpenGL >= 4.2\"") >&5 - ($PKG_CONFIG --exists --print-errors "QtOpenGL >= 4.2") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_QTOPENGL_LIBS=`$PKG_CONFIG --libs --static "QtOpenGL >= 4.2" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_QTOPENGL_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_QTOPENGL_LIBS="$_pkg_tmp" -else - if test -n "$PKG_CONFIG"; then - if test -n "$QTOPENGL_LIBS"; then - pkg_cv_QTOPENGL_LIBS="$QTOPENGL_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtOpenGL >= 4.2\"") >&5 - ($PKG_CONFIG --exists --print-errors "QtOpenGL >= 4.2") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_QTOPENGL_LIBS=`$PKG_CONFIG --libs --static "QtOpenGL >= 4.2" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -fi - -if test -n "$PKG_CONFIG"; then - if test -n "$QTOPENGL_INCLUDEDIR"; then - pkg_cv_QTOPENGL_INCLUDEDIR="$QTOPENGL_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtOpenGL >= 4.2\"") >&5 +if test -n "$QTOPENGL_LIBS"; then + pkg_cv_QTOPENGL_LIBS="$QTOPENGL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtOpenGL >= 4.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "QtOpenGL >= 4.2") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_QTOPENGL_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "QtOpenGL >= 4.2" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_QTOPENGL_LIBS=`$PKG_CONFIG --libs "QtOpenGL >= 4.2" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi - if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -42580,37 +31349,26 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QTOPENGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtOpenGL >= 4.2"` + QTOPENGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "QtOpenGL >= 4.2" 2>&1` else - QTOPENGL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtOpenGL >= 4.2"` + QTOPENGL_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtOpenGL >= 4.2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$QTOPENGL_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - passed=no; { $as_echo "$as_me:$LINENO: result: gr-qtgui requires libQtOpenGL >- 4.2." >&5 + passed=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-qtgui requires libQtOpenGL >- 4.2." >&5 $as_echo "gr-qtgui requires libQtOpenGL >- 4.2." >&6; } elif test $pkg_failed = untried; then - passed=no; { $as_echo "$as_me:$LINENO: result: gr-qtgui requires libQtOpenGL >- 4.2." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + passed=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-qtgui requires libQtOpenGL >- 4.2." >&5 $as_echo "gr-qtgui requires libQtOpenGL >- 4.2." >&6; } else QTOPENGL_CFLAGS=$pkg_cv_QTOPENGL_CFLAGS QTOPENGL_LIBS=$pkg_cv_QTOPENGL_LIBS - QTOPENGL_INCLUDEDIR=$pkg_cv_QTOPENGL_INCLUDEDIR - - QTOPENGL_CPPFLAGS="" - for flag in $QTOPENGL_CFLAGS; do - case $flag in - -I* | -D* | -U*) QTOPENGL_CPPFLAGS="$QTOPENGL_CPPFLAGS $flag" ;; - esac - done - pkg_cv_QTOPENGL_CPPFLAGS=$QTOPENGL_CPPFLAGS - - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi @@ -42629,7 +31387,7 @@ # Check whether --with-qwt-libdir was given. -if test "${with_qwt_libdir+set}" = set; then +if test "${with_qwt_libdir+set}" = set; then : withval=$with_qwt_libdir; qwt_libdir="$withval" else qwt_libdir="" @@ -42638,7 +31396,7 @@ # Check whether --with-qwt-incdir was given. -if test "${with_qwt_incdir+set}" = set; then +if test "${with_qwt_incdir+set}" = set; then : withval=$with_qwt_incdir; qwt_incdir="$withval" else qwt_incdir="" @@ -42646,7 +31404,7 @@ # Check whether --with-qwt-lib was given. -if test "${with_qwt_lib+set}" = set; then +if test "${with_qwt_lib+set}" = set; then : withval=$with_qwt_lib; qwt_lib="$withval" else qwt_lib="" @@ -42656,134 +31414,8 @@ CPPFLAGS="$CPPFLAGS $QTCORE_CFLAGS" if test "$qwt_incdir" = "" ; then - if test "${ac_cv_header_qwt_qwt_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for qwt/qwt.h" >&5 -$as_echo_n "checking for qwt/qwt.h... " >&6; } -if test "${ac_cv_header_qwt_qwt_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_qwt_qwt_h" >&5 -$as_echo "$ac_cv_header_qwt_qwt_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking qwt/qwt.h usability" >&5 -$as_echo_n "checking qwt/qwt.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking qwt/qwt.h presence" >&5 -$as_echo_n "checking qwt/qwt.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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_cxx_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: qwt/qwt.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: qwt/qwt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwt/qwt.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: qwt/qwt.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: qwt/qwt.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: qwt/qwt.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwt/qwt.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: qwt/qwt.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwt/qwt.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: qwt/qwt.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwt/qwt.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: qwt/qwt.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwt/qwt.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: qwt/qwt.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwt/qwt.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: qwt/qwt.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for qwt/qwt.h" >&5 -$as_echo_n "checking for qwt/qwt.h... " >&6; } -if test "${ac_cv_header_qwt_qwt_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_qwt_qwt_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_qwt_qwt_h" >&5 -$as_echo "$ac_cv_header_qwt_qwt_h" >&6; } - -fi -if test "x$ac_cv_header_qwt_qwt_h" = x""yes; then + ac_fn_cxx_check_header_mongrel "$LINENO" "qwt/qwt.h" "ac_cv_header_qwt_qwt_h" "$ac_includes_default" +if test "x$ac_cv_header_qwt_qwt_h" = x""yes; then : qwt_qwt_h=yes else qwt_qwt_h=no @@ -42794,134 +31426,8 @@ if test "$qwt_qwt_h" = "yes" ; then QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt" else - if test "${ac_cv_header_qwt_qt4_qwt_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for qwt-qt4/qwt.h" >&5 -$as_echo_n "checking for qwt-qt4/qwt.h... " >&6; } -if test "${ac_cv_header_qwt_qt4_qwt_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_qwt_qt4_qwt_h" >&5 -$as_echo "$ac_cv_header_qwt_qt4_qwt_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking qwt-qt4/qwt.h usability" >&5 -$as_echo_n "checking qwt-qt4/qwt.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking qwt-qt4/qwt.h presence" >&5 -$as_echo_n "checking qwt-qt4/qwt.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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_cxx_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: qwt-qt4/qwt.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: qwt-qt4/qwt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwt-qt4/qwt.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: qwt-qt4/qwt.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: qwt-qt4/qwt.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: qwt-qt4/qwt.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwt-qt4/qwt.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: qwt-qt4/qwt.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwt-qt4/qwt.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: qwt-qt4/qwt.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwt-qt4/qwt.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: qwt-qt4/qwt.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwt-qt4/qwt.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: qwt-qt4/qwt.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwt-qt4/qwt.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: qwt-qt4/qwt.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for qwt-qt4/qwt.h" >&5 -$as_echo_n "checking for qwt-qt4/qwt.h... " >&6; } -if test "${ac_cv_header_qwt_qt4_qwt_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_qwt_qt4_qwt_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_qwt_qt4_qwt_h" >&5 -$as_echo "$ac_cv_header_qwt_qt4_qwt_h" >&6; } - -fi -if test "x$ac_cv_header_qwt_qt4_qwt_h" = x""yes; then + ac_fn_cxx_check_header_mongrel "$LINENO" "qwt-qt4/qwt.h" "ac_cv_header_qwt_qt4_qwt_h" "$ac_includes_default" +if test "x$ac_cv_header_qwt_qt4_qwt_h" = x""yes; then : qwt_qt4_qwt_h=yes else qwt_qt4_qwt_h=no @@ -42938,141 +31444,9 @@ else QWT_CFLAGS="$QWT_CFLAGS -I$qwt_incdir" as_ac_Header=`$as_echo "ac_cv_header_$qwt_incdir/qwt.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $qwt_incdir/qwt.h" >&5 -$as_echo_n "checking for $qwt_incdir/qwt.h... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $qwt_incdir/qwt.h usability" >&5 -$as_echo_n "checking $qwt_incdir/qwt.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$qwt_incdir/qwt.h> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $qwt_incdir/qwt.h presence" >&5 -$as_echo_n "checking $qwt_incdir/qwt.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$qwt_incdir/qwt.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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_cxx_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $qwt_incdir/qwt.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $qwt_incdir/qwt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $qwt_incdir/qwt.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $qwt_incdir/qwt.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $qwt_incdir/qwt.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $qwt_incdir/qwt.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $qwt_incdir/qwt.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $qwt_incdir/qwt.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $qwt_incdir/qwt.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $qwt_incdir/qwt.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $qwt_incdir/qwt.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $qwt_incdir/qwt.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $qwt_incdir/qwt.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $qwt_incdir/qwt.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $qwt_incdir/qwt.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $qwt_incdir/qwt.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $qwt_incdir/qwt.h" >&5 -$as_echo_n "checking for $qwt_incdir/qwt.h... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +ac_fn_cxx_check_header_mongrel "$LINENO" "$qwt_incdir/qwt.h" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - : else libqwt_ok=no fi @@ -43092,18 +31466,14 @@ if test "$qwt_lib" != "" ; then as_ac_Lib=`$as_echo "ac_cv_lib_$qwt_lib''_main" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for main in -l$qwt_lib" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$qwt_lib" >&5 $as_echo_n "checking for main in -l$qwt_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$qwt_lib $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -43115,47 +31485,19 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : libqwt_ok=yes else libqwt_ok=no @@ -43163,18 +31505,14 @@ else - { $as_echo "$as_me:$LINENO: checking for main in -lqwt" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lqwt" >&5 $as_echo_n "checking for main in -lqwt... " >&6; } -if test "${ac_cv_lib_qwt_main+set}" = set; then +if test "${ac_cv_lib_qwt_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lqwt $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -43186,43 +31524,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_qwt_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_qwt_main=no + ac_cv_lib_qwt_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_qwt_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_qwt_main" >&5 $as_echo "$ac_cv_lib_qwt_main" >&6; } -if test "x$ac_cv_lib_qwt_main" = x""yes; then +if test "x$ac_cv_lib_qwt_main" = x""yes; then : libqwt_ok=yes else libqwt_ok=no @@ -43233,18 +31546,14 @@ QWT_LIBS="$QWT_LIBS -lqwt" else LIBS="$qwt_save_LIBS $QT_LIBS $QWT_LIBS -lqwt-qt4" - { $as_echo "$as_me:$LINENO: checking for main in -lqwt-qt4" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lqwt-qt4" >&5 $as_echo_n "checking for main in -lqwt-qt4... " >&6; } -if test "${ac_cv_lib_qwt_qt4_main+set}" = set; then +if test "${ac_cv_lib_qwt_qt4_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lqwt-qt4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -43256,43 +31565,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_qwt_qt4_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_qwt_qt4_main=no + ac_cv_lib_qwt_qt4_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_qwt_qt4_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_qwt_qt4_main" >&5 $as_echo "$ac_cv_lib_qwt_qt4_main" >&6; } -if test "x$ac_cv_lib_qwt_qt4_main" = x""yes; then +if test "x$ac_cv_lib_qwt_qt4_main" = x""yes; then : libqwt_ok=yes else libqwt_ok=no @@ -43301,13 +31585,13 @@ if test "$libqwt_ok" = "yes" ; then QWT_LIBS="$QWT_LIBS -lqwt-qt4" else - { $as_echo "$as_me:$LINENO: result: Could not link to libqwt.so" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Could not link to libqwt.so" >&5 $as_echo "Could not link to libqwt.so" >&6; } fi fi fi else - { $as_echo "$as_me:$LINENO: result: Could not find qwt headers" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Could not find qwt headers" >&5 $as_echo "Could not find qwt headers" >&6; } fi @@ -43347,7 +31631,7 @@ # Check whether --with-qwtplot3d-libdir was given. -if test "${with_qwtplot3d_libdir+set}" = set; then +if test "${with_qwtplot3d_libdir+set}" = set; then : withval=$with_qwtplot3d_libdir; qwtplot3d_libdir="$withval" else qwtplot3d_libdir="" @@ -43356,7 +31640,7 @@ # Check whether --with-qwtplot3d-incdir was given. -if test "${with_qwtplot3d_incdir+set}" = set; then +if test "${with_qwtplot3d_incdir+set}" = set; then : withval=$with_qwtplot3d_incdir; qwtplot3d_incdir="$withval" else qwtplot3d_incdir="" @@ -43365,7 +31649,7 @@ # Check whether --with-qwtplot3d-lib was given. -if test "${with_qwtplot3d_lib+set}" = set; then +if test "${with_qwtplot3d_lib+set}" = set; then : withval=$with_qwtplot3d_lib; qwtplot3d_lib="$withval" else qwtplot3d_lib="" @@ -43376,134 +31660,8 @@ CPPFLAGS="$CPPFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS $QWT_CFLAGS" if test "$qwtplot3d_incdir" = "" ; then - if test "${ac_cv_header_qwtplot3d_qwt3d_plot_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for qwtplot3d/qwt3d_plot.h" >&5 -$as_echo_n "checking for qwtplot3d/qwt3d_plot.h... " >&6; } -if test "${ac_cv_header_qwtplot3d_qwt3d_plot_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_qwtplot3d_qwt3d_plot_h" >&5 -$as_echo "$ac_cv_header_qwtplot3d_qwt3d_plot_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking qwtplot3d/qwt3d_plot.h usability" >&5 -$as_echo_n "checking qwtplot3d/qwt3d_plot.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking qwtplot3d/qwt3d_plot.h presence" >&5 -$as_echo_n "checking qwtplot3d/qwt3d_plot.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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_cxx_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d/qwt3d_plot.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: qwtplot3d/qwt3d_plot.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d/qwt3d_plot.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: qwtplot3d/qwt3d_plot.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d/qwt3d_plot.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: qwtplot3d/qwt3d_plot.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d/qwt3d_plot.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: qwtplot3d/qwt3d_plot.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d/qwt3d_plot.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: qwtplot3d/qwt3d_plot.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d/qwt3d_plot.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: qwtplot3d/qwt3d_plot.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d/qwt3d_plot.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: qwtplot3d/qwt3d_plot.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d/qwt3d_plot.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: qwtplot3d/qwt3d_plot.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for qwtplot3d/qwt3d_plot.h" >&5 -$as_echo_n "checking for qwtplot3d/qwt3d_plot.h... " >&6; } -if test "${ac_cv_header_qwtplot3d_qwt3d_plot_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_qwtplot3d_qwt3d_plot_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_qwtplot3d_qwt3d_plot_h" >&5 -$as_echo "$ac_cv_header_qwtplot3d_qwt3d_plot_h" >&6; } - -fi -if test "x$ac_cv_header_qwtplot3d_qwt3d_plot_h" = x""yes; then + ac_fn_cxx_check_header_mongrel "$LINENO" "qwtplot3d/qwt3d_plot.h" "ac_cv_header_qwtplot3d_qwt3d_plot_h" "$ac_includes_default" +if test "x$ac_cv_header_qwtplot3d_qwt3d_plot_h" = x""yes; then : qwtplot3d_qwtplot3d_h=yes else qwtplot3d_qwtplot3d_h=no @@ -43514,134 +31672,8 @@ if test "$qwtplot3d_qwtplot3d_h" = "yes" ; then QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS -I/usr/include/qwtplot3d" else - if test "${ac_cv_header_qwtplot3d_qt4_qwt3d_plot_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for qwtplot3d-qt4/qwt3d_plot.h" >&5 -$as_echo_n "checking for qwtplot3d-qt4/qwt3d_plot.h... " >&6; } -if test "${ac_cv_header_qwtplot3d_qt4_qwt3d_plot_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_qwtplot3d_qt4_qwt3d_plot_h" >&5 -$as_echo "$ac_cv_header_qwtplot3d_qt4_qwt3d_plot_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking qwtplot3d-qt4/qwt3d_plot.h usability" >&5 -$as_echo_n "checking qwtplot3d-qt4/qwt3d_plot.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking qwtplot3d-qt4/qwt3d_plot.h presence" >&5 -$as_echo_n "checking qwtplot3d-qt4/qwt3d_plot.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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_cxx_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d-qt4/qwt3d_plot.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: qwtplot3d-qt4/qwt3d_plot.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d-qt4/qwt3d_plot.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: qwtplot3d-qt4/qwt3d_plot.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d-qt4/qwt3d_plot.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: qwtplot3d-qt4/qwt3d_plot.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d-qt4/qwt3d_plot.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: qwtplot3d-qt4/qwt3d_plot.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d-qt4/qwt3d_plot.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: qwtplot3d-qt4/qwt3d_plot.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d-qt4/qwt3d_plot.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: qwtplot3d-qt4/qwt3d_plot.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d-qt4/qwt3d_plot.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: qwtplot3d-qt4/qwt3d_plot.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: qwtplot3d-qt4/qwt3d_plot.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: qwtplot3d-qt4/qwt3d_plot.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for qwtplot3d-qt4/qwt3d_plot.h" >&5 -$as_echo_n "checking for qwtplot3d-qt4/qwt3d_plot.h... " >&6; } -if test "${ac_cv_header_qwtplot3d_qt4_qwt3d_plot_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_qwtplot3d_qt4_qwt3d_plot_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_qwtplot3d_qt4_qwt3d_plot_h" >&5 -$as_echo "$ac_cv_header_qwtplot3d_qt4_qwt3d_plot_h" >&6; } - -fi -if test "x$ac_cv_header_qwtplot3d_qt4_qwt3d_plot_h" = x""yes; then + ac_fn_cxx_check_header_mongrel "$LINENO" "qwtplot3d-qt4/qwt3d_plot.h" "ac_cv_header_qwtplot3d_qt4_qwt3d_plot_h" "$ac_includes_default" +if test "x$ac_cv_header_qwtplot3d_qt4_qwt3d_plot_h" = x""yes; then : qwtplot3d_qt4_qwtplot3d_h=yes else qwtplot3d_qt4_qwtplot3d_h=no @@ -43658,141 +31690,9 @@ else QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS -I$qwtplot3d_incdir" as_ac_Header=`$as_echo "ac_cv_header_$qwtplot3d_incdir/qwt3d_plot.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $qwtplot3d_incdir/qwt3d_plot.h" >&5 -$as_echo_n "checking for $qwtplot3d_incdir/qwt3d_plot.h... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $qwtplot3d_incdir/qwt3d_plot.h usability" >&5 -$as_echo_n "checking $qwtplot3d_incdir/qwt3d_plot.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$qwtplot3d_incdir/qwt3d_plot.h> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $qwtplot3d_incdir/qwt3d_plot.h presence" >&5 -$as_echo_n "checking $qwtplot3d_incdir/qwt3d_plot.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$qwtplot3d_incdir/qwt3d_plot.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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_cxx_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $qwtplot3d_incdir/qwt3d_plot.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $qwtplot3d_incdir/qwt3d_plot.h" >&5 -$as_echo_n "checking for $qwtplot3d_incdir/qwt3d_plot.h... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +ac_fn_cxx_check_header_mongrel "$LINENO" "$qwtplot3d_incdir/qwt3d_plot.h" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - : else libqwtplot3d_ok=no fi @@ -43812,18 +31712,14 @@ if test "$qwtplot3d_lib" != "" ; then as_ac_Lib=`$as_echo "ac_cv_lib_$qwtplot3d_lib''_main" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for main in -l$qwtplot3d_lib" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$qwtplot3d_lib" >&5 $as_echo_n "checking for main in -l$qwtplot3d_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$qwtplot3d_lib $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -43835,47 +31731,19 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : libqwtplot3d_ok=yes else libqwtplot3d_ok=no @@ -43883,18 +31751,14 @@ else - { $as_echo "$as_me:$LINENO: checking for main in -lqwtplot3d-qt4" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lqwtplot3d-qt4" >&5 $as_echo_n "checking for main in -lqwtplot3d-qt4... " >&6; } -if test "${ac_cv_lib_qwtplot3d_qt4_main+set}" = set; then +if test "${ac_cv_lib_qwtplot3d_qt4_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lqwtplot3d-qt4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -43906,43 +31770,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_qwtplot3d_qt4_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_qwtplot3d_qt4_main=no + ac_cv_lib_qwtplot3d_qt4_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_qwtplot3d_qt4_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_qwtplot3d_qt4_main" >&5 $as_echo "$ac_cv_lib_qwtplot3d_qt4_main" >&6; } -if test "x$ac_cv_lib_qwtplot3d_qt4_main" = x""yes; then +if test "x$ac_cv_lib_qwtplot3d_qt4_main" = x""yes; then : libqwtplot3d_ok=yes else libqwtplot3d_ok=no @@ -43953,18 +31792,14 @@ QWTPLOT3D_LIBS="$QWTPLOT3D_LIBS -lqwtplot3d-qt4" else LIBS="$qwtplot3d_save_LIBS $QT_LIBS $QWTPLOT3D_LIBS -lqwtplot3d" - { $as_echo "$as_me:$LINENO: checking for main in -lqwtplot3d" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lqwtplot3d" >&5 $as_echo_n "checking for main in -lqwtplot3d... " >&6; } -if test "${ac_cv_lib_qwtplot3d_main+set}" = set; then +if test "${ac_cv_lib_qwtplot3d_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lqwtplot3d $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -43976,43 +31811,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_qwtplot3d_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_qwtplot3d_main=no + ac_cv_lib_qwtplot3d_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_qwtplot3d_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_qwtplot3d_main" >&5 $as_echo "$ac_cv_lib_qwtplot3d_main" >&6; } -if test "x$ac_cv_lib_qwtplot3d_main" = x""yes; then +if test "x$ac_cv_lib_qwtplot3d_main" = x""yes; then : libqwtplot3d_ok=yes else libqwtplot3d_ok=no @@ -44021,13 +31831,13 @@ if test "$libqwtplot3d_ok" = "yes" ; then QWTPLOT3D_LIBS="$QWTPLOT3D_LIBS -lqwtplot3d" else - { $as_echo "$as_me:$LINENO: result: Could not link to libqwtplot3d.so" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Could not link to libqwtplot3d.so" >&5 $as_echo "Could not link to libqwtplot3d.so" >&6; } fi fi fi else - { $as_echo "$as_me:$LINENO: result: Could not find qwtplot3d headers" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Could not find qwtplot3d headers" >&5 $as_echo "Could not find qwtplot3d headers" >&6; } fi @@ -44098,11 +31908,9 @@ gr_qtgui_with=no if test $passed = no; then if test x$enable_gr_qtgui = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-qtgui has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-qtgui has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-qtgui has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-qtgui." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-qtgui." >&5 $as_echo "Not building component gr-qtgui." >&6; } fi else @@ -44158,7 +31966,7 @@ gr_qtgui_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-qtgui will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-qtgui will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-qtgui will be included from a pre-installed library and includes." >&6; } gr_qtgui_with=yes else @@ -44166,11 +31974,11 @@ if test x$enable_gr_qtgui != xno; then : build_dirs="$build_dirs gr-qtgui" - { $as_echo "$as_me:$LINENO: result: Component gr-qtgui passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-qtgui passed configuration checks; building." >&5 $as_echo "Component gr-qtgui passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-qtgui passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-qtgui passed configuration checks; but not building." >&5 $as_echo "Component gr-qtgui passed configuration checks; but not building." >&6; } fi fi @@ -44194,7 +32002,7 @@ passed=yes # Check whether --enable-gr-sounder was given. -if test "${enable_gr_sounder+set}" = set; then +if test "${enable_gr_sounder+set}" = set; then : enableval=$enable_gr_sounder; else @@ -44212,15 +32020,13 @@ if test $passed != no; then if test $passed = yes; then if test x$usrp_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-sounder requires usrp, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-sounder requires usrp, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-sounder requires usrp, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$usrp_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-sounder requires usrp to be included as --with-usrp[=arg]" >&5 -$as_echo "$as_me: error: Component gr-sounder requires usrp to be included as --with-usrp[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-sounder requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 fi fi fi @@ -44229,15 +32035,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-sounder requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-sounder requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-sounder requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-sounder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-sounder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-sounder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -44251,11 +32055,9 @@ gr_sounder_with=no if test $passed = no; then if test x$enable_gr_sounder = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-sounder has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-sounder has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-sounder has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-sounder." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-sounder." >&5 $as_echo "Not building component gr-sounder." >&6; } fi else @@ -44311,7 +32113,7 @@ gr_sounder_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-sounder will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-sounder will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-sounder will be included from a pre-installed library and includes." >&6; } gr_sounder_with=yes else @@ -44321,11 +32123,11 @@ build_dirs="$build_dirs gr-sounder" - { $as_echo "$as_me:$LINENO: result: Component gr-sounder passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-sounder passed configuration checks; building." >&5 $as_echo "Component gr-sounder passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-sounder passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-sounder passed configuration checks; but not building." >&5 $as_echo "Component gr-sounder passed configuration checks; but not building." >&6; } fi fi @@ -44348,7 +32150,7 @@ passed=yes # Check whether --enable-gr-utils was given. -if test "${enable_gr_utils+set}" = set; then +if test "${enable_gr_utils+set}" = set; then : enableval=$enable_gr_utils; else @@ -44366,15 +32168,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-utils requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-utils requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-utils requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-utils requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gr-utils requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-utils requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -44383,15 +32183,13 @@ if test $passed != no; then if test $passed = yes; then if test x$usrp_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-utils requires usrp, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-utils requires usrp, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-utils requires usrp, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$usrp_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-utils requires usrp to be included as --with-usrp[=arg]" >&5 -$as_echo "$as_me: error: Component gr-utils requires usrp to be included as --with-usrp[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-utils requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 fi fi fi @@ -44400,15 +32198,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gr_wxgui_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gr-utils requires gr-wxgui, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-utils requires gr-wxgui, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gr-utils requires gr-wxgui, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gr_wxgui_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gr-utils requires gr-wxgui to be included as --with-gr-wxgui[=arg]" >&5 -$as_echo "$as_me: error: Component gr-utils requires gr-wxgui to be included as --with-gr-wxgui[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-utils requires gr-wxgui to be included as --with-gr-wxgui[=arg]" "$LINENO" 5 fi fi fi @@ -44422,11 +32218,9 @@ gr_utils_with=no if test $passed = no; then if test x$enable_gr_utils = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gr-utils has errors; stopping." >&5 -$as_echo "$as_me: error: Component gr-utils has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gr-utils has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gr-utils." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-utils." >&5 $as_echo "Not building component gr-utils." >&6; } fi else @@ -44482,7 +32276,7 @@ gr_utils_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gr-utils will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-utils will be included from a pre-installed library and includes." >&5 $as_echo "Component gr-utils will be included from a pre-installed library and includes." >&6; } gr_utils_with=yes else @@ -44490,11 +32284,11 @@ if test x$enable_gr_utils != xno; then : build_dirs="$build_dirs gr-utils" - { $as_echo "$as_me:$LINENO: result: Component gr-utils passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-utils passed configuration checks; building." >&5 $as_echo "Component gr-utils passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gr-utils passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-utils passed configuration checks; but not building." >&5 $as_echo "Component gr-utils passed configuration checks; but not building." >&6; } fi fi @@ -44517,7 +32311,7 @@ passed=yes # Check whether --enable-gnuradio-examples was given. -if test "${enable_gnuradio_examples+set}" = set; then +if test "${enable_gnuradio_examples+set}" = set; then : enableval=$enable_gnuradio_examples; else @@ -44535,15 +32329,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component gnuradio-examples requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-examples requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 $as_echo "Component gnuradio-examples requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component gnuradio-examples requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&5 -$as_echo "$as_me: error: Component gnuradio-examples requires gnuradio-core to be included as --with-gnuradio-core[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gnuradio-examples requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -44557,11 +32349,9 @@ gnuradio_examples_with=no if test $passed = no; then if test x$enable_gnuradio_examples = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component gnuradio-examples has errors; stopping." >&5 -$as_echo "$as_me: error: Component gnuradio-examples has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component gnuradio-examples has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component gnuradio-examples." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gnuradio-examples." >&5 $as_echo "Not building component gnuradio-examples." >&6; } fi else @@ -44617,7 +32407,7 @@ gnuradio_examples_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component gnuradio-examples will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-examples will be included from a pre-installed library and includes." >&5 $as_echo "Component gnuradio-examples will be included from a pre-installed library and includes." >&6; } gnuradio_examples_with=yes else @@ -44625,11 +32415,11 @@ if test x$enable_gnuradio_examples != xno; then : build_dirs="$build_dirs gnuradio-examples" - { $as_echo "$as_me:$LINENO: result: Component gnuradio-examples passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-examples passed configuration checks; building." >&5 $as_echo "Component gnuradio-examples passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component gnuradio-examples passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-examples passed configuration checks; but not building." >&5 $as_echo "Component gnuradio-examples passed configuration checks; but not building." >&6; } fi fi @@ -44652,7 +32442,7 @@ passed=yes # Check whether --enable-grc was given. -if test "${enable_grc+set}" = set; then +if test "${enable_grc+set}" = set; then : enableval=$enable_grc; else @@ -44670,15 +32460,13 @@ if test $passed != no; then if test $passed = yes; then if test x$gr_wxgui_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component grc requires gr-wxgui, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component grc requires gr-wxgui, which is not being built or specified via pre-installed files." >&5 $as_echo "Component grc requires gr-wxgui, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gr_wxgui_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component grc requires gr-wxgui to be included as --with-gr-wxgui[=arg]" >&5 -$as_echo "$as_me: error: Component grc requires gr-wxgui to be included as --with-gr-wxgui[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component grc requires gr-wxgui to be included as --with-gr-wxgui[=arg]" "$LINENO" 5 fi fi fi @@ -44686,9 +32474,9 @@ # Extract the first word of "xdg-mime", so it can be a program name with args. set dummy xdg-mime; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_XDG_UTILS+set}" = set; then +if test "${ac_cv_prog_XDG_UTILS+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$XDG_UTILS"; then @@ -44699,14 +32487,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_XDG_UTILS="true" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_prog_XDG_UTILS" && ac_cv_prog_XDG_UTILS="false" @@ -44714,10 +32502,10 @@ fi XDG_UTILS=$ac_cv_prog_XDG_UTILS if test -n "$XDG_UTILS"; then - { $as_echo "$as_me:$LINENO: result: $XDG_UTILS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XDG_UTILS" >&5 $as_echo "$XDG_UTILS" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -44733,7 +32521,7 @@ if test $passed = yes; then - { $as_echo "$as_me:$LINENO: checking for Python >= 2.5" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python >= 2.5" >&5 $as_echo_n "checking for Python >= 2.5... " >&6; } if test "sys.version.split()[0] >= "2.5""; then python_cmd=' @@ -44747,17 +32535,17 @@ except: exit(1)' fi if ! $PYTHON -c "$python_cmd" 2> /dev/null; then - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } passed=no else - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - { $as_echo "$as_me:$LINENO: checking for Python Cheetah templates >= 2.0.0" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python Cheetah templates >= 2.0.0" >&5 $as_echo_n "checking for Python Cheetah templates >= 2.0.0... " >&6; } if test "Cheetah.Version >= "2.0.0""; then python_cmd=' @@ -44771,17 +32559,17 @@ except: exit(1)' fi if ! $PYTHON -c "$python_cmd" 2> /dev/null; then - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } passed=no else - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - { $as_echo "$as_me:$LINENO: checking for Python lxml wrappers >= 2.0.0" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python lxml wrappers >= 2.0.0" >&5 $as_echo_n "checking for Python lxml wrappers >= 2.0.0... " >&6; } if test "lxml.etree.LXML_VERSION >= (2, 0, 0, 0)"; then python_cmd=' @@ -44795,17 +32583,17 @@ except: exit(1)' fi if ! $PYTHON -c "$python_cmd" 2> /dev/null; then - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } passed=no else - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - { $as_echo "$as_me:$LINENO: checking for Python gtk wrappers >= 2.10.0" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python gtk wrappers >= 2.10.0" >&5 $as_echo_n "checking for Python gtk wrappers >= 2.10.0... " >&6; } if test "gtk.pygtk_version >= (2, 10, 0)"; then python_cmd=' @@ -44819,11 +32607,11 @@ except: exit(1)' fi if ! $PYTHON -c "$python_cmd" 2> /dev/null; then - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } passed=no else - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi @@ -44845,11 +32633,9 @@ grc_with=no if test $passed = no; then if test x$enable_grc = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component grc has errors; stopping." >&5 -$as_echo "$as_me: error: Component grc has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component grc has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component grc." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component grc." >&5 $as_echo "Not building component grc." >&6; } fi else @@ -44905,7 +32691,7 @@ grc_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component grc will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component grc will be included from a pre-installed library and includes." >&5 $as_echo "Component grc will be included from a pre-installed library and includes." >&6; } grc_with=yes else @@ -44913,11 +32699,11 @@ if test x$enable_grc != xno; then : build_dirs="$build_dirs grc" - { $as_echo "$as_me:$LINENO: result: Component grc passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component grc passed configuration checks; building." >&5 $as_echo "Component grc passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component grc passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component grc passed configuration checks; but not building." >&5 $as_echo "Component grc passed configuration checks; but not building." >&6; } fi fi @@ -44941,7 +32727,7 @@ passed=yes # Check whether --enable-docs was given. -if test "${enable_docs+set}" = set; then +if test "${enable_docs+set}" = set; then : enableval=$enable_docs; else @@ -44963,11 +32749,9 @@ docs_with=no if test $passed = no; then if test x$enable_docs = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component docs has errors; stopping." >&5 -$as_echo "$as_me: error: Component docs has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component docs has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component docs." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component docs." >&5 $as_echo "Not building component docs." >&6; } fi else @@ -45023,7 +32807,7 @@ docs_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component docs will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component docs will be included from a pre-installed library and includes." >&5 $as_echo "Component docs will be included from a pre-installed library and includes." >&6; } docs_with=yes else @@ -45031,11 +32815,11 @@ if test x$enable_docs != xno; then : build_dirs="$build_dirs docs" - { $as_echo "$as_me:$LINENO: result: Component docs passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component docs passed configuration checks; building." >&5 $as_echo "Component docs passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component docs passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component docs passed configuration checks; but not building." >&5 $as_echo "Component docs passed configuration checks; but not building." >&6; } fi fi @@ -45113,13 +32897,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -45127,8 +32911,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -45151,11 +32935,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -45169,14 +32953,15 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -45184,176 +32969,108 @@ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + 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_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_FORTRAN_TRUE}" && test -z "${ENABLE_FORTRAN_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_FORTRAN\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"ENABLE_FORTRAN\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"ENABLE_FORTRAN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAS_XMLTO_TRUE}" && test -z "${HAS_XMLTO_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAS_XMLTO\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAS_XMLTO\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"HAS_XMLTO\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OMNITHREAD_POSIX_TRUE}" && test -z "${OMNITHREAD_POSIX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"OMNITHREAD_POSIX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"OMNITHREAD_POSIX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"OMNITHREAD_POSIX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OMNITHREAD_NT_TRUE}" && test -z "${OMNITHREAD_NT_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"OMNITHREAD_NT\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"OMNITHREAD_NT\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"OMNITHREAD_NT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_CREATEFILEMAPPING_TRUE}" && test -z "${HAVE_CREATEFILEMAPPING_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CREATEFILEMAPPING\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_CREATEFILEMAPPING\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"HAVE_CREATEFILEMAPPING\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DOC_TRUE}" && test -z "${DOC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MD_CPU_x86_TRUE}" && test -z "${MD_CPU_x86_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MD_CPU_x86\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MD_CPU_x86\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"MD_CPU_x86\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MD_SUBCPU_x86_64_TRUE}" && test -z "${MD_SUBCPU_x86_64_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MD_SUBCPU_x86_64\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MD_SUBCPU_x86_64\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"MD_SUBCPU_x86_64\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MD_CPU_powerpc_TRUE}" && test -z "${MD_CPU_powerpc_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MD_CPU_powerpc\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MD_CPU_powerpc\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"MD_CPU_powerpc\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MD_CPU_generic_TRUE}" && test -z "${MD_CPU_generic_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MD_CPU_generic\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MD_CPU_generic\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"MD_CPU_generic\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${FUSB_TECH_darwin_TRUE}" && test -z "${FUSB_TECH_darwin_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"FUSB_TECH_darwin\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"FUSB_TECH_darwin\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"FUSB_TECH_darwin\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${FUSB_TECH_win32_TRUE}" && test -z "${FUSB_TECH_win32_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"FUSB_TECH_win32\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"FUSB_TECH_win32\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"FUSB_TECH_win32\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${FUSB_TECH_generic_TRUE}" && test -z "${FUSB_TECH_generic_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"FUSB_TECH_generic\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"FUSB_TECH_generic\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"FUSB_TECH_generic\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${FUSB_TECH_linux_TRUE}" && test -z "${FUSB_TECH_linux_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"FUSB_TECH_linux\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"FUSB_TECH_linux\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"FUSB_TECH_linux\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${FUSB_TECH_ra_wb_TRUE}" && test -z "${FUSB_TECH_ra_wb_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"FUSB_TECH_ra_wb\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"FUSB_TECH_ra_wb\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"FUSB_TECH_ra_wb\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_QT_TRUE}" && test -z "${BUILD_QT_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_QT\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BUILD_QT\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"BUILD_QT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_QT_TRUE}" && test -z "${BUILD_QT_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_QT\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BUILD_QT\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"BUILD_QT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XDG_UTILS_TRUE}" && test -z "${XDG_UTILS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XDG_UTILS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XDG_UTILS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"XDG_UTILS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -45363,17 +33080,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -45381,23 +33099,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -45405,7 +33115,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -45416,7 +33132,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -45439,13 +33155,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -45455,15 +33164,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -45475,12 +33184,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -45492,7 +33205,89 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -45506,8 +33301,12 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -45527,76 +33326,25 @@ } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -45625,8 +33373,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -45645,10 +33441,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -45663,13 +33459,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -45701,13 +33503,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -45726,16 +33530,17 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.67, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -45753,11 +33558,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -45771,27 +33581,29 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + 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 - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -45799,11 +33611,10 @@ ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -46550,9 +34361,7 @@ "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;; "run_tests_build") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_build" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -46579,7 +34388,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -46590,11 +34399,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -46602,7 +34407,13 @@ if test -n "$CONFIG_FILES"; then -ac_cr=' ' +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ac_cs_awk_cr='\\r' @@ -46619,24 +34430,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -46658,7 +34463,7 @@ t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -46672,7 +34477,7 @@ t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -46725,22 +34530,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -46768,9 +34579,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -46855,9 +34664,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -46870,9 +34677,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -46900,12 +34705,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -46916,7 +34719,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -46929,9 +34732,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -46959,47 +34760,7 @@ q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -47056,7 +34817,6 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - ac_sed_dataroot=' /datarootdir/ { p @@ -47066,12 +34826,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' +/@mandir@/p' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -47081,7 +34840,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -47110,26 +34869,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -47140,25 +34895,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + { $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 "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -47196,7 +34945,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -47291,47 +35040,7 @@ q } s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -48323,15 +36032,12 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -48352,7 +36058,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit 1 fi # @@ -48396,7 +36102,7 @@ case $ac_arg in *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;; + as_fn_append ac_sub_configure_args " '$ac_arg'" ;; esac done @@ -48425,49 +36131,9 @@ test -d "$srcdir/$ac_dir" || continue ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)" - $as_echo "$as_me:$LINENO: $ac_msg" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 $as_echo "$ac_msg" >&6 - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -48514,7 +36180,7 @@ # This should be Cygnus configure. ac_sub_configure=$ac_aux_dir/configure else - { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 + { $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 @@ -48528,21 +36194,19 @@ ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; esac - { $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 + { $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_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 -$as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} - { (exit 1); exit 1; }; } + 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:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $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 --- gnuradio-3.2.2.dfsg.orig/Makefile.in +++ gnuradio-3.2.2.dfsg/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -190,8 +191,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -217,8 +216,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -243,11 +240,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -255,8 +249,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -267,8 +259,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -296,12 +286,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -316,16 +307,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -339,8 +324,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -356,8 +339,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -800,7 +781,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -825,7 +806,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -971,7 +952,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ @@ -1120,6 +1102,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1128,18 +1112,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/.gbp.conf +++ gnuradio-3.2.2.dfsg/.gbp.conf @@ -0,0 +1,46 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +# the default build command: +#builder = debuild -i\.git/ -I.git +# the default clean command: +#cleaner = debuild clean +# the default branch for upstream sources: +upstream-branch = dfsg-orig +# the default branch for the debian patch: +debian-branch = master +# the default tag formats used: +#upstream-tag = upstream/%(version)s +#debian-tag = debian/%(version)s +# use pristine-tar: +pristine-tar = True + +# Options only affecting git-buildpackage +[git-buildpackage] +#upstream-branch = dfsgclean +# uncomment this to automatically GPG sign tags +#sign-tags = True +# keyid to GPG sign tags with +#keyid = 0xdeadbeef +# push to a remote repository after a successful tag: +#posttag = git-push git.example.com +# use this for more svn-buildpackage like behaviour: +export-dir = ../build-area/gnuradio/ +#tarball-dir = ../tarballs/ + +# Options only affecting git-import-orig +[git-import-orig] +#upstream-branch = newupstream +#debian-branch = dfsgclean +#filter = .svn + +# Options only affecting git-import-dsc +[git-import-dsc] +#upstream-branch = svn-upstream +#filter = [ 'CVS', '.cvsignore' ] + +# Options only affecting git-dch +[git-dch] +#git-log = --no-merges +#snapshot-number = snapshot + 1 + --- gnuradio-3.2.2.dfsg.orig/ltmain.sh +++ gnuradio-3.2.2.dfsg/ltmain.sh @@ -1,6 +1,6 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6 +# ltmain.sh (GNU libtool) 2.2.6b # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1 +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,9 +73,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.2.6 Debian-2.2.6a-1ubuntu1" +VERSION="2.2.6b Debian-2.2.6b-2ubuntu3" TIMESTAMP="" -package_revision=1.3012 +package_revision=1.3017 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -5347,19 +5347,19 @@ # It is a libtool convenience library, so add in its objects. convenience="$convenience $ladir/$objdir/$old_library" old_convenience="$old_convenience $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done continue fi # $pass = conv @@ -5896,6 +5896,7 @@ if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do + path= case $deplib in -L*) path="$deplib" ;; *.la) --- gnuradio-3.2.2.dfsg.orig/config/ltversion.m4 +++ gnuradio-3.2.2.dfsg/config/ltversion.m4 @@ -9,15 +9,15 @@ # Generated from ltversion.in. -# serial 3012 ltversion.m4 +# serial 3017 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6]) -m4_define([LT_PACKAGE_REVISION], [1.3012]) +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +m4_define([LT_PACKAGE_REVISION], [1.3017]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6' -macro_revision='1.3012' +[macro_version='2.2.6b' +macro_revision='1.3017' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) --- gnuradio-3.2.2.dfsg.orig/config/pkg.m4 +++ gnuradio-3.2.2.dfsg/config/pkg.m4 @@ -1,7 +1,7 @@ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . -# Copyright © 2008 Free Software Foundation, Inc. # # 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 @@ -27,12 +27,15 @@ AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.18]) + _pkg_min_version=m4_default([$1], [0.9.0]) AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then AC_MSG_RESULT([yes]) @@ -40,7 +43,6 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -49,34 +51,31 @@ # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) + m4_default([$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -95,71 +94,40 @@ # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], # [ACTION-IF-NOT-FOUND]) # -# E.g., -# PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -# defines: -# -# GSTUFF_LIBS -# GSTUFF_CFLAGS -# GSTUFF_INCLUDEDIR -# GSTUFF_CPPFLAGS # the -I, -D and -U's out of CFLAGS -# -# see pkg-config man page also defines GSTUFF_PKG_ERRORS on error # # Note that if there is a possibility the first call to # PKG_CHECK_MODULES might not happen, you should be sure to include an # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac # +# # -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES],[ -AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl - +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_INCLUDEDIR], [includedir for $1, overriding pkg-config])dnl pkg_failed=no AC_MSG_CHECKING([for $1]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) - -if test x$cross_compiling = xyes -then - dnl _PKG_CONFIG([$1][_LIBS], [libs-only-l --static], [$2]) - _PKG_CONFIG([$1][_LIBS], [libs --static], [$2]) - dnl prune out any -L/lib or -L/usr/lib since they're pointing to the wrong filesystem root - _pkg_tmp= - for flag in [$]pkg_cv_[$1][_LIBS]; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_[$1][_LIBS]="$_pkg_tmp" -else - _PKG_CONFIG([$1][_LIBS], [libs --static], [$2]) -fi - -_PKG_CONFIG([$1][_INCLUDEDIR], [variable=includedir], [$2]) - +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - ifelse([$4], , [AC_MSG_ERROR(dnl + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -167,35 +135,23 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) +_PKG_TEXT])[]dnl + ]) elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see .])], - [$4]) +To get pkg-config, see .])[]dnl + ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - $1[]_INCLUDEDIR=$pkg_cv_[]$1[]_INCLUDEDIR - - $1[]_CPPFLAGS="" - for flag in $$1[]_CFLAGS; do - case $flag in - -I* | -D* | -U*) $1[]_CPPFLAGS="$$1[]_CPPFLAGS $flag" ;; - esac - done - pkg_cv_[]$1[]_CPPFLAGS=$$1[]_CPPFLAGS - AC_SUBST($1[]_CPPFLAGS) - AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) + $3 fi[]dnl ])# PKG_CHECK_MODULES --- gnuradio-3.2.2.dfsg.orig/config/Makefile.in +++ gnuradio-3.2.2.dfsg/config/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -892,6 +873,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -900,18 +883,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/config/gr_fortran.m4 +++ gnuradio-3.2.2.dfsg/config/gr_fortran.m4 @@ -23,10 +23,8 @@ AC_ARG_ENABLE(fortran, AC_HELP_STRING([--enable-fortran],[enable fortran (no)]), [], [enable_fortran=no]) AM_CONDITIONAL(ENABLE_FORTRAN, test "x$enable_fortran" = xyes) - if test "x$enable_fortran" = xyes then - AC_PROG_F77 - AC_F77_LIBRARY_LDFLAGS + LT_LANG(Fortran 77) fi ]) --- gnuradio-3.2.2.dfsg.orig/usrp2/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp2/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -174,8 +175,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -201,8 +200,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -227,11 +224,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -239,8 +233,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -251,8 +243,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -280,12 +270,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -300,16 +291,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -323,8 +308,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -340,8 +323,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -744,7 +725,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -769,7 +750,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -957,6 +938,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -965,18 +948,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/usrp2/host/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp2/host/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -184,8 +185,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -211,8 +210,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -237,11 +234,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -249,8 +243,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -261,8 +253,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -290,12 +280,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -310,16 +301,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -333,8 +318,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -350,8 +333,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -778,7 +759,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -803,7 +784,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -994,6 +975,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1002,18 +985,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/usrp2/host/include/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp2/host/include/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -174,8 +175,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -201,8 +200,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -227,11 +224,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -239,8 +233,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -251,8 +243,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -280,12 +270,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -300,16 +291,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -323,8 +308,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -340,8 +323,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -744,7 +725,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -769,7 +750,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -957,6 +938,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -965,18 +948,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/usrp2/host/include/usrp2/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp2/host/include/usrp2/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -171,8 +172,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -198,8 +197,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -224,11 +221,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -236,8 +230,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -248,8 +240,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -277,12 +267,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -297,16 +288,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -320,8 +305,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -337,8 +320,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -887,6 +868,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -895,18 +878,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp2/host/apps/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp2/host/apps/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -221,8 +222,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -248,8 +247,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -274,11 +271,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -286,8 +280,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -298,8 +290,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -327,12 +317,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -347,16 +338,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -370,8 +355,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -387,8 +370,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1018,6 +999,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1026,18 +1009,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-binPROGRAMS install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp2/host/lib/usrp2.cc +++ gnuradio-3.2.2.dfsg/usrp2/host/lib/usrp2.cc @@ -38,9 +38,9 @@ struct usrp_table_entry { // inteface + normalized mac addr ("eth0:01:23:45:67:89:ab") std::string key; - boost::weak_ptr value; + boost::weak_ptr value; - usrp_table_entry(const std::string &_key, boost::weak_ptr _value) + usrp_table_entry(const std::string &_key, boost::weak_ptr _value) : key(_key), value(_value) {} }; @@ -70,7 +70,7 @@ // We don't have the USRP2 we're looking for // create a new one and stick it in the table. - usrp2::sptr r(new usrp2::usrp2(ifc, pr, rx_bufsize)); + usrp2::sptr r(new usrp2(ifc, pr, rx_bufsize)); usrp_table_entry t(key, r); s_table.push_back(t); --- gnuradio-3.2.2.dfsg.orig/usrp2/host/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp2/host/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -210,8 +211,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -237,8 +236,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -263,11 +260,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -275,8 +269,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -287,8 +279,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -316,12 +306,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -336,16 +327,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -359,8 +344,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -376,8 +359,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1074,6 +1055,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1082,18 +1065,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp2/firmware/aclocal.m4 +++ gnuradio-3.2.2.dfsg/usrp2/firmware/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.2 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -31,10 +31,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.10' +[am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.2], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,7 +50,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.2])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -132,14 +132,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -152,6 +152,7 @@ AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl _AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -165,14 +166,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 10 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -229,6 +230,16 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [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 @@ -246,7 +257,17 @@ 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 @@ -256,19 +277,23 @@ break fi ;; + 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 - # 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. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $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 sub/conftest.${OBJEXT-o} 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 @@ -418,13 +443,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 13 +# serial 16 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -441,7 +466,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.60])dnl +[AC_PREREQ([2.62])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -492,8 +517,8 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -501,23 +526,36 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -]) + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +]) + +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) # When config.status generates a header, we must update the stamp-h file. @@ -541,7 +579,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -552,7 +590,14 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +if test x"${install_sh}" != 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 AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -578,13 +623,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_MAKE_INCLUDE() # ----------------- @@ -593,7 +638,7 @@ [am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -603,24 +648,24 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi AC_SUBST([am__include]) AC_SUBST([am__quote]) @@ -630,14 +675,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 6 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -654,7 +699,14 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +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 --run true"; then am_missing_run="$MISSING --run " @@ -725,14 +777,14 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_SANITY_CHECK # --------------- @@ -741,16 +793,29 @@ # Just in case sleep 1 echo timestamp > conftest.file +# 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]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +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 ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + 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` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$[*]" != "X $srcdir/configure conftest.file" \ @@ -803,18 +868,25 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. --- gnuradio-3.2.2.dfsg.orig/usrp2/firmware/config.h.in +++ gnuradio-3.2.2.dfsg/usrp2/firmware/config.h.in @@ -54,6 +54,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION --- gnuradio-3.2.2.dfsg.orig/usrp2/firmware/configure +++ gnuradio-3.2.2.dfsg/usrp2/firmware/configure @@ -1,18 +1,22 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63. +# Generated by GNU Autoconf 2.67. +# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -20,23 +24,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -44,7 +40,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -55,7 +57,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -78,13 +80,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -94,15 +89,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -114,12 +109,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -131,330 +130,299 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || 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" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $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 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 - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -fi -fi +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error -exitcode=0 -if as_func_success; then - : +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. + as_expr=false fi -if as_func_ret_success; then - : +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO 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'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -471,8 +439,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -482,29 +449,18 @@ exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -534,7 +490,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -553,10 +509,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -570,11 +526,11 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -589,7 +545,6 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME= @@ -597,6 +552,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= +PACKAGE_URL= ac_unique_file="lib/u2_init.c" # Factoring default headers for most tests. @@ -635,7 +591,9 @@ # include #endif" -ac_subst_vars='LTLIBOBJS +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS LIBOBJS with_LIBDIRPATH with_SWIGDIRPATH @@ -738,6 +696,7 @@ program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -826,8 +785,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -872,8 +832,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -899,8 +858,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1104,8 +1062,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1121,8 +1078,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1152,17 +1108,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1179,15 +1135,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1210,8 +1164,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1225,8 +1178,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1241,11 +1194,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1284,13 +1235,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1330,7 +1279,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1401,7 +1350,7 @@ 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 C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor CCAS assembler compiler command (defaults to CC) @@ -1410,6 +1359,7 @@ 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 the package provider. _ACEOF ac_status=$? fi @@ -1469,25 +1419,263 @@ done fi -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -configure -generated by GNU Autoconf 2.63 +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +configure +generated by GNU Autoconf 2.67 + +Copyright (C) 2010 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_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_c_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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 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; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + 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 "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; 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;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_mongrel -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. +# 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; test "x$as_lineno_stack" = x && { as_lineno=; 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 "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> _ACEOF - exit +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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_compile 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 $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -1523,8 +1711,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1561,9 +1749,9 @@ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1579,13 +1767,13 @@ -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1597,11 +1785,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1610,13 +1796,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1635,11 +1821,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -1652,11 +1836,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -1670,11 +1852,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -1688,46 +1868,53 @@ exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -1738,19 +1925,23 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; @@ -1758,7 +1949,7 @@ esac fi else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1773,11 +1964,11 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; @@ -1787,17 +1978,17 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac @@ -1809,35 +2000,20 @@ esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi - - - - - - - - - - - - - - - - +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1866,9 +2042,7 @@ fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in . \"$srcdir\"/." >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in . \"$srcdir\"/." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find install-sh, install.sh, or shtool in . \"$srcdir\"/." "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -1882,7 +2056,7 @@ -am__api_version='1.10' +am__api_version='1.11' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -1898,10 +2072,10 @@ # 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:$LINENO: checking for a BSD-compatible install" >&5 +{ $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 test "${ac_cv_path_install+set}" = set; then +if test "${ac_cv_path_install+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -1909,11 +2083,11 @@ 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/* | \ + # 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\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -1950,7 +2124,7 @@ ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -1966,7 +2140,7 @@ INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $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}. @@ -1977,21 +2151,34 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file +# 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 ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + 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` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$*" != "X $srcdir/configure conftest.file" \ @@ -2001,11 +2188,8 @@ # 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_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -2014,13 +2198,10 @@ # Ok. : else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" @@ -2035,20 +2216,136 @@ # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +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 --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 + { $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 -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +if test x"${install_sh}" != 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 test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + 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 +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 +done + done +IFS=$as_save_IFS + +fi +fi +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 + + +fi +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 test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + 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 +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 +done + done +IFS=$as_save_IFS + +fi +fi +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 + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +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 test "${ac_cv_path_mkdir+set}" = set; then + if test "${ac_cv_path_mkdir+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2056,7 +2353,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do + for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( @@ -2068,11 +2365,12 @@ esac done 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 @@ -2080,11 +2378,10 @@ # 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. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" @@ -2097,9 +2394,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2110,24 +2407,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2135,11 +2432,11 @@ test -n "$AWK" && break done -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $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 { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2147,7 +2444,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# 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;; @@ -2157,11 +2454,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2181,9 +2478,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2219,115 +2514,13 @@ 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"} - -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - -# 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:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - 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 -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -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:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - 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 -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -2344,7 +2537,7 @@ # Check whether --enable-all-components was given. -if test "${enable_all_components+set}" = set; then +if test "${enable_all_components+set}" = set; then : enableval=$enable_all_components; fi @@ -2356,7 +2549,7 @@ passed=yes # Check whether --enable-usrp2 was given. -if test "${enable_usrp2+set}" = set; then +if test "${enable_usrp2+set}" = set; then : enableval=$enable_usrp2; else @@ -2374,11 +2567,9 @@ usrp2_with=no if test $passed = no; then if test x$enable_usrp2 = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component usrp2 has errors; stopping." >&5 -$as_echo "$as_me: error: Component usrp2 has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component usrp2 has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component usrp2." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component usrp2." >&5 $as_echo "Not building component usrp2." >&6; } fi else @@ -2434,7 +2625,7 @@ usrp2_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component usrp2 will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 will be included from a pre-installed library and includes." >&5 $as_echo "Component usrp2 will be included from a pre-installed library and includes." >&6; } usrp2_with=yes else @@ -2442,11 +2633,11 @@ if test x$enable_usrp2 != xno; then : build_dirs="$build_dirs usrp2" - { $as_echo "$as_me:$LINENO: result: Component usrp2 passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 passed configuration checks; building." >&5 $as_echo "Component usrp2 passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component usrp2 passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 passed configuration checks; but not building." >&5 $as_echo "Component usrp2 passed configuration checks; but not building." >&6; } fi fi @@ -2473,44 +2664,44 @@ am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 $as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -2535,9 +2726,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2548,24 +2739,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2575,9 +2766,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2588,24 +2779,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2614,7 +2805,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2628,9 +2819,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2641,24 +2832,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2668,9 +2859,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2682,18 +2873,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2712,10 +2903,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2727,9 +2918,9 @@ 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_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2740,24 +2931,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2771,9 +2962,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2784,24 +2975,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2814,7 +3005,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2825,57 +3016,37 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +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=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2891,8 +3062,8 @@ # 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:$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}: 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: @@ -2908,17 +3079,17 @@ done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $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, @@ -2935,7 +3106,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -2954,84 +3125,41 @@ else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 +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:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +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 -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - fi - fi -fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +{ $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" +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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $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 @@ -3046,32 +3174,83 @@ esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } fi - -rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +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 -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +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 test "${ac_cv_objext+set}" = set; then +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3083,17 +3262,17 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $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 @@ -3106,31 +3285,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +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:$LINENO: result: $ac_cv_objext" >&5 +{ $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:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $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 test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3144,37 +3315,16 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -3183,20 +3333,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3207,35 +3353,11 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3246,36 +3368,12 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3286,42 +3384,17 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - 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_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -3338,18 +3411,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -3406,32 +3475,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3442,17 +3488,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3462,9 +3510,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3490,6 +3538,11 @@ 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 @@ -3507,7 +3560,17 @@ 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 @@ -3517,19 +3580,23 @@ break fi ;; + 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 - # 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. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $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 sub/conftest.${OBJEXT-o} 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 @@ -3553,7 +3620,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $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 @@ -3573,14 +3640,14 @@ 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:$LINENO: checking how to run the C preprocessor" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 $as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then + if test "${ac_cv_prog_CPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -3595,11 +3662,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -3608,78 +3671,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -3691,7 +3710,7 @@ else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -3702,11 +3721,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -3714,88 +3729,41 @@ # include #endif Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -3813,9 +3781,9 @@ depcc="$CCAS" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3841,6 +3809,9 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + + 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 @@ -3858,7 +3829,17 @@ 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 @@ -3868,19 +3849,23 @@ break fi ;; + 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 - # 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. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $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 sub/conftest.${OBJEXT-o} 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 @@ -3904,7 +3889,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 $as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type @@ -3922,9 +3907,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then +if test "${ac_cv_prog_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -3935,24 +3920,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 $as_echo "$RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3962,9 +3947,9 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -3975,24 +3960,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 $as_echo "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4001,7 +3986,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4013,9 +3998,9 @@ -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +{ $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 test "${ac_cv_path_GREP+set}" = set; then +if test "${ac_cv_path_GREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4026,7 +4011,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + 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" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue @@ -4046,7 +4031,7 @@ $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 - ac_count=`expr $ac_count + 1` + 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" @@ -4061,26 +4046,24 @@ $ac_path_GREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + 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:$LINENO: result: $ac_cv_path_GREP" >&5 +{ $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:$LINENO: checking for egrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then +if test "${ac_cv_path_EGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4094,7 +4077,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + 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" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue @@ -4114,7 +4097,7 @@ $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 - ac_count=`expr $ac_count + 1` + 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" @@ -4129,12 +4112,10 @@ $ac_path_EGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + 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 @@ -4142,21 +4123,17 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +{ $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:$LINENO: checking for ANSI C header files" >&5 +{ $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 test "${ac_cv_header_stdc+set}" = set; then +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4171,48 +4148,23 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + 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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + 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 - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4222,18 +4174,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + 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 - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4243,14 +4191,10 @@ 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 + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4277,118 +4221,33 @@ return 0; } _ACEOF -rm -f 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -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 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +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:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $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 -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$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` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +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 @@ -4403,7 +4262,7 @@ passed=yes # Check whether --enable-usrp2-firmware was given. -if test "${enable_usrp2_firmware+set}" = set; then +if test "${enable_usrp2_firmware+set}" = set; then : enableval=$enable_usrp2_firmware; else @@ -4421,15 +4280,13 @@ if test $passed != no; then if test $passed = yes; then if test x$usrp2_skipped = xyes; then - { $as_echo "$as_me:$LINENO: result: Component usrp2-firmware requires usrp2, which is not being built or specified via pre-installed files." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2-firmware requires usrp2, which is not being built or specified via pre-installed files." >&5 $as_echo "Component usrp2-firmware requires usrp2, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$usrp2_with = xno; then - { { $as_echo "$as_me:$LINENO: error: Component usrp2-firmware requires usrp2 to be included as --with-usrp2-firmware[=arg]" >&5 -$as_echo "$as_me: error: Component usrp2-firmware requires usrp2 to be included as --with-usrp2-firmware[=arg]" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component usrp2-firmware requires usrp2 to be included as --with-usrp2-firmware[=arg]" "$LINENO" 5 fi fi fi @@ -4441,146 +4298,11 @@ - - - -for ac_header in arpa/inet.h netinet/in.h byteswap.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in arpa/inet.h netinet/in.h byteswap.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 @@ -4589,19 +4311,14 @@ done - - { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then +if test "${ac_cv_c_bigendian+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __APPLE_CC__ not a universal capable compiler @@ -4609,46 +4326,34 @@ typedef int dummy; _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # Check for potential -arch flags. It is not universal unless - # there are some -arch flags. Note that *ppc* also matches - # ppc64. This check is also rather less than ideal. - case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( - *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; - esac -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4666,30 +4371,9 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4705,49 +4389,18 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -4762,30 +4415,9 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to _BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -4800,51 +4432,20 @@ return 0; } _ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : # Try to guess by grepping values from an object file. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; @@ -4867,27 +4468,10 @@ { return use_ascii (foo) == use_ebcdic (foo); ; - return 0; -} -_ACEOF -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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -4899,20 +4483,10 @@ ac_cv_c_bigendian=unknown fi fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -4932,67 +4506,33 @@ return 0; } _ACEOF -rm -f 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_bigendian=no 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 - -( exit $ac_status ) -ac_cv_c_bigendian=yes + ac_cv_c_bigendian=yes fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +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:$LINENO: result: $ac_cv_c_bigendian" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 $as_echo "$ac_cv_c_bigendian" >&6; } case $ac_cv_c_bigendian in #( yes) - cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 -_ACEOF + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h ;; #( no) ;; #( universal) -cat >>confdefs.h <<\_ACEOF -#define AC_APPLE_UNIVERSAL_BUILD 1 -_ACEOF +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) - { { $as_echo "$as_me:$LINENO: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -$as_echo "$as_me: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac @@ -5000,9 +4540,9 @@ # Extract the first word of "mb-gcc", so it can be a program name with args. set dummy mb-gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_MB_GCC+set}" = set; then +if test "${ac_cv_prog_MB_GCC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$MB_GCC"; then @@ -5013,14 +4553,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_MB_GCC="yes" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_prog_MB_GCC" && ac_cv_prog_MB_GCC="no" @@ -5028,16 +4568,16 @@ fi MB_GCC=$ac_cv_prog_MB_GCC if test -n "$MB_GCC"; then - { $as_echo "$as_me:$LINENO: result: $MB_GCC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MB_GCC" >&5 $as_echo "$MB_GCC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test $MB_GCC = no; then - { $as_echo "$as_me:$LINENO: result: usrp2 firmware requires mb-gcc. Not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: usrp2 firmware requires mb-gcc. Not found" >&5 $as_echo "usrp2 firmware requires mb-gcc. Not found" >&6; } passed=no fi @@ -5064,11 +4604,9 @@ usrp2_firmware_with=no if test $passed = no; then if test x$enable_usrp2_firmware = xyes; then - { { $as_echo "$as_me:$LINENO: error: Component usrp2-firmware has errors; stopping." >&5 -$as_echo "$as_me: error: Component usrp2-firmware has errors; stopping." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Component usrp2-firmware has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: result: Not building component usrp2-firmware." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component usrp2-firmware." >&5 $as_echo "Not building component usrp2-firmware." >&6; } fi else @@ -5124,7 +4662,7 @@ usrp2_firmware_LIBDIRPATH= fi - { $as_echo "$as_me:$LINENO: result: Component usrp2-firmware will be included from a pre-installed library and includes." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2-firmware will be included from a pre-installed library and includes." >&5 $as_echo "Component usrp2-firmware will be included from a pre-installed library and includes." >&6; } usrp2_firmware_with=yes else @@ -5132,11 +4670,11 @@ if test x$enable_usrp2_firmware != xno; then : build_dirs="$build_dirs usrp2-firmware" - { $as_echo "$as_me:$LINENO: result: Component usrp2-firmware passed configuration checks; building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2-firmware passed configuration checks; building." >&5 $as_echo "Component usrp2-firmware passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:$LINENO: result: Component usrp2-firmware passed configuration checks; but not building." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2-firmware passed configuration checks; but not building." >&5 $as_echo "Component usrp2-firmware passed configuration checks; but not building." >&6; } fi fi @@ -5210,13 +4748,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -5224,8 +4762,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -5248,11 +4786,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -5266,57 +4804,55 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs + 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_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + 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_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILDING_USRP2_FIRMWARE_TRUE}" && test -z "${BUILDING_USRP2_FIRMWARE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILDING_USRP2_FIRMWARE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BUILDING_USRP2_FIRMWARE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"BUILDING_USRP2_FIRMWARE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -5326,17 +4862,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -5344,23 +4881,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -5368,7 +4897,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -5379,7 +4914,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -5402,13 +4937,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -5418,15 +4946,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -5438,12 +4966,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -5455,7 +4987,89 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -5469,8 +5083,12 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -5490,76 +5108,25 @@ } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -5588,8 +5155,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -5608,10 +5223,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -5626,13 +5241,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -5664,13 +5285,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -5689,16 +5312,17 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.67, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -5716,11 +5340,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -5734,27 +5363,29 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + 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 - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -5762,11 +5393,10 @@ ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -5825,9 +5455,7 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -5854,7 +5482,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -5865,11 +5493,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -5877,7 +5501,13 @@ if test -n "$CONFIG_FILES"; then -ac_cr=' ' +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ac_cs_awk_cr='\\r' @@ -5894,24 +5524,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -5933,7 +5557,7 @@ t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -5947,7 +5571,7 @@ t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -6000,22 +5624,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -6043,9 +5673,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -6130,9 +5758,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -6145,9 +5771,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6175,12 +5799,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -6191,7 +5813,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -6204,9 +5826,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -6234,47 +5854,7 @@ q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -6331,7 +5911,6 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - ac_sed_dataroot=' /datarootdir/ { p @@ -6341,12 +5920,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' +/@mandir@/p' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -6356,7 +5934,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -6385,26 +5963,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -6415,25 +5989,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + { $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 "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -6471,7 +6039,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -6566,47 +6134,7 @@ q } s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -6618,15 +6146,12 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -6647,10 +6172,10 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $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 --- gnuradio-3.2.2.dfsg.orig/usrp2/firmware/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp2/firmware/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -51,8 +52,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -84,6 +86,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -96,6 +99,9 @@ DATA = $(noinst_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags DIST_SUBDIRS = config include lib apps @@ -103,9 +109,34 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print @@ -151,6 +182,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ @@ -254,15 +286,15 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -277,9 +309,10 @@ $(SHELL) ./config.status --recheck $(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): config.h: stamp-h1 @if test ! -f $@; then \ @@ -291,7 +324,7 @@ @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -305,7 +338,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -322,7 +355,7 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -330,7 +363,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -356,16 +389,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -380,7 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -392,7 +425,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ @@ -401,36 +434,41 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) + test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -446,38 +484,55 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) + || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) @@ -490,6 +545,10 @@ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -513,15 +572,17 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -529,9 +590,11 @@ mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ @@ -553,13 +616,15 @@ && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @cd $(distuninstallcheck_dir) \ + @$(am__cd) '$(distuninstallcheck_dir)' \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ @@ -602,6 +667,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -621,6 +687,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -629,18 +697,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -663,21 +741,21 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ + ctags-recursive install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am @@ -693,6 +771,7 @@ hexdump -v -e'1/1 "%.2X\n"' $< > $@ .PRECIOUS : %.bin + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- gnuradio-3.2.2.dfsg.orig/usrp2/firmware/config/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp2/firmware/config/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -55,8 +56,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -82,6 +84,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DATA = $(noinst_DATA) @@ -127,6 +130,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ @@ -236,9 +240,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu config/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu config/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -255,6 +259,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): tags: TAGS TAGS: @@ -278,13 +283,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -313,6 +322,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -331,6 +341,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -339,18 +351,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -395,6 +417,7 @@ hexdump -v -e'1/1 "%.2X\n"' $< > $@ .PRECIOUS : %.bin + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- gnuradio-3.2.2.dfsg.orig/usrp2/firmware/include/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp2/firmware/include/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,8 +53,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -79,6 +81,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DATA = $(noinst_DATA) @@ -127,6 +130,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ @@ -234,9 +238,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu include/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -253,6 +257,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -266,7 +271,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -274,29 +279,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -317,13 +327,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -352,6 +366,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -370,6 +385,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -378,18 +395,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -435,6 +462,7 @@ hexdump -v -e'1/1 "%.2X\n"' $< > $@ .PRECIOUS : %.bin + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- gnuradio-3.2.2.dfsg.orig/usrp2/firmware/apps/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp2/firmware/apps/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,8 +54,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -93,6 +95,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) blink_leds_SOURCES = blink_leds.c blink_leds_OBJECTS = blink_leds.$(OBJEXT) @@ -235,6 +238,7 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -305,6 +309,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ @@ -421,9 +426,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu apps/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu apps/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -440,6 +445,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) @@ -592,14 +598,14 @@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` @@ -616,7 +622,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -624,29 +630,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -667,13 +678,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -703,6 +718,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -723,6 +739,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -731,18 +749,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -791,6 +819,7 @@ hexdump -v -e'1/1 "%.2X\n"' $< > $@ .PRECIOUS : %.bin + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- gnuradio-3.2.2.dfsg.orig/usrp2/firmware/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp2/firmware/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,8 +54,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -80,6 +82,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) AR = ar ARFLAGS = cru @@ -102,6 +105,7 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -154,6 +158,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ @@ -332,9 +337,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu lib/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -351,6 +356,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -404,14 +410,14 @@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` @@ -428,7 +434,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -436,29 +442,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -479,13 +490,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -514,6 +529,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -534,6 +550,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -542,18 +560,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -602,6 +630,7 @@ hexdump -v -e'1/1 "%.2X\n"' $< > $@ .PRECIOUS : %.bin + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- gnuradio-3.2.2.dfsg.orig/gr-audio-windows/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-audio-windows/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-audio-windows/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-audio-windows/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -258,8 +259,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -285,8 +284,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -311,11 +308,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -323,8 +317,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -335,8 +327,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -364,12 +354,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -384,16 +375,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -407,8 +392,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -424,8 +407,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1288,6 +1269,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1299,18 +1282,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-video-sdl/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-video-sdl/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-video-sdl/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-video-sdl/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -255,8 +256,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -282,8 +281,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -308,11 +305,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -320,8 +314,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -332,8 +324,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -361,12 +351,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -381,16 +372,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -404,8 +389,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -421,8 +404,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1282,6 +1263,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1293,18 +1276,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/pmt/Makefile.in +++ gnuradio-3.2.2.dfsg/pmt/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -184,8 +185,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -211,8 +210,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -237,11 +234,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -249,8 +243,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -261,8 +253,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -290,12 +280,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -310,16 +301,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -333,8 +318,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -350,8 +333,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -777,7 +758,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -802,7 +783,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -993,6 +974,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1001,18 +984,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/pmt/doc/Makefile.in +++ gnuradio-3.2.2.dfsg/pmt/doc/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -140,8 +141,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -167,8 +166,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -193,11 +190,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -205,8 +199,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -217,8 +209,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -246,12 +236,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -266,16 +257,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -289,8 +274,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -306,8 +289,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -680,6 +661,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -688,18 +671,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/pmt/src/Makefile.in +++ gnuradio-3.2.2.dfsg/pmt/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/pmt/src/scheme/Makefile.in +++ gnuradio-3.2.2.dfsg/pmt/src/scheme/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -151,8 +152,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -178,8 +177,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -204,11 +201,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -216,8 +210,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -228,8 +220,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -257,12 +247,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -277,16 +268,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -300,8 +285,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -317,8 +300,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -624,7 +605,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -649,7 +630,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -833,6 +814,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -841,18 +824,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/pmt/src/scheme/gnuradio/Makefile.in +++ gnuradio-3.2.2.dfsg/pmt/src/scheme/gnuradio/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -721,6 +702,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -729,18 +712,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/pmt/src/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/pmt/src/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -236,8 +237,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -263,8 +262,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -289,11 +286,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -301,8 +295,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -313,8 +305,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -342,12 +332,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -362,16 +353,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -385,8 +370,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -402,8 +385,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1193,6 +1174,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1201,18 +1184,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-libLTLIBRARIES install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-sounder/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-sounder/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-sounder/doc/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-sounder/doc/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -803,6 +784,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -811,18 +794,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-sounder/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-sounder/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-sounder/src/fpga/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-sounder/src/fpga/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-sounder/src/fpga/top/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-sounder/src/fpga/top/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -176,8 +177,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -203,8 +202,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -229,11 +226,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -241,8 +235,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -253,8 +245,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -282,12 +272,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -302,16 +293,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -325,8 +310,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -342,8 +325,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -867,6 +848,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -875,18 +858,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-sounder/src/fpga/tb/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-sounder/src/fpga/tb/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -810,6 +791,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -818,18 +801,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-sounder/src/fpga/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-sounder/src/fpga/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -811,6 +792,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -819,18 +802,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-sounder/src/python/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-sounder/src/python/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -177,8 +178,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -204,8 +203,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -230,11 +227,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -242,8 +236,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -254,8 +246,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -283,12 +273,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -303,16 +294,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -326,8 +311,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -343,8 +326,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -885,6 +866,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -893,18 +876,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-dist_binSCRIPTS install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-sounder/src/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-sounder/src/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -803,6 +784,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -811,18 +794,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -187,8 +188,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -214,8 +213,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -240,11 +237,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -252,8 +246,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -264,8 +256,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -293,12 +283,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -313,16 +304,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -336,8 +321,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -353,8 +336,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -800,7 +781,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -825,7 +806,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1016,6 +997,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1024,18 +1007,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -174,8 +175,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -201,8 +200,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -227,11 +224,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -239,8 +233,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -251,8 +243,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -280,12 +270,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -300,16 +291,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -323,8 +308,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -340,8 +323,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/utils/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/utils/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -826,6 +807,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -834,18 +817,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/python/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/python/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -176,8 +177,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -203,8 +202,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -229,11 +226,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -241,8 +235,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -253,8 +245,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -282,12 +272,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -302,16 +293,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -325,8 +310,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -342,8 +325,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -750,7 +731,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -775,7 +756,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -963,6 +944,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -971,18 +954,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/python/bin/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/python/bin/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -165,8 +166,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -192,8 +191,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -218,11 +215,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -230,8 +224,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -242,8 +234,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -271,12 +261,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -291,16 +282,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -314,8 +299,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -331,8 +314,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -809,6 +790,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -817,18 +800,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/python/gnuradio/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/python/gnuradio/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -184,8 +185,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -211,8 +210,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -237,11 +234,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -249,8 +243,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -261,8 +253,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -290,12 +280,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -310,16 +301,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -333,8 +318,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -350,8 +333,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -794,7 +775,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -819,7 +800,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1010,6 +991,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1018,18 +1001,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -172,8 +173,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -199,8 +198,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -225,11 +222,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -237,8 +231,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -249,8 +241,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -278,12 +268,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -298,16 +289,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -321,8 +306,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -338,8 +321,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -860,6 +841,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -868,18 +851,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/python/gnuradio/vocoder/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/python/gnuradio/vocoder/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -172,8 +173,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -199,8 +198,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -225,11 +222,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -237,8 +231,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -249,8 +241,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -278,12 +268,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -298,16 +289,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -321,8 +306,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -338,8 +321,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -847,6 +828,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -855,18 +838,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -172,8 +173,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -199,8 +198,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -225,11 +222,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -237,8 +231,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -249,8 +241,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -278,12 +268,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -298,16 +289,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -321,8 +306,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -338,8 +321,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -883,6 +864,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -891,18 +874,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/python/gnuradio/gr/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/python/gnuradio/gr/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -173,8 +174,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -200,8 +199,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -226,11 +223,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -238,8 +232,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -250,8 +242,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -279,12 +269,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -299,16 +290,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -322,8 +307,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -339,8 +322,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1008,6 +989,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1016,18 +999,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/python/gnuradio/gru/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/python/gnuradio/gru/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -172,8 +173,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -199,8 +198,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -225,11 +222,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -237,8 +231,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -249,8 +241,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -278,12 +268,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -298,16 +289,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -321,8 +306,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -338,8 +321,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -850,6 +831,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -858,18 +841,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/python/gnuradio/blks2/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/python/gnuradio/blks2/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -172,8 +173,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -199,8 +198,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -225,11 +222,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -237,8 +231,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -249,8 +241,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -278,12 +268,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -298,16 +289,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -321,8 +306,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -338,8 +321,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -850,6 +831,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -858,18 +841,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/gen_interpolator_taps/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/gen_interpolator_taps/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -168,9 +169,7 @@ @ENABLE_FORTRAN_TRUE@ objective_fct.$(OBJEXT) simpson.$(OBJEXT) \ @ENABLE_FORTRAN_TRUE@ praxis.$(OBJEXT) gen_interpolator_taps_OBJECTS = $(am_gen_interpolator_taps_OBJECTS) -am__DEPENDENCIES_1 = -@ENABLE_FORTRAN_TRUE@gen_interpolator_taps_DEPENDENCIES = \ -@ENABLE_FORTRAN_TRUE@ $(am__DEPENDENCIES_1) +gen_interpolator_taps_DEPENDENCIES = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -200,8 +199,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -227,8 +224,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -253,11 +248,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -265,8 +257,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -277,8 +267,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -306,12 +294,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -326,16 +315,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -349,8 +332,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -366,8 +347,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -939,6 +918,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -947,18 +928,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/tests/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/tests/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -249,8 +250,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -276,8 +275,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -302,11 +299,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -314,8 +308,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -326,8 +318,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -355,12 +345,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -375,16 +366,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -398,8 +383,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -415,8 +398,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1154,6 +1135,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1162,18 +1145,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -220,8 +221,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -247,8 +246,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -273,11 +270,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -285,8 +279,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -297,8 +289,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -326,12 +316,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -346,16 +337,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -369,8 +354,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -386,8 +369,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -886,7 +867,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -911,7 +892,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1105,6 +1086,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1113,18 +1096,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-libLTLIBRARIES install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/lib/g72x/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/lib/g72x/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -182,8 +183,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -209,8 +208,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -235,11 +232,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -247,8 +241,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -259,8 +251,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -288,12 +278,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -308,16 +299,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -331,8 +316,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -348,8 +331,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -914,6 +895,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -922,18 +905,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/lib/filter/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/lib/filter/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -399,8 +400,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -426,8 +425,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -452,11 +449,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -464,8 +458,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -476,8 +468,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -505,12 +495,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -525,16 +516,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -548,8 +533,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -565,8 +548,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1728,6 +1709,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1736,18 +1719,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/lib/hier/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/lib/hier/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -195,8 +196,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -222,8 +221,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -248,11 +245,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -260,8 +254,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -272,8 +264,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -301,12 +291,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -321,16 +312,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -344,8 +329,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -361,8 +344,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -969,6 +950,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -977,18 +960,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/lib/viterbi/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/lib/viterbi/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -201,8 +202,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -228,8 +227,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -254,11 +251,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -266,8 +260,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -278,8 +270,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -307,12 +297,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -327,16 +318,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -350,8 +335,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -367,8 +350,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -977,6 +958,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -985,18 +968,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/lib/swig/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/lib/swig/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -372,8 +373,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -399,8 +398,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -425,11 +422,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -437,8 +431,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -449,8 +441,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -478,12 +468,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -498,16 +489,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -521,8 +506,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -538,8 +521,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1943,6 +1924,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1970,18 +1953,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/lib/reed-solomon/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/lib/reed-solomon/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -200,8 +201,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -227,8 +226,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -253,11 +250,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -265,8 +259,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -277,8 +269,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -306,12 +296,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -326,16 +317,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -349,8 +334,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -366,8 +349,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1071,6 +1052,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1079,18 +1062,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/lib/general/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/lib/general/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -265,8 +266,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -292,8 +291,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -318,11 +315,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -330,8 +324,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -342,8 +334,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -371,12 +361,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -391,16 +382,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -414,8 +399,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -431,8 +414,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1658,6 +1639,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1666,18 +1649,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/lib/io/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/lib/io/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -205,8 +206,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -232,8 +231,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -258,11 +255,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -270,8 +264,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -282,8 +274,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -311,12 +301,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -331,16 +322,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -354,8 +339,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -371,8 +354,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1085,6 +1066,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1093,18 +1076,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/lib/missing/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/lib/missing/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -182,8 +183,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -209,8 +208,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -235,11 +232,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -247,8 +241,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -259,8 +251,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -288,12 +278,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -308,16 +299,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -331,8 +316,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -348,8 +331,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -922,6 +903,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -930,18 +913,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/lib/gengen/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/lib/gengen/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -278,8 +279,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -305,8 +304,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -331,11 +328,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -343,8 +337,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -355,8 +347,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -384,12 +374,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -404,16 +395,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -427,8 +412,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -444,8 +427,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1599,6 +1580,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1607,18 +1590,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-core/src/lib/runtime/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-core/src/lib/runtime/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -217,8 +218,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -244,8 +243,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -270,11 +267,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -282,8 +276,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -294,8 +286,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -323,12 +313,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -343,16 +334,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -366,8 +351,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -383,8 +366,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1158,6 +1139,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1166,18 +1149,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gcell/Makefile.in +++ gnuradio-3.2.2.dfsg/gcell/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -185,8 +186,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -212,8 +211,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -238,11 +235,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -250,8 +244,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -262,8 +254,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -291,12 +281,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -311,16 +302,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -334,8 +319,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -351,8 +334,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -781,7 +762,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -806,7 +787,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -997,6 +978,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1005,18 +988,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gcell/include/Makefile.in +++ gnuradio-3.2.2.dfsg/gcell/include/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -174,8 +175,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -201,8 +200,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -227,11 +224,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -239,8 +233,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -251,8 +243,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -280,12 +270,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -300,16 +291,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -323,8 +308,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -340,8 +323,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -744,7 +725,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -769,7 +750,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -957,6 +938,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -965,18 +948,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gcell/include/gcell/Makefile.in +++ gnuradio-3.2.2.dfsg/gcell/include/gcell/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -184,8 +185,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -211,8 +210,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -237,11 +234,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -249,8 +243,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -261,8 +253,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -290,12 +280,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -310,16 +301,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -333,8 +318,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -350,8 +333,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -790,7 +771,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -815,7 +796,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1006,6 +987,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1014,18 +997,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gcell/include/gcell/spu/Makefile.in +++ gnuradio-3.2.2.dfsg/gcell/include/gcell/spu/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -174,8 +175,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -201,8 +200,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -227,11 +224,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -239,8 +233,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -251,8 +243,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -280,12 +270,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -300,16 +291,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -323,8 +308,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -340,8 +323,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -884,6 +865,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -892,18 +875,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gcell/apps/Makefile.in +++ gnuradio-3.2.2.dfsg/gcell/apps/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -209,8 +210,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -236,8 +235,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -262,11 +259,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -274,8 +268,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -286,8 +278,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -315,12 +305,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -335,16 +326,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -358,8 +343,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -375,8 +358,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -864,7 +845,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -889,7 +870,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1169,6 +1150,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1177,18 +1160,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-binPROGRAMS install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gcell/apps/spu/Makefile.in +++ gnuradio-3.2.2.dfsg/gcell/apps/spu/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -204,8 +205,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -238,8 +237,6 @@ CPPFLAGS = CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -264,11 +261,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -276,8 +270,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -288,8 +280,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = spu-ld LDFLAGS = @@ -317,12 +307,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -337,16 +328,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -360,8 +345,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -377,8 +360,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -942,6 +923,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -950,18 +933,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gcell/ibm/Makefile.in +++ gnuradio-3.2.2.dfsg/gcell/ibm/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -162,8 +163,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -189,8 +188,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -215,11 +212,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -227,8 +221,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -239,8 +231,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -268,12 +258,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -288,16 +279,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -311,8 +296,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -328,8 +311,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -879,6 +860,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -887,18 +870,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gcell/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gcell/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -209,8 +210,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -236,8 +235,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -262,11 +259,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -274,8 +268,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -286,8 +278,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -315,12 +305,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -335,16 +326,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -358,8 +343,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -375,8 +358,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -834,7 +815,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -859,7 +840,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1052,6 +1033,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1060,18 +1043,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-libLTLIBRARIES install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gcell/lib/spu/Makefile.in +++ gnuradio-3.2.2.dfsg/gcell/lib/spu/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -255,8 +256,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -289,8 +288,6 @@ CPPFLAGS = CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -315,11 +312,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -327,8 +321,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -339,8 +331,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = spu-ld LDFLAGS = @@ -368,12 +358,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -388,16 +379,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -411,8 +396,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -428,8 +411,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1349,6 +1330,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1358,18 +1341,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gcell/lib/general/Makefile.in +++ gnuradio-3.2.2.dfsg/gcell/lib/general/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -162,8 +163,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -189,8 +188,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -215,11 +212,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -227,8 +221,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -239,8 +231,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -268,12 +258,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -288,16 +279,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -311,8 +296,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -328,8 +311,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -802,6 +783,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -810,18 +793,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gcell/lib/wrapper/Makefile.in +++ gnuradio-3.2.2.dfsg/gcell/lib/wrapper/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -186,8 +187,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -213,8 +212,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -239,11 +236,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -251,8 +245,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -263,8 +255,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -292,12 +282,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -312,16 +303,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -335,8 +320,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -352,8 +335,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -952,6 +933,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -960,18 +943,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gcell/lib/runtime/Makefile.in +++ gnuradio-3.2.2.dfsg/gcell/lib/runtime/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -203,8 +204,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -230,8 +229,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -256,11 +253,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -268,8 +262,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -280,8 +272,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -309,12 +299,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -329,16 +320,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -352,8 +337,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -369,8 +352,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1017,6 +998,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1025,18 +1008,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-dist_binSCRIPTS install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-qtgui/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-qtgui/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -174,8 +175,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -201,8 +200,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -227,11 +224,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -239,8 +233,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -251,8 +243,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -280,12 +270,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -300,16 +291,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -323,8 +308,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -340,8 +323,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-qtgui/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-qtgui/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-qtgui/src/python/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-qtgui/src/python/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -173,8 +174,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -200,8 +199,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -226,11 +223,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -238,8 +232,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -250,8 +242,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -279,12 +269,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -299,16 +290,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -322,8 +307,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -339,8 +322,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -859,6 +840,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -867,18 +850,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-qtgui/src/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-qtgui/src/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -288,8 +289,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -315,8 +314,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -341,11 +338,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -353,8 +347,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -365,8 +357,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -394,12 +384,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -414,16 +405,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -437,8 +422,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -454,8 +437,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1301,6 +1282,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1311,18 +1294,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-libLTLIBRARIES install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/grc/Makefile.in +++ gnuradio-3.2.2.dfsg/grc/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -211,8 +212,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -238,8 +237,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -264,11 +261,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -276,8 +270,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -288,8 +280,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -317,12 +307,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -337,16 +328,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -360,8 +345,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -377,8 +360,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -842,7 +823,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -867,7 +848,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1061,6 +1042,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1069,18 +1052,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/grc/examples/Makefile.in +++ gnuradio-3.2.2.dfsg/grc/examples/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -183,8 +184,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -210,8 +209,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -236,11 +233,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -248,8 +242,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -260,8 +252,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -289,12 +279,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -309,16 +300,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -332,8 +317,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -349,8 +332,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -943,6 +924,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -953,18 +936,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/grc/blocks/Makefile.in +++ gnuradio-3.2.2.dfsg/grc/blocks/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -195,8 +196,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -222,8 +221,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -248,11 +245,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -260,8 +254,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -272,8 +264,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -301,12 +291,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -321,16 +312,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -344,8 +329,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -361,8 +344,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1060,6 +1041,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1068,18 +1051,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/grc/base/Makefile.in +++ gnuradio-3.2.2.dfsg/grc/base/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -198,8 +199,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -225,8 +224,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -251,11 +248,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -263,8 +257,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -275,8 +267,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -304,12 +294,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -324,16 +315,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -347,8 +332,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -364,8 +347,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -907,6 +888,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -915,18 +898,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/grc/grc_gnuradio/Makefile.in +++ gnuradio-3.2.2.dfsg/grc/grc_gnuradio/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -179,8 +180,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -206,8 +205,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -232,11 +229,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -244,8 +238,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -256,8 +248,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -285,12 +275,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -305,16 +296,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -328,8 +313,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -345,8 +328,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -960,6 +941,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -969,18 +952,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/grc/freedesktop/Makefile.in +++ gnuradio-3.2.2.dfsg/grc/freedesktop/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -198,8 +199,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -225,8 +224,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -251,11 +248,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -263,8 +257,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -275,8 +267,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -304,12 +294,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -324,16 +315,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -347,8 +332,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -364,8 +347,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -898,6 +879,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -908,18 +891,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-dist_binSCRIPTS install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/grc/gui/Makefile.in +++ gnuradio-3.2.2.dfsg/grc/gui/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -194,8 +195,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -221,8 +220,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -247,11 +244,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -259,8 +253,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -271,8 +263,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -300,12 +290,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -320,16 +311,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -343,8 +328,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -360,8 +343,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -894,6 +875,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -902,18 +885,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/grc/scripts/Makefile.in +++ gnuradio-3.2.2.dfsg/grc/scripts/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -189,8 +190,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -216,8 +215,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -242,11 +239,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -254,8 +248,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -266,8 +258,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -295,12 +285,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -315,16 +306,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -338,8 +323,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -355,8 +338,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -854,6 +835,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -862,18 +845,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-dist_binSCRIPTS install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/grc/python/Makefile.in +++ gnuradio-3.2.2.dfsg/grc/python/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -198,8 +199,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -225,8 +224,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -251,11 +248,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -263,8 +257,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -275,8 +267,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -304,12 +294,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -324,16 +315,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -347,8 +332,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -364,8 +347,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -910,6 +891,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -918,18 +901,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-usrp/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-usrp/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -185,8 +186,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -212,8 +211,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -238,11 +235,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -250,8 +244,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -262,8 +254,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -291,12 +281,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -311,16 +302,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -334,8 +319,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -351,8 +334,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -780,7 +761,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -805,7 +786,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -996,6 +977,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1004,18 +987,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-usrp/apps/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-usrp/apps/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -193,8 +194,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -220,8 +219,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -246,11 +243,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -258,8 +252,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -270,8 +262,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -299,12 +289,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -319,16 +310,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -342,8 +327,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -359,8 +342,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -948,6 +929,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -956,18 +939,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-usrp/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-usrp/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -263,8 +264,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -290,8 +289,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -316,11 +313,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -328,8 +322,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -340,8 +332,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -369,12 +359,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -389,16 +380,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -412,8 +397,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -429,8 +412,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1354,6 +1335,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1365,18 +1348,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-libLTLIBRARIES install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-utils/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-utils/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-utils/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-utils/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-utils/src/python/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-utils/src/python/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -900,6 +881,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -908,18 +891,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-binSCRIPTS install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-utils/src/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-utils/src/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -119,8 +120,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -146,8 +145,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -172,11 +169,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -184,8 +178,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -196,8 +188,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -225,12 +215,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -245,16 +236,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -268,8 +253,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -285,8 +268,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -658,6 +639,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -666,18 +649,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-gsm-fr-vocoder/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gsm-fr-vocoder/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -174,8 +175,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -201,8 +200,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -227,11 +224,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -239,8 +233,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -251,8 +243,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -280,12 +270,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -300,16 +291,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -323,8 +308,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -340,8 +323,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-gsm-fr-vocoder/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gsm-fr-vocoder/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-gsm-fr-vocoder/src/python/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gsm-fr-vocoder/src/python/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -165,8 +166,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -192,8 +191,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -218,11 +215,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -230,8 +224,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -242,8 +234,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -271,12 +261,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -291,16 +282,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -314,8 +299,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -331,8 +314,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -902,6 +883,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -910,18 +893,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-gsm-fr-vocoder/src/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gsm-fr-vocoder/src/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -267,8 +268,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -294,8 +293,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -320,11 +317,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -332,8 +326,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -344,8 +336,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -373,12 +363,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -393,16 +384,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -416,8 +401,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -433,8 +416,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1077,7 +1058,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1102,7 +1083,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1299,6 +1280,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1310,18 +1293,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -187,8 +188,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -214,8 +213,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -240,11 +237,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -252,8 +246,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -264,8 +256,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -293,12 +283,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -313,16 +304,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -336,8 +321,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -353,8 +336,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -978,6 +959,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -986,18 +969,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-gsm-fr-vocoder/src/lib/gsm/COPYRIGHT +++ gnuradio-3.2.2.dfsg/gr-gsm-fr-vocoder/src/lib/gsm/COPYRIGHT @@ -0,0 +1,35 @@ +Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann, +Technische Universitaet Berlin + +Any use of this software is permitted provided that this notice is not +removed and that neither the authors nor the Technische Universitaet Berlin +are deemed to have made any representations as to the suitability of this +software for any purpose nor are held responsible for any defects of +this software. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. + +As a matter of courtesy, the authors request to be informed about uses +this software has found, about bugs in this software, and about any +improvements that may be of general interest. + +Berlin, 28.11.1994 +Jutta Degener +Carsten Bormann + + oOo + +Since the original terms of 15 years ago maybe do not make our +intentions completely clear given today's refined usage of the legal +terms, we append this additional permission: + + Permission to use, copy, modify, and distribute this software + for any purpose with or without fee is hereby granted, + provided that this notice is not removed and that neither + the authors nor the Technische Universitaet Berlin are + deemed to have made any representations as to the suitability + of this software for any purpose nor are held responsible + for any defects of this software. THERE IS ABSOLUTELY NO + WARRANTY FOR THIS SOFTWARE. + +Berkeley/Bremen, 05.04.2009 +Jutta Degener +Carsten Bormann --- gnuradio-3.2.2.dfsg.orig/gr-radio-astronomy/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radio-astronomy/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-radio-astronomy/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radio-astronomy/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-radio-astronomy/src/python/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radio-astronomy/src/python/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -179,8 +180,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -206,8 +205,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -232,11 +229,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -244,8 +238,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -256,8 +248,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -285,12 +275,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -305,16 +296,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -328,8 +313,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -345,8 +328,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1019,6 +1000,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1027,18 +1010,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-dist_binSCRIPTS install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-radio-astronomy/src/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radio-astronomy/src/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -248,8 +249,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -275,8 +274,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -301,11 +298,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -313,8 +307,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -325,8 +317,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -354,12 +344,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -374,16 +365,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -397,8 +382,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -414,8 +397,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1125,6 +1106,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1134,18 +1117,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-radar-mono/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radar-mono/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -746,7 +727,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -771,7 +752,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -959,6 +940,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -967,18 +950,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-radar-mono/doc/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radar-mono/doc/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -804,6 +785,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -812,18 +795,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-radar-mono/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radar-mono/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-radar-mono/src/fpga/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radar-mono/src/fpga/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-radar-mono/src/fpga/models/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radar-mono/src/fpga/models/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -806,6 +787,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -814,18 +797,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-radar-mono/src/fpga/top/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radar-mono/src/fpga/top/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -176,8 +177,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -203,8 +202,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -229,11 +226,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -241,8 +235,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -253,8 +245,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -282,12 +272,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -302,16 +293,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -325,8 +310,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -342,8 +325,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -867,6 +848,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -875,18 +858,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-radar-mono/src/fpga/tb/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radar-mono/src/fpga/tb/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -810,6 +791,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -818,18 +801,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-radar-mono/src/fpga/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radar-mono/src/fpga/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -814,6 +795,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -822,18 +805,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-radar-mono/src/python/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radar-mono/src/python/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -177,8 +178,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -204,8 +203,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -230,11 +227,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -242,8 +236,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -254,8 +246,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -283,12 +273,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -303,16 +294,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -326,8 +311,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -343,8 +326,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -876,6 +857,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -884,18 +867,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-dist_binSCRIPTS install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-radar-mono/src/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-radar-mono/src/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -803,6 +784,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -811,18 +794,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gruel/Makefile.in +++ gnuradio-3.2.2.dfsg/gruel/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -185,8 +186,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -212,8 +211,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -238,11 +235,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -250,8 +244,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -262,8 +254,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -291,12 +281,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -311,16 +302,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -334,8 +319,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -351,8 +334,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -779,7 +760,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -804,7 +785,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -995,6 +976,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1003,18 +986,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gruel/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gruel/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gruel/src/include/Makefile.in +++ gnuradio-3.2.2.dfsg/gruel/src/include/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gruel/src/include/gruel/Makefile.in +++ gnuradio-3.2.2.dfsg/gruel/src/include/gruel/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -176,8 +177,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -203,8 +202,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -229,11 +226,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -241,8 +235,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -253,8 +245,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -282,12 +272,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -302,16 +293,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -325,8 +310,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -342,8 +325,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -894,6 +875,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -902,18 +885,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gruel/src/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gruel/src/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -197,8 +198,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -224,8 +223,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -250,11 +247,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -262,8 +256,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -274,8 +266,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -303,12 +293,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -323,16 +314,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -346,8 +331,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -363,8 +346,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -963,6 +944,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -971,18 +954,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-libLTLIBRARIES install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-gcell/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gcell/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -174,8 +175,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -201,8 +200,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -227,11 +224,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -239,8 +233,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -251,8 +243,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -280,12 +270,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -300,16 +291,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -323,8 +308,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -340,8 +323,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -744,7 +725,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -769,7 +750,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -957,6 +938,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -965,18 +948,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-gcell/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gcell/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -269,8 +270,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -296,8 +295,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -322,11 +319,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -334,8 +328,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -346,8 +338,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -375,12 +365,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -395,16 +386,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -418,8 +403,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -435,8 +418,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1128,7 +1109,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1153,7 +1134,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1438,6 +1419,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1448,18 +1431,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-libLTLIBRARIES install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-gcell/src/examples/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gcell/src/examples/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -803,6 +784,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -811,18 +794,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -666,7 +647,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -691,7 +672,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -878,6 +859,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -886,18 +869,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/usrp/host/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/host/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/usrp/host/misc/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/host/misc/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -192,8 +193,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -219,8 +218,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -245,11 +242,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -257,8 +251,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -269,8 +261,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -298,12 +288,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -318,16 +309,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -341,8 +326,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -358,8 +341,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -952,6 +933,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -960,18 +943,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp/host/swig/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/host/swig/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -252,8 +253,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -279,8 +278,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -305,11 +302,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -317,8 +311,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -329,8 +321,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -358,12 +348,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -378,16 +369,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -401,8 +386,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -418,8 +401,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1153,6 +1134,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1163,18 +1146,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp/host/apps/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/host/apps/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -221,8 +222,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -248,8 +247,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -274,11 +271,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -286,8 +280,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -298,8 +290,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -327,12 +317,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -347,16 +338,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -370,8 +355,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -387,8 +370,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1033,6 +1014,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1041,18 +1024,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-binPROGRAMS install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp/host/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/host/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -174,8 +175,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -201,8 +200,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -227,11 +224,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -239,8 +233,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -251,8 +243,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -280,12 +270,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -300,16 +291,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -323,8 +308,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -340,8 +323,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -744,7 +725,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -769,7 +750,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -957,6 +938,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -965,18 +948,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/usrp/host/lib/legacy/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/host/lib/legacy/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -270,8 +271,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -297,8 +296,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -323,11 +320,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -335,8 +329,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -347,8 +339,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -376,12 +366,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -396,16 +387,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -419,8 +404,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -436,8 +419,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1279,6 +1260,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1288,18 +1271,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-libLTLIBRARIES install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp/firmware/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/firmware/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/usrp/firmware/include/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/firmware/include/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -153,8 +154,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -180,8 +179,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -206,11 +203,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -218,8 +212,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -230,8 +222,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -259,12 +249,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -279,16 +270,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -302,8 +287,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -319,8 +302,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -784,6 +765,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -792,18 +775,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp/firmware/src/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/firmware/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/usrp/firmware/src/usrp2/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/firmware/src/usrp2/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -154,8 +155,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -181,8 +180,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -207,11 +204,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -219,8 +213,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -231,8 +223,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -260,12 +250,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -280,16 +271,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -303,8 +288,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -320,8 +303,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -816,6 +797,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -824,18 +807,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp/firmware/src/common/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/firmware/src/common/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -140,8 +141,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -167,8 +166,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -193,11 +190,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -205,8 +199,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -217,8 +209,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -246,12 +236,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -266,16 +257,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -289,8 +274,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -306,8 +289,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -706,6 +687,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -714,18 +697,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp/firmware/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/firmware/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -140,8 +141,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -167,8 +166,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -193,11 +190,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -205,8 +199,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -217,8 +209,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -253,12 +243,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -273,16 +264,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -296,8 +281,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -313,8 +296,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -714,6 +695,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -722,18 +705,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp/fpga/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/fpga/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -153,8 +154,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -180,8 +179,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -206,11 +203,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -218,8 +212,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -230,8 +222,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -259,12 +249,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -279,16 +270,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -302,8 +287,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -319,8 +302,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -808,7 +789,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -833,7 +814,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1017,6 +998,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1025,18 +1008,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/usrp/fpga/rbf/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/fpga/rbf/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/usrp/fpga/rbf/rev4/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/fpga/rbf/rev4/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -173,8 +174,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -200,8 +199,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -226,11 +223,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -238,8 +232,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -250,8 +242,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -279,12 +269,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -299,16 +290,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -322,8 +307,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -339,8 +322,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -841,6 +822,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -849,18 +832,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp/fpga/rbf/rev2/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/fpga/rbf/rev2/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -173,8 +174,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -200,8 +199,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -226,11 +223,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -238,8 +232,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -250,8 +242,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -279,12 +269,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -299,16 +290,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -322,8 +307,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -339,8 +322,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -841,6 +822,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -849,18 +832,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/usrp/doc/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/doc/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -186,8 +187,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -213,8 +212,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -239,11 +236,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -251,8 +245,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -263,8 +255,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -292,12 +282,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -312,16 +303,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -335,8 +320,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -352,8 +335,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -789,7 +770,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -814,7 +795,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1005,6 +986,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1013,18 +996,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/usrp/doc/other/Makefile.in +++ gnuradio-3.2.2.dfsg/usrp/doc/other/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -806,6 +787,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -814,18 +797,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-cvsd-vocoder/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-cvsd-vocoder/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -174,8 +175,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -201,8 +200,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -227,11 +224,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -239,8 +233,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -251,8 +243,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -280,12 +270,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -300,16 +291,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -323,8 +308,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -340,8 +323,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-cvsd-vocoder/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-cvsd-vocoder/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-cvsd-vocoder/src/python/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-cvsd-vocoder/src/python/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -173,8 +174,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -200,8 +199,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -226,11 +223,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -238,8 +232,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -250,8 +242,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -279,12 +269,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -299,16 +290,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -322,8 +307,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -339,8 +322,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -945,6 +926,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -953,18 +936,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-cvsd-vocoder/src/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-cvsd-vocoder/src/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -258,8 +259,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -285,8 +284,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -311,11 +308,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -323,8 +317,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -335,8 +327,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -364,12 +354,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -384,16 +375,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -407,8 +392,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -424,8 +407,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1188,6 +1169,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1199,18 +1182,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-audio-oss/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-audio-oss/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -185,8 +186,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -212,8 +211,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -238,11 +235,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -250,8 +244,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -262,8 +254,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -291,12 +281,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -311,16 +302,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -334,8 +319,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -351,8 +334,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -774,7 +755,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -799,7 +780,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -990,6 +971,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -998,18 +981,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-audio-oss/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-audio-oss/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -256,8 +257,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -283,8 +282,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -309,11 +306,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -321,8 +315,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -333,8 +325,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -362,12 +352,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -382,16 +373,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -405,8 +390,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -422,8 +405,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1281,6 +1262,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1291,18 +1274,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-gpio/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gpio/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-gpio/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gpio/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-gpio/src/fpga/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gpio/src/fpga/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-gpio/src/fpga/include/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gpio/src/fpga/include/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -140,8 +141,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -167,8 +166,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -193,11 +190,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -205,8 +199,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -217,8 +209,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -246,12 +236,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -266,16 +257,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -289,8 +274,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -306,8 +289,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -684,6 +665,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -692,18 +675,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-gpio/src/fpga/rbf/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gpio/src/fpga/rbf/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -176,8 +177,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -203,8 +202,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -229,11 +226,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -241,8 +235,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -253,8 +245,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -282,12 +272,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -302,16 +293,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -325,8 +310,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -342,8 +325,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -861,6 +842,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -869,18 +852,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-gpio/src/fpga/top/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gpio/src/fpga/top/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -813,6 +794,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -821,18 +804,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-gpio/src/fpga/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gpio/src/fpga/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -634,7 +615,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -659,7 +640,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -843,6 +824,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -851,18 +834,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-gpio/src/python/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-gpio/src/python/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -176,8 +177,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -203,8 +202,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -229,11 +226,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -241,8 +235,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -253,8 +245,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -282,12 +272,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -302,16 +293,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -325,8 +310,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -342,8 +325,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -883,6 +864,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -891,18 +874,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-dist_binSCRIPTS install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-pager/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-pager/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-pager/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-pager/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -268,8 +269,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -295,8 +294,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -321,11 +318,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -333,8 +327,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -345,8 +337,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -374,12 +364,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -394,16 +385,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -417,8 +402,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -434,8 +417,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1390,6 +1371,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1401,18 +1384,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-dist_binSCRIPTS install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-audio-osx/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-audio-osx/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -746,7 +727,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -771,7 +752,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -959,6 +940,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -967,18 +950,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-audio-osx/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-audio-osx/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -258,8 +259,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -285,8 +284,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -311,11 +308,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -323,8 +317,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -335,8 +327,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -364,12 +354,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -384,16 +375,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -407,8 +392,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -424,8 +407,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1297,6 +1278,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1307,18 +1290,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/debian/gnuradio-pager.install +++ gnuradio-3.2.2.dfsg/debian/gnuradio-pager.install @@ -0,0 +1,9 @@ +usr/bin/usrp_flex.py +usr/bin/usrp_flex_all.py +usr/bin/usrp_flex_band.py +usr/lib/python2.7/dist-packages/gnuradio/pager/pager_swig.py +usr/lib/python2.7/dist-packages/gnuradio/pager/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/pager/pager_utils.py +usr/lib/python2.7/dist-packages/gnuradio/pager/flex_demod.py +usr/lib/python2.7/dist-packages/gnuradio/pager/_pager_swig.la +usr/lib/python2.7/dist-packages/gnuradio/pager/_pager_swig.so --- gnuradio-3.2.2.dfsg.orig/debian/libgruel-dev.install +++ gnuradio-3.2.2.dfsg/debian/libgruel-dev.install @@ -0,0 +1,3 @@ +usr/include/gruel/* +usr/lib/libgruel.so +usr/lib/pkgconfig/gruel.pc --- gnuradio-3.2.2.dfsg.orig/debian/gnuradio-radio-astronomy.install +++ gnuradio-3.2.2.dfsg/debian/gnuradio-radio-astronomy.install @@ -0,0 +1,9 @@ +usr/lib/python2.7/dist-packages/gnuradio/local_calibrator.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/ra_stripchartsink.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/ra_fftsink.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/ra_waterfallsink.py +usr/bin/usrp_ra_receiver.py +usr/bin/usrp_psr_receiver.py +usr/lib/python2.7/dist-packages/gnuradio/ra.py +usr/lib/python2.7/dist-packages/gnuradio/_ra.la +usr/lib/python2.7/dist-packages/gnuradio/_ra.so --- gnuradio-3.2.2.dfsg.orig/debian/libgromnithread0.install +++ gnuradio-3.2.2.dfsg/debian/libgromnithread0.install @@ -0,0 +1,2 @@ +usr/lib/libgromnithread.la +usr/lib/libgromnithread.so.* --- gnuradio-3.2.2.dfsg.orig/debian/prefs.py +++ gnuradio-3.2.2.dfsg/debian/prefs.py @@ -0,0 +1,126 @@ +# +# Copyright 2006,2009 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio 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 3, or (at your option) +# any later version. +# +# GNU Radio 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 GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +import gnuradio_swig_python as gsp +_prefs_base = gsp.gr_prefs + + +import ConfigParser +import os +import os.path +import sys + + +def _user_prefs_filename(): + return os.path.expanduser('~/.gnuradio/config.conf') + +def _sys_prefs_dirname(): + return '/etc/gnuradio/conf.d' + +def _bool(x): + """ + Try to coerce obj to a True or False + """ + if isinstance(x, bool): + return x + if isinstance(x, (float, int)): + return bool(x) + raise TypeError, x + + +class _prefs(_prefs_base): + """ + Derive our 'real class' from the stubbed out base class that has support + for SWIG directors. This allows C++ code to magically and transparently + invoke the methods in this python class. + """ + def __init__(self): + _prefs_base.__init__(self) + self.cp = ConfigParser.RawConfigParser() + self.__getattr__ = lambda self, name: getattr(self.cp, name) + + def _sys_prefs_filenames(self): + dir = _sys_prefs_dirname() + try: + fnames = os.listdir(dir) + except (IOError, OSError): + return [] + fnames.sort() + return [os.path.join(dir, f) for f in fnames] + + def _read_files(self): + filenames = self._sys_prefs_filenames() + filenames.append(_user_prefs_filename()) + #print "filenames: ", filenames + self.cp.read(filenames) + + # ---------------------------------------------------------------- + # These methods override the C++ virtual methods of the same name + # ---------------------------------------------------------------- + def has_section(self, section): + return self.cp.has_section(section) + + def has_option(self, section, option): + return self.cp.has_option(section, option) + + def get_string(self, section, option, default_val): + try: + return self.cp.get(section, option) + except: + return default_val + + def get_bool(self, section, option, default_val): + try: + return self.cp.getboolean(section, option) + except: + return default_val + + def get_long(self, section, option, default_val): + try: + return self.cp.getint(section, option) + except: + return default_val + + def get_double(self, section, option, default_val): + try: + return self.cp.getfloat(section, option) + except: + return default_val + # ---------------------------------------------------------------- + # End override of C++ virtual methods + # ---------------------------------------------------------------- + + +_prefs_db = _prefs() + +# if GR_DONT_LOAD_PREFS is set, don't load them. +# (make check uses this to avoid interactions.) +if os.getenv("GR_DONT_LOAD_PREFS", None) is None: + _prefs_db._read_files() + + +_prefs_base.set_singleton(_prefs_db) # tell C++ what instance to use + +def prefs(): + """ + Return the global preference data base + """ + return _prefs_db --- gnuradio-3.2.2.dfsg.orig/debian/python-gnuradio-core.install +++ gnuradio-3.2.2.dfsg/debian/python-gnuradio-core.install @@ -0,0 +1,90 @@ +usr/lib/python2.7/dist-packages/gnuradio/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/audio.py +usr/lib/python2.7/dist-packages/gnuradio/eng_notation.py +usr/lib/python2.7/dist-packages/gnuradio/eng_option.py +usr/lib/python2.7/dist-packages/gnuradio/modulation_utils.py +usr/lib/python2.7/dist-packages/gnuradio/ofdm_packet_utils.py +usr/lib/python2.7/dist-packages/gnuradio/packet_utils.py +usr/lib/python2.7/dist-packages/gnuradio/gr_unittest.py +usr/lib/python2.7/dist-packages/gnuradio/optfir.py +usr/lib/python2.7/dist-packages/gnuradio/window.py +usr/lib/python2.7/dist-packages/gnuradio/gr/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/gr/exceptions.py +usr/lib/python2.7/dist-packages/gnuradio/gr/gr_threading.py +usr/lib/python2.7/dist-packages/gnuradio/gr/gr_threading_23.py +usr/lib/python2.7/dist-packages/gnuradio/gr/gr_threading_24.py +usr/lib/python2.7/dist-packages/gnuradio/gr/hier_block2.py +usr/lib/python2.7/dist-packages/gnuradio/gr/prefs.py +usr/lib/python2.7/dist-packages/gnuradio/gr/scheduler.py +usr/lib/python2.7/dist-packages/gnuradio/gr/top_block.py +usr/lib/python2.7/dist-packages/gnuradio/gr/pubsub.py +usr/lib/python2.7/dist-packages/gnuradio/blks2/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/am_demod.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/channel_model.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/dbpsk.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/dqpsk.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/d8psk.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/filterbank.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/fm_demod.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/fm_emph.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/gmsk.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/cpm.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/logpwrfft.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/nbfm_rx.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/nbfm_tx.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/ofdm.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/ofdm_receiver.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/ofdm_sync_fixed.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/ofdm_sync_pn.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/ofdm_sync_pnac.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/ofdm_sync_ml.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/pkt.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/psk.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/qam.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/qam8.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/qam16.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/qam64.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/qam256.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/rational_resampler.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/standard_squelch.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/stream_to_vector_decimator.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/wfm_rcv.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/wfm_rcv_fmdet.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/wfm_rcv_pll.py +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/wfm_tx.py +usr/lib/python2.7/dist-packages/gnuradio/gru/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/crc.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/freqz.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/gnuplot_freqz.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/hexint.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/listmisc.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/mathmisc.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/lmx2306.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/msgq_runner.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/os_read_exactly.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/sdr_1000.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/seq_with_cursor.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/socket_stuff.py +usr/lib/python2.7/dist-packages/gnuradio/gruimpl/daemon.py +usr/lib/python2.7/dist-packages/gnuradio/vocoder/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/gr/_gnuradio_swig_py_filter.la +usr/lib/python2.7/dist-packages/gnuradio/gr/_gnuradio_swig_py_general.la +usr/lib/python2.7/dist-packages/gnuradio/gr/_gnuradio_swig_py_gengen.la +usr/lib/python2.7/dist-packages/gnuradio/gr/_gnuradio_swig_py_hier.la +usr/lib/python2.7/dist-packages/gnuradio/gr/_gnuradio_swig_py_io.la +usr/lib/python2.7/dist-packages/gnuradio/gr/_gnuradio_swig_py_runtime.la +usr/lib/python2.7/dist-packages/gnuradio/gr/_gnuradio_swig_py_filter.so +usr/lib/python2.7/dist-packages/gnuradio/gr/_gnuradio_swig_py_general.so +usr/lib/python2.7/dist-packages/gnuradio/gr/_gnuradio_swig_py_gengen.so +usr/lib/python2.7/dist-packages/gnuradio/gr/_gnuradio_swig_py_hier.so +usr/lib/python2.7/dist-packages/gnuradio/gr/_gnuradio_swig_py_io.so +usr/lib/python2.7/dist-packages/gnuradio/gr/_gnuradio_swig_py_runtime.so +usr/lib/python2.7/dist-packages/gnuradio/gr/gnuradio_swig_python.py +usr/lib/python2.7/dist-packages/gnuradio/gr/gnuradio_swig_py_filter.py +usr/lib/python2.7/dist-packages/gnuradio/gr/gnuradio_swig_py_general.py +usr/lib/python2.7/dist-packages/gnuradio/gr/gnuradio_swig_py_gengen.py +usr/lib/python2.7/dist-packages/gnuradio/gr/gnuradio_swig_py_hier.py +usr/lib/python2.7/dist-packages/gnuradio/gr/gnuradio_swig_py_io.py +usr/lib/python2.7/dist-packages/gnuradio/gr/gnuradio_swig_py_runtime.py --- gnuradio-3.2.2.dfsg.orig/debian/python-gnuradio-audio-alsa.install +++ gnuradio-3.2.2.dfsg/debian/python-gnuradio-audio-alsa.install @@ -0,0 +1,3 @@ +usr/lib/python2.7/dist-packages/gnuradio/audio_alsa.py +usr/lib/python2.7/dist-packages/gnuradio/_audio_alsa.la +usr/lib/python2.7/dist-packages/gnuradio/_audio_alsa.so* --- gnuradio-3.2.2.dfsg.orig/debian/rules +++ gnuradio-3.2.2.dfsg/debian/rules @@ -0,0 +1,140 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +export DH_PYCENTRAL=nomove + +DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp extract-stamp install-stamp + + # Remove (possibly stale) pre-built Qt-generated moc files; they will + # be rebuilt using the current Qt moc. Perhaps this should actually be + # part of 'make distclean' and these files not be distributed: + rm -f ./gr-qtgui/src/lib/*_moc.cc + + if [ -f Makefile ]; \ + then\ + if [ -d .svn ]; \ + then \ + $(MAKE) maintainer-clean; \ + else \ + $(MAKE) distclean; \ + fi; \ + fi + + dh_clean + +update: + dh_testdir + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess config.guess + +configure: configure-stamp +configure-stamp: + dh_testdir + [ -f ./configure ] || ./bootstrap + ./configure \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --enable-shared \ + --sysconfdir=/etc \ + --enable-all-components \ + --disable-gr-audio-osx \ + --disable-gr-audio-windows \ + --disable-gcell --disable-gr-gcell \ + --disable-gr-comedi --disable-usrp2-firmware + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + + $(MAKE) + -$(MAKE) -k check + touch $@ + +extract: extract-stamp +extract-stamp: build-stamp debian/gen-install-files.sh + dh_testdir + chmod +x debian/gen-install-files.sh dtools/bin/extract_install_filenames + debian/gen-install-files.sh + touch $@ + +install: install-stamp +install-stamp: extract-stamp debian/control + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + : # make python scripts starting with '#!' executable + for i in `find debian -mindepth 2 -type f ! -perm 755`; do \ + if head -1 $$i | grep -q '^#!'; then \ + chmod 755 $$i; \ + echo "made executable: $$i"; \ + fi; \ + done + + : # Deposit rule to allow group 'usrp' access to USRP hardware + install -m 0644 -D debian/libusrp0.udev \ + debian/tmp/etc/udev/rules.d/40-usrp.rules + + : # Deposit rule to allow group 'usrp' access to USRP2 hardware + install -m 0644 -D debian/libusrp2-0.limits \ + debian/tmp/etc/security/limits.d/libusrp2-0.limits + + : # Install custom grc.conf + install -m 0644 -D debian/grc.conf \ + debian/tmp/etc/gnuradio/conf.d/grc.conf + + : # Install custom prefs.py FIXME + install -m 0644 -D debian/prefs.py \ + debian/tmp/usr/lib/python2.6/dist-packages/gnuradio/gr/prefs.py + + dh_install --sourcedir=debian/tmp + touch $@ + + + +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_pycentral + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: build install + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install configure --- gnuradio-3.2.2.dfsg.orig/debian/pycompat +++ gnuradio-3.2.2.dfsg/debian/pycompat @@ -0,0 +1 @@ +2 --- gnuradio-3.2.2.dfsg.orig/debian/libusrp2-0.postinst +++ gnuradio-3.2.2.dfsg/debian/libusrp2-0.postinst @@ -0,0 +1,20 @@ +#! /bin/sh + +set -e + +if [ "$1" != "configure" ]; then + exit 0 +fi + +# Create usrp group for access +if ! getent group usrp >/dev/null; then + addgroup --system usrp +fi + +# Create setuid root for group usrp on socket opener +chown root:usrp /usr/bin/usrp2_socket_opener +chmod 04750 /usr/bin/usrp2_socket_opener + +#DEBHELPER# + +exit 0 --- gnuradio-3.2.2.dfsg.orig/debian/libusrp2-0.dirs +++ gnuradio-3.2.2.dfsg/debian/libusrp2-0.dirs @@ -0,0 +1,2 @@ +etc/security/limits.d + --- gnuradio-3.2.2.dfsg.orig/debian/libusrp2-0.limits +++ gnuradio-3.2.2.dfsg/debian/libusrp2-0.limits @@ -0,0 +1 @@ +@usrp - rtprio 50 --- gnuradio-3.2.2.dfsg.orig/debian/changelog +++ gnuradio-3.2.2.dfsg/debian/changelog @@ -0,0 +1,170 @@ +gnuradio (3.2.2.dfsg-1ubuntu6) natty; urgency=low + + * config/gr_fortran.m4: call LT_LANG(Fortran 77) instead of the + lower-level autoconf macro directly; otherwise we get a double-invocation + that causes recent versions of autoconf to wind up with wrong language + selection. + * update config/pkg.m4 to the current version and re-autoconf, fixing + a build failure from trying to find libraries not needed at all for + dynamic linking. LP: #749214. + + -- Steve Langasek Sat, 16 Apr 2011 12:49:11 -0700 + +gnuradio (3.2.2.dfsg-1ubuntu5) natty; urgency=low + + * Apply upstream patch to fix build failure with GCC-4.5. LP: #687464. + + -- Matthias Klose Mon, 13 Dec 2010 15:31:45 +0100 + +gnuradio (3.2.2.dfsg-1ubuntu4) natty; urgency=low + + * Rebuild with python 2.7 as the python default. + + -- Matthias Klose Wed, 08 Dec 2010 15:03:58 +0000 + +gnuradio (3.2.2.dfsg-1ubuntu3) maverick; urgency=low + + * No-change rebuild to pick up the new j-a-c-k shlibs + + -- Luke Yelavich Wed, 21 Jul 2010 12:55:39 +0200 + +gnuradio (3.2.2.dfsg-1ubuntu2) maverick; urgency=low + + * Rebuild for the libdirectfb-1.2-0 -> libdirectfb-1.2-9 transition. + + -- Loïc Minier Mon, 31 May 2010 13:52:51 +0200 + +gnuradio (3.2.2.dfsg-1ubuntu1) lucid; urgency=low + + * Fix build for Ubuntu lucid (LP: #260406) + - add binary package dep for libusrp0, libusrp2-0: adduser + - debian/rules clean: remove pre-built Qt moc files + + -- Kamal Mostafa Sat, 13 Mar 2010 07:46:01 -0800 + +gnuradio (3.2.2.dfsg-1) unstable; urgency=low + + * new upstream version, includes gcc4.3 support, closes: #474801, #524387 + * upstream tarball modified to elide unnecessary Altera-licensed files + * merge debian/ content restructuring from upstream svn + * change build-dep from fftw3-dev to libfftw3-dev, closes: #458231 + * fix problem with rebuilding, closes: #441739 + * no longer need to move to contrib now that sdcc is fully back in main, + we just need to build depend on sdcc 2.9.0 or later, closes: #457402 + * rebuild reflects python-central file location change, closes: #490513 + * change Jack build depend to libjack-dev, closes: #527413 + + -- Bdale Garbee Sun, 01 Nov 2009 15:13:54 -0700 + +gnuradio (3.0.4-2ubuntu3) jaunty; urgency=low + + * Python 2.6 transition (LP: #355241): + - Update all debian/python-{gnuradio,usrp}.* to install all python stuffs + into the right path. + + -- Alessio Treglia Sat, 18 Apr 2009 10:10:38 +0200 + +gnuradio (3.0.4-2ubuntu2) intrepid; urgency=low + + * Rebuild for libcppunit-1.12-0 -> libcppunit-1.12-1 transistion. + * Replace sdcc with sdcc-nf, sdcc doesn't include asx8051. + * Bump python-wxgtk2.6 to python-wxgtk2.8. + * Add / to a whole bunch of files. + * Remove static from gnuradio-core/src/lib/general/gr_log2_const.h + + -- Steve Kowalik Wed, 08 Oct 2008 19:47:58 +1100 + +gnuradio (3.0.4-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Change fftw3-dev to libfftw3-dev. + + -- Stephan Hermann Sat, 19 Jan 2008 19:54:03 +0100 + +gnuradio (3.0.4-2) unstable; urgency=high + + * rebuild with new version number and upload to finally (?) recover from + over-zealous removal in response to bug 453154 + * recommend udev instead of hotplug, closes: #448907 + + -- Bdale Garbee Sun, 23 Dec 2007 12:11:49 -0700 + +gnuradio (3.0.4-1ubuntu1) hardy; urgency=low + + * Change fftw3-dev to libfftw3-dev. + * Munge Maintainer field as per spec. + + -- Steve Kowalik Wed, 19 Dec 2007 22:14:55 +1100 + +gnuradio (3.0.4-1) unstable; urgency=low + + * new upstream version + * fix build failure with gcc-4.3 by adding a #include, closes: #420896 + + -- Bdale Garbee Tue, 14 Aug 2007 22:38:32 -0600 + +gnuradio (3.0.3-1) unstable; urgency=low + + * new upstream version + * tweak gnuradio-doc package to eliminate spurious subdirectory level + * add a usrp-doc binary package, recommended by the usrp package, and + include xmlto in build dependencies so usrp_guide.html gets generated, + closes: #407368 + + -- Bdale Garbee Sun, 11 Mar 2007 23:55:32 -0600 + +gnuradio (3.0.2-2) unstable; urgency=high + + * add run-time dependency on python-wxgtk2.6. leaving urgency high since + this would be a silly bug to release etch with if we can avoid it. + + -- Bdale Garbee Mon, 4 Dec 2006 15:35:53 -0700 + +gnuradio (3.0.2-1) unstable; urgency=high + + * new upstream version, fixes FTBFS issues + + -- Bdale Garbee Sun, 12 Nov 2006 14:52:33 -0800 + +gnuradio (3.0-3) unstable; urgency=high + + * put python-all-dev back in the build-depends list, closes: #398246 + * move gr-wxgui conflicts/depends to python-gnuradio, closes: #396302 + * fix up sections in control to match overrides + + -- Bdale Garbee Sun, 12 Nov 2006 10:59:58 -0800 + +gnuradio (3.0-2) unstable; urgency=high + + * reworked package dependencies so that the 'gnuradio' binary package no + longer depends on the pieces in contrib. instead, the 'usrp' binary + package in contrib now depends on all the USRP-related pieces. A user + who doesn't have a USRP board can just install 'gnuradio' and get all + the relevant pieces, a USRP user needs to install both 'gnuradio' and + 'usrp'. Closes: #394533 + * improve consistency of references to 'GNU Radio' as upstream project name + * make the gnuradio package dependencies on python-gnuradio and python-usrp + be version specific on suggestion from Ramakrishnan Muthukrishnan + + -- Bdale Garbee Fri, 10 Nov 2006 00:39:38 -0800 + +gnuradio (3.0-1) unstable; urgency=low + + * new maintainer, new upstream version + * Restructuring source and binary packages to follow upstream changes, more + or less repackaging from scratch taking ideas from the previous packaging + by Ramakrishnan Muthukrishnan and Steinar H. Gunderson. This single + source package replaces all of: + gnuradio-core + gnuradio-examples + gr-audio-alsa + gr-audio-jack + gr-audio-oss + gr-usrp + gr-wxgui + usrp + In addition, the 'gnuradio' binary package is a new meta-package that + conveniently depends on everything gnuradio related to ease installation. + + -- Bdale Garbee Sun, 8 Oct 2006 13:28:21 -0600 + --- gnuradio-3.2.2.dfsg.orig/debian/libgnuradio-core0.dirs +++ gnuradio-3.2.2.dfsg/debian/libgnuradio-core0.dirs @@ -0,0 +1 @@ +etc/gnuradio/conf.d --- gnuradio-3.2.2.dfsg.orig/debian/libmblock0.install +++ gnuradio-3.2.2.dfsg/debian/libmblock0.install @@ -0,0 +1,3 @@ +usr/lib/libmblock.la +usr/lib/libmblock.so.* + --- gnuradio-3.2.2.dfsg.orig/debian/python-gnuradio-audio-oss.install +++ gnuradio-3.2.2.dfsg/debian/python-gnuradio-audio-oss.install @@ -0,0 +1,4 @@ +etc/gnuradio/conf.d/gr-audio-oss.conf +usr/lib/python2.7/dist-packages/gnuradio/audio_oss.py +usr/lib/python2.7/dist-packages/gnuradio/_audio_oss.la +usr/lib/python2.7/dist-packages/gnuradio/_audio_oss.so --- gnuradio-3.2.2.dfsg.orig/debian/libgnuradio-usrp2-dev.install +++ gnuradio-3.2.2.dfsg/debian/libgnuradio-usrp2-dev.install @@ -0,0 +1,8 @@ +usr/include/gnuradio/usrp2_base.h +usr/include/gnuradio/usrp2_source_base.h +usr/include/gnuradio/usrp2_source_32fc.h +usr/include/gnuradio/usrp2_source_16sc.h +usr/include/gnuradio/usrp2_sink_base.h +usr/include/gnuradio/usrp2_sink_16sc.h +usr/include/gnuradio/usrp2_sink_32fc.h +usr/lib/libgnuradio-usrp2.so --- gnuradio-3.2.2.dfsg.orig/debian/usrp.hotplug +++ gnuradio-3.2.2.dfsg/debian/usrp.hotplug @@ -0,0 +1,47 @@ +#! /bin/sh + +GROUP=usrp + +# Set the permissions for the USRP devices right. +set_permissions() { + if [ -f "$1" ] + then + if getent group $GROUP > /dev/null; then + chmod 660 "$DEVICE" + chown root.$GROUP "$1" + fi + fi +} + +# +# If we do not have /sbin/hotplug, we are being called by post-sarge udev +# emulating hotplug. In that case, all of this is handled by our udev rules, +# so we don't need to duplicate the work done here. +# +if ! [ -x /sbin/hotplug ]; then + exit +fi + +if [ "$ACTION" != "add" ]; then + exit +fi + +# FIXME: Map the USB device ID to usrper's idea of "which USRP". +# For now, we just assume the user only has a single one. + +case $PRODUCT in + # USRP without loaded firmware + fffe/2/2 | fffe/2/4) + sleep 1 # required on some machines + /usr/bin/usrper load_standard_bits + set_permissions "$DEVICE" + ;; + + # USRP with loaded firmware + fffe/2/102 | fffe/2/104) + set_permissions "$DEVICE" + ;; +esac + + + --- gnuradio-3.2.2.dfsg.orig/debian/libpmt-dev.install +++ gnuradio-3.2.2.dfsg/debian/libpmt-dev.install @@ -0,0 +1,5 @@ +usr/include/pmt.h +usr/include/pmt_pool.h +usr/include/pmt_serial_tags.h +usr/lib/libpmt.so +usr/lib/pkgconfig/pmt.pc --- gnuradio-3.2.2.dfsg.orig/debian/gnuradio-gpio.install +++ gnuradio-3.2.2.dfsg/debian/gnuradio-gpio.install @@ -0,0 +1,7 @@ +usr/bin/gpio_rx_sfile.py +usr/bin/gpio_usrp_siggen.py +usr/bin/gpio_usrp_fft.py +usr/lib/python2.7/dist-packages/gnuradio/gpio/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/gpio/gpio.py +usr/share/usrp/rev2/std_2rxhb_2tx_dig.rbf +usr/share/usrp/rev4/std_2rxint_2tx_dig.rbf --- gnuradio-3.2.2.dfsg.orig/debian/libusrp0.install +++ gnuradio-3.2.2.dfsg/debian/libusrp0.install @@ -0,0 +1,11 @@ +usr/lib/libusrp.la +usr/lib/libusrp.so.* +etc/udev/rules.d/40-usrp.rules +usr/share/usrp/rev2/multi_2rxhb_2tx.rbf +usr/share/usrp/rev2/std.ihx +usr/share/usrp/rev2/std_2rxhb_2tx.rbf +usr/share/usrp/rev2/std_4rx_0tx.rbf +usr/share/usrp/rev4/multi_2rxhb_2tx.rbf +usr/share/usrp/rev4/std.ihx +usr/share/usrp/rev4/std_2rxhb_2tx.rbf +usr/share/usrp/rev4/std_4rx_0tx.rbf --- gnuradio-3.2.2.dfsg.orig/debian/libgromnithread-dev.dirs +++ gnuradio-3.2.2.dfsg/debian/libgromnithread-dev.dirs @@ -0,0 +1,2 @@ +usr/lib/pkgconfig +usr/include/gnuradio --- gnuradio-3.2.2.dfsg.orig/debian/libgruel0.install +++ gnuradio-3.2.2.dfsg/debian/libgruel0.install @@ -0,0 +1,4 @@ +usr/lib/libgruel.la +usr/lib/libgruel.so.* + + --- gnuradio-3.2.2.dfsg.orig/debian/gnuradio-examples.install +++ gnuradio-3.2.2.dfsg/debian/gnuradio-examples.install @@ -0,0 +1,109 @@ +usr/share/gnuradio/examples/hf_explorer/README +usr/share/gnuradio/examples/hf_explorer/hfx_help +usr/share/gnuradio/examples/hf_explorer/hfx2.py +usr/share/gnuradio/examples/hf_radio/hfir.sci +usr/share/gnuradio/examples/hf_radio/radio.xml +usr/share/gnuradio/examples/hf_radio/input.py +usr/share/gnuradio/examples/hf_radio/output.py +usr/share/gnuradio/examples/hf_radio/README.TXT +usr/share/gnuradio/examples/hf_radio/ssbagc.py +usr/share/gnuradio/examples/hf_radio/ssbdemod.py +usr/share/gnuradio/examples/hf_radio/startup.py +usr/share/gnuradio/examples/hf_radio/ssb_taps +usr/share/gnuradio/examples/hf_radio/radio.py +usr/share/gnuradio/examples/hf_radio/ui.py +usr/share/gnuradio/examples/audio/audio_copy.py +usr/share/gnuradio/examples/audio/audio_fft.py +usr/share/gnuradio/examples/audio/audio_play.py +usr/share/gnuradio/examples/audio/audio_to_file.py +usr/share/gnuradio/examples/audio/dial_tone.py +usr/share/gnuradio/examples/audio/dial_tone_daemon.py +usr/share/gnuradio/examples/audio/dial_tone_wav.py +usr/share/gnuradio/examples/audio/mono_tone.py +usr/share/gnuradio/examples/audio/multi_tone.py +usr/share/gnuradio/examples/audio/noise.py +usr/share/gnuradio/examples/audio/spectrum_inversion.py +usr/share/gnuradio/examples/audio/test_resampler.py +usr/share/gnuradio/examples/digital/README +usr/share/gnuradio/examples/digital/generic_usrp.py +usr/share/gnuradio/examples/digital/pick_bitrate.py +usr/share/gnuradio/examples/digital/qt_digital_window.ui +usr/share/gnuradio/examples/digital/qt_digital_window.py +usr/share/gnuradio/examples/digital/qt_rx_window.ui +usr/share/gnuradio/examples/digital/qt_rx_window.py +usr/share/gnuradio/examples/digital/receive_path.py +usr/share/gnuradio/examples/digital/transmit_path.py +usr/share/gnuradio/examples/digital/usrp_options.py +usr/share/gnuradio/examples/digital/usrp_receive_path.py +usr/share/gnuradio/examples/digital/usrp_transmit_path.py +usr/share/gnuradio/examples/digital/benchmark_loopback.py +usr/share/gnuradio/examples/digital/benchmark_rx.py +usr/share/gnuradio/examples/digital/benchmark_tx.py +usr/share/gnuradio/examples/digital/benchmark_qt_rx.py +usr/share/gnuradio/examples/digital/benchmark_qt_loopback.py +usr/share/gnuradio/examples/digital/gen_whitener.py +usr/share/gnuradio/examples/digital/rx_voice.py +usr/share/gnuradio/examples/digital/run_length.py +usr/share/gnuradio/examples/digital/tunnel.py +usr/share/gnuradio/examples/digital/tx_voice.py +usr/share/gnuradio/examples/digital-bert/README +usr/share/gnuradio/examples/digital-bert/receive_path.py +usr/share/gnuradio/examples/digital-bert/transmit_path.py +usr/share/gnuradio/examples/digital-bert/benchmark_rx.py +usr/share/gnuradio/examples/digital-bert/benchmark_tx.py +usr/share/gnuradio/examples/digital_voice/encdec.py +usr/share/gnuradio/examples/digital_voice/cvsd_test.py +usr/share/gnuradio/examples/mp-sched/README +usr/share/gnuradio/examples/mp-sched/plot_flops.py +usr/share/gnuradio/examples/mp-sched/run_synthetic.py +usr/share/gnuradio/examples/mp-sched/synthetic.py +usr/share/gnuradio/examples/mp-sched/wfm_rcv_pll_to_wav.py +usr/share/gnuradio/examples/multi-antenna/multi_fft.py +usr/share/gnuradio/examples/multi-antenna/multi_file.py +usr/share/gnuradio/examples/multi-antenna/multi_scope.py +usr/share/gnuradio/examples/multi_usrp/README +usr/share/gnuradio/examples/multi_usrp/multi_usrp_oscope.py +usr/share/gnuradio/examples/multi_usrp/multi_usrp_rx_cfile.py +usr/share/gnuradio/examples/network/audio_sink.py +usr/share/gnuradio/examples/network/audio_source.py +usr/share/gnuradio/examples/network/dial_tone_sink.py +usr/share/gnuradio/examples/network/dial_tone_source.py +usr/share/gnuradio/examples/network/vector_sink.py +usr/share/gnuradio/examples/network/vector_source.py +usr/share/gnuradio/examples/ofdm/ofdm_sync.m +usr/share/gnuradio/examples/ofdm/ofdm_sync_pn.m +usr/share/gnuradio/examples/ofdm/fusb_options.py +usr/share/gnuradio/examples/ofdm/plot_ofdm.m +usr/share/gnuradio/examples/ofdm/pick_bitrate.py +usr/share/gnuradio/examples/ofdm/receive_path.py +usr/share/gnuradio/examples/ofdm/transmit_path.py +usr/share/gnuradio/examples/ofdm/benchmark_ofdm.py +usr/share/gnuradio/examples/ofdm/benchmark_ofdm_rx.py +usr/share/gnuradio/examples/ofdm/benchmark_ofdm_tx.py +usr/share/gnuradio/examples/ofdm/fftshift.py +usr/share/gnuradio/examples/ofdm/ofdm_mod_demod_test.py +usr/share/gnuradio/examples/ofdm/tunnel.py +usr/share/gnuradio/examples/usrp/fm_tx_2_daughterboards.py +usr/share/gnuradio/examples/usrp/fm_tx4.py +usr/share/gnuradio/examples/usrp/max_power.py +usr/share/gnuradio/examples/usrp/test_dft_analysis.py +usr/share/gnuradio/examples/usrp/test_dft_synth.py +usr/share/gnuradio/examples/usrp/usrp_benchmark_usb.py +usr/share/gnuradio/examples/usrp/usrp_nbfm_ptt.py +usr/share/gnuradio/examples/usrp/usrp_nbfm_rcv.py +usr/share/gnuradio/examples/usrp/usrp_spectrum_sense.py +usr/share/gnuradio/examples/usrp/usrp_test_loop_lfsr.py +usr/share/gnuradio/examples/usrp/usrp_tv_rcv_nogui.py +usr/share/gnuradio/examples/usrp/usrp_tv_rcv.py +usr/share/gnuradio/examples/usrp/usrp_wfm_rcv.py +usr/share/gnuradio/examples/usrp/usrp_wfm_rcv_nogui.py +usr/share/gnuradio/examples/usrp/usrp_wfm_rcv_fmdet.py +usr/share/gnuradio/examples/usrp/usrp_wfm_rcv_pll.py +usr/share/gnuradio/examples/usrp/usrp_wfm_rcv_sca.py +usr/share/gnuradio/examples/usrp/usrp_wfm_rcv2_nogui.py +usr/share/gnuradio/examples/usrp/usrp_wxapt_rcv.py +usr/share/gnuradio/examples/usrp/usrp_am_mw_rcv.py +usr/share/gnuradio/examples/usrp2/usrp2_wfm_qt.py +usr/share/gnuradio/examples/usrp2/usrp2_wfm_rcv.py +usr/share/gnuradio/examples/usrp2/qt_wfm_interface.ui +usr/share/gnuradio/examples/usrp2/qt_wfm_interface.py --- gnuradio-3.2.2.dfsg.orig/debian/libgromnithread-dev.install +++ gnuradio-3.2.2.dfsg/debian/libgromnithread-dev.install @@ -0,0 +1,5 @@ +usr/include/gnuradio/omni_time.h +usr/include/gnuradio/omnithread.h +usr/include/gnuradio/ot_posix.h +usr/lib/pkgconfig/gnuradio-omnithread.pc +usr/lib/libgromnithread.so --- gnuradio-3.2.2.dfsg.orig/debian/libusrp-dev.install +++ gnuradio-3.2.2.dfsg/debian/libusrp-dev.install @@ -0,0 +1,25 @@ +usr/include/db_base.h +usr/include/db_basic.h +usr/include/db_dbs_rx.h +usr/include/db_dtt754.h +usr/include/db_dtt768.h +usr/include/db_flexrf.h +usr/include/db_flexrf_mimo.h +usr/include/db_tv_rx.h +usr/include/db_util.h +usr/include/db_xcvr2450.h +usr/include/usrp_basic.h +usr/include/usrp_bytesex.h +usr/include/usrp_config.h +usr/include/usrp_dbid.h +usr/include/usrp_prims.h +usr/include/usrp_slots.h +usr/include/usrp_standard.h +usr/include/usrp_subdev_spec.h +usr/include/usrp_tune_result.h +usr/include/usrp_i2c_addr.h +usr/include/usrp_spi_defs.h +usr/include/fpga_regs_common.h +usr/include/fpga_regs_standard.h +usr/lib/libusrp.so +usr/lib/pkgconfig/usrp.pc --- gnuradio-3.2.2.dfsg.orig/debian/libgnuradio-usrp-dev.install +++ gnuradio-3.2.2.dfsg/debian/libgnuradio-usrp-dev.install @@ -0,0 +1,8 @@ +usr/include/gnuradio/usrp_base.h +usr/include/gnuradio/usrp_sink_base.h +usr/include/gnuradio/usrp_sink_c.h +usr/include/gnuradio/usrp_sink_s.h +usr/include/gnuradio/usrp_source_base.h +usr/include/gnuradio/usrp_source_c.h +usr/include/gnuradio/usrp_source_s.h +usr/lib/libgnuradio-usrp.so --- gnuradio-3.2.2.dfsg.orig/debian/libgnuradio-usrp0.install +++ gnuradio-3.2.2.dfsg/debian/libgnuradio-usrp0.install @@ -0,0 +1,3 @@ +usr/lib/libgnuradio-usrp.la +usr/lib/libgnuradio-usrp.so.* +usr/lib/pkgconfig/gnuradio-usrp.pc --- gnuradio-3.2.2.dfsg.orig/debian/gen-install-files.sh +++ gnuradio-3.2.2.dfsg/debian/gen-install-files.sh @@ -0,0 +1,378 @@ +#!/bin/sh + +EXTRACT=dtools/bin/extract_install_filenames + +# libusrp-dev +NAME=debian/libusrp-dev.install +rm -f $NAME +touch $NAME +$EXTRACT usrp/host/lib/legacy/Makefile include_HEADERS >>$NAME +$EXTRACT usrp/firmware/include/Makefile include_HEADERS >>$NAME +echo usr/lib/libusrp.so >>$NAME +echo usr/lib/pkgconfig/usrp.pc >>$NAME + +# libusrp2-dev +NAME=debian/libusrp2-dev.install +rm -f $NAME +touch $NAME +$EXTRACT usrp2/host/include/usrp2/Makefile usrp2include_HEADERS >>$NAME +echo usr/lib/libusrp2.so >>$NAME +echo usr/lib/pkgconfig/usrp2.pc >>$NAME + +# libgnuradio-core-dev +NAME=debian/libgnuradio-core-dev.install +rm -f $NAME +touch $NAME +$EXTRACT gnuradio-core/src/lib/filter/Makefile grinclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/filter/Makefile swiginclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/general/Makefile grinclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/general/Makefile swiginclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/gengen/Makefile grinclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/gengen/Makefile swiginclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/io/Makefile grinclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/io/Makefile swiginclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/reed-solomon/Makefile grinclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/reed-solomon/Makefile swiginclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/runtime/Makefile grinclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/runtime/Makefile swiginclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/hier/Makefile grinclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/hier/Makefile swiginclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile grinclude_HEADERS >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile swiginclude_HEADERS >>$NAME +echo usr/lib/libgnuradio-core.so >>$NAME +echo usr/lib/pkgconfig/gnuradio-core.pc >>$NAME + +# libgnuradio-audio-alsa0 +NAME=debian/libgnuradio-audio-alsa0.install +rm -f $NAME +touch $NAME +$EXTRACT gr-audio-alsa/src/Makefile lib_LTLIBRARIES >>$NAME +$EXTRACT gr-audio-alsa/src/Makefile lib_LTLIBRARIES | \ + sed -e 's/\.la$/.so.*/' >>$NAME +echo etc/gnuradio/conf.d/gr-audio-alsa.conf >>$NAME + +# libgnuradio-audio-alsa-dev +NAME=debian/libgnuradio-audio-alsa-dev.install +rm -f $NAME +touch $NAME +$EXTRACT gr-audio-alsa/src/Makefile grinclude_HEADERS >>$NAME +echo usr/lib/libgnuradio-audio-alsa.so >>$NAME +echo usr/lib/pkgconfig/gr-audio-alsa.pc >>$NAME + +# libgnuradio-qtgui0 +NAME=debian/libgnuradio-qtgui0.install +rm -f $NAME +touch $NAME +$EXTRACT gr-qtgui/src/lib/Makefile lib_LTLIBRARIES >>$NAME +$EXTRACT gr-qtgui/src/lib/Makefile lib_LTLIBRARIES | \ + sed -e 's/\.la$/.so.*/' >>$NAME + +# libgnuradio-qtgui-dev +NAME=debian/libgnuradio-qtgui-dev.install +rm -f $NAME +touch $NAME +$EXTRACT gr-qtgui/src/lib/Makefile grinclude_HEADERS >>$NAME +echo usr/lib/libgnuradio-qtgui.so >>$NAME + +# libgnuradio-usrp0 +NAME=debian/libgnuradio-usrp0.install +rm -f $NAME +touch $NAME +$EXTRACT gr-usrp/src/Makefile lib_LTLIBRARIES >>$NAME +$EXTRACT gr-usrp/src/Makefile lib_LTLIBRARIES | \ + sed -e 's/\.la$/.so.*/' >>$NAME +echo usr/lib/pkgconfig/gnuradio-usrp.pc >> $NAME + +# libgnuradio-usrp-dev +NAME=debian/libgnuradio-usrp-dev.install +rm -f $NAME +touch $NAME +$EXTRACT gr-usrp/src/Makefile grinclude_HEADERS >>$NAME +echo usr/lib/libgnuradio-usrp.so >>$NAME + +# libgnuradio-usrp2-0 +NAME=debian/libgnuradio-usrp2-0.install +rm -f $NAME +touch $NAME +$EXTRACT gr-usrp2/src/Makefile lib_LTLIBRARIES >>$NAME +$EXTRACT gr-usrp2/src/Makefile lib_LTLIBRARIES | \ + sed -e 's/\.la$/.so.*/' >>$NAME +echo usr/lib/pkgconfig/gnuradio-usrp2.pc >> $NAME + +# libgnuradio-usrp2-dev +NAME=debian/libgnuradio-usrp2-dev.install +rm -f $NAME +touch $NAME +$EXTRACT gr-usrp2/src/Makefile grinclude_HEADERS >>$NAME +echo usr/lib/libgnuradio-usrp2.so >>$NAME + +# python-usrp +NAME=debian/python-usrp.install +rm -f $NAME +touch $NAME +$EXTRACT usrp/host/swig/Makefile usrp_prims_pylib_LTLIBRARIES >>$NAME +$EXTRACT usrp/host/swig/Makefile usrp_prims_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME +$EXTRACT usrp/host/swig/Makefile usrp_prims_python_PYTHON >>$NAME +$EXTRACT usrp/host/lib/legacy/Makefile usrppython_PYTHON >>$NAME + +# python-gnuradio-core +NAME=debian/python-gnuradio-core.install +rm -f $NAME +touch $NAME +$EXTRACT gnuradio-core/src/python/gnuradio/Makefile grpython_PYTHON >>$NAME +$EXTRACT gnuradio-core/src/python/gnuradio/gr/Makefile grgrpython_PYTHON >>$NAME +$EXTRACT gnuradio-core/src/python/gnuradio/blks2/Makefile grblks2python_PYTHON >>$NAME +$EXTRACT gnuradio-core/src/python/gnuradio/blks2impl/Makefile grblkspython_PYTHON >>$NAME +$EXTRACT gnuradio-core/src/python/gnuradio/gru/Makefile grblkspython_PYTHON >>$NAME +$EXTRACT gnuradio-core/src/python/gnuradio/gruimpl/Makefile grupython_PYTHON >>$NAME +$EXTRACT gnuradio-core/src/python/gnuradio/vocoder/Makefile grvocoderpython_PYTHON >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_filter_pylib_LTLIBRARIES >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_general_pylib_LTLIBRARIES >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_gengen_pylib_LTLIBRARIES >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_hier_pylib_LTLIBRARIES >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_io_pylib_LTLIBRARIES >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_runtime_pylib_LTLIBRARIES >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_filter_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_general_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_gengen_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_hier_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_io_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_runtime_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile ourpython_PYTHON >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_filter_python_PYTHON >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_general_python_PYTHON >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_gengen_python_PYTHON >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_hier_python_PYTHON >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_io_python_PYTHON >>$NAME +$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_runtime_python_PYTHON >>$NAME + +# python-gnuradio-wxgui +NAME=debian/python-gnuradio-wxgui.install +rm -f $NAME +touch $NAME +echo etc/gnuradio/conf.d/gr-wxgui.conf >>$NAME +$EXTRACT gr-wxgui/src/python/Makefile ourpython_PYTHON >>$NAME +$EXTRACT gr-wxgui/src/python/Makefile formspython_PYTHON >>$NAME +$EXTRACT gr-wxgui/src/python/plotter/Makefile ourpython_PYTHON >>$NAME +$EXTRACT gr-wxgui/Makefile pkgconfig_DATA >>$NAME + +# python-gnuradio-usrp +NAME=debian/python-gnuradio-usrp.install +rm -f $NAME +touch $NAME +$EXTRACT gr-usrp/src/Makefile usrp_swig_python_PYTHON >>$NAME +$EXTRACT gr-usrp/src/Makefile usrp_swig_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-usrp/src/Makefile usrp_swig_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME + +# python-gnuradio-usrp2 +NAME=debian/python-gnuradio-usrp2.install +rm -f $NAME +touch $NAME +$EXTRACT gr-usrp2/src/Makefile usrp2_python_PYTHON >>$NAME +$EXTRACT gr-usrp2/src/Makefile usrp2_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-usrp2/src/Makefile usrp2_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME + +# python-gnuradio-audio-alsa +NAME=debian/python-gnuradio-audio-alsa.install +rm -f $NAME +touch $NAME +$EXTRACT gr-audio-alsa/src/Makefile audio_alsa_python_PYTHON >>$NAME +$EXTRACT gr-audio-alsa/src/Makefile audio_alsa_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-audio-alsa/src/Makefile audio_alsa_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so*/' >>$NAME + +# python-gnuradio-audio-jack +NAME=debian/python-gnuradio-audio-jack.install +rm -f $NAME +touch $NAME +echo etc/gnuradio/conf.d/gr-audio-jack.conf >>$NAME +$EXTRACT gr-audio-jack/src/Makefile audio_jack_python_PYTHON >>$NAME +$EXTRACT gr-audio-jack/src/Makefile audio_jack_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-audio-jack/src/Makefile audio_jack_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME + +# python-gnuradio-audio-oss +NAME=debian/python-gnuradio-audio-oss.install +rm -f $NAME +touch $NAME +echo etc/gnuradio/conf.d/gr-audio-oss.conf >>$NAME +$EXTRACT gr-audio-oss/src/Makefile audio_oss_python_PYTHON >>$NAME +$EXTRACT gr-audio-oss/src/Makefile audio_oss_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-audio-oss/src/Makefile audio_oss_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME + +# python-gnuradio-audio-portaudio +NAME=debian/python-gnuradio-audio-portaudio.install +rm -f $NAME +touch $NAME +echo etc/gnuradio/conf.d/gr-audio-portaudio.conf >>$NAME +$EXTRACT gr-audio-portaudio/src/Makefile audio_portaudio_python_PYTHON >>$NAME +$EXTRACT gr-audio-portaudio/src/Makefile audio_portaudio_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-audio-portaudio/src/Makefile audio_portaudio_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME + +# python-gnuradio-cvsd-vocoder +NAME=debian/python-gnuradio-cvsd-vocoder.install +rm -f $NAME +touch $NAME +$EXTRACT gr-cvsd-vocoder/src/python/Makefile grblkspython_PYTHON >>$NAME +$EXTRACT gr-cvsd-vocoder/src/lib/Makefile cvsd_vocoder_python_PYTHON >>$NAME +$EXTRACT gr-cvsd-vocoder/src/lib/Makefile cvsd_vocoder_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-cvsd-vocoder/src/lib/Makefile cvsd_vocoder_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME + +# python-gnuradio-gsm-fr-vocoder +NAME=debian/python-gnuradio-gsm-fr-vocoder.install +rm -f $NAME +touch $NAME +$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile gsm_full_rate_python_PYTHON >>$NAME +$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile gsm_full_rate_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile gsm_full_rate_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME + +# python-gnuradio-qtgui +NAME=debian/python-gnuradio-qtgui.install +rm -f $NAME +touch $NAME +$EXTRACT gr-qtgui/src/python/Makefile qtguipython_PYTHON >>$NAME +$EXTRACT gr-qtgui/src/lib/Makefile qtgui_python_PYTHON >>$NAME +$EXTRACT gr-qtgui/src/lib/Makefile qtgui_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-qtgui/src/lib/Makefile qtgui_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so*/' >>$NAME + +# python-gnuradio-trellis +NAME=debian/python-gnuradio-trellis.install +rm -f $NAME +touch $NAME +$EXTRACT gr-trellis/src/lib/Makefile trellis_python_PYTHON >>$NAME +$EXTRACT gr-trellis/src/lib/Makefile trellis_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-trellis/src/lib/Makefile trellis_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME +$EXTRACT gr-trellis/src/examples/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gr-trellis/src/examples/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gr-trellis/src/examples/fsm_files/Makefile dist_ourdata_DATA >>$NAME + +# python-gnuradio-video-sdl +NAME=debian/python-gnuradio-video-sdl.install +rm -f $NAME +touch $NAME +$EXTRACT gr-video-sdl/src/Makefile video_sdl_python_PYTHON >>$NAME +$EXTRACT gr-video-sdl/src/Makefile video_sdl_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-video-sdl/src/Makefile video_sdl_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME + +# gnuradio-utils +NAME=debian/gnuradio-utils.install +rm -f $NAME +touch $NAME +$EXTRACT gr-utils/src/python/Makefile ourpython_PYTHON >>$NAME +$EXTRACT gr-utils/src/python/Makefile bin_SCRIPTS >>$NAME + +# gnuradio-examples +NAME=debian/gnuradio-examples.install +rm -f $NAME +touch $NAME +$EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/audio/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/digital/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/digital/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/digital-bert/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/digital-bert/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/digital_voice/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/mp-sched/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/mp-sched/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/multi-antenna/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/multi_usrp/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/multi_usrp/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/network/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/ofdm/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/ofdm/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/usrp/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/usrp2/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/usrp2/Makefile dist_ourdata_DATA >>$NAME + +# gnuradio-pager +NAME=debian/gnuradio-pager.install +rm -f $NAME +touch $NAME +$EXTRACT gr-pager/src/Makefile dist_bin_SCRIPTS >>$NAME +$EXTRACT gr-pager/src/Makefile pager_swig_python_PYTHON >>$NAME +$EXTRACT gr-pager/src/Makefile pager_swig_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-pager/src/Makefile pager_swig_pylib_LTLIBRARIES | + sed -e 's/\.la$/.so/' >>$NAME + +# gnuradio-sounder +NAME=debian/gnuradio-sounder.install +rm -f $NAME +touch $NAME +$EXTRACT gr-sounder/src/python/Makefile sounder_python_PYTHON >>$NAME +$EXTRACT gr-sounder/src/python/Makefile dist_bin_SCRIPTS >>$NAME +echo usr/share/usrp/rev2/usrp_sounder.rbf >>$NAME +echo usr/share/usrp/rev4/usrp_sounder.rbf >>$NAME + +# gnuradio-gpio +NAME=debian/gnuradio-gpio.install +rm -f $NAME +touch $NAME +$EXTRACT gr-gpio/src/python/Makefile dist_bin_SCRIPTS >>$NAME +$EXTRACT gr-gpio/src/python/Makefile ourpython_PYTHON >>$NAME +echo usr/share/usrp/rev2/std_2rxhb_2tx_dig.rbf >> $NAME +echo usr/share/usrp/rev4/std_2rxint_2tx_dig.rbf >> $NAME + +# gnuradio-radar-mono +NAME=debian/gnuradio-radar-mono.install +rm -f $NAME +touch $NAME +$EXTRACT gr-radar-mono/src/python/Makefile radar_mono_python_PYTHON >>$NAME +$EXTRACT gr-radar-mono/src/python/Makefile dist_bin_SCRIPTS >>$NAME +echo usr/share/usrp/rev2/usrp_radar_mono.rbf >>$NAME +echo usr/share/usrp/rev4/usrp_radar_mono.rbf >>$NAME + +# gnuradio-radio-astronomy +NAME=debian/gnuradio-radio-astronomy.install +rm -f $NAME +touch $NAME +$EXTRACT gr-radio-astronomy/src/python/Makefile ourpython_PYTHON >>$NAME +$EXTRACT gr-radio-astronomy/src/python/Makefile wxguipython_PYTHON >>$NAME +$EXTRACT gr-radio-astronomy/src/python/Makefile dist_bin_SCRIPTS >>$NAME +$EXTRACT gr-radio-astronomy/src/lib/Makefile ra_python_PYTHON >>$NAME +$EXTRACT gr-radio-astronomy/src/lib/Makefile ra_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-radio-astronomy/src/lib/Makefile ra_pylib_LTLIBRARIES | + sed -e 's/\.la$/.so/' >>$NAME + +# gnuradio-companion +NAME=debian/gnuradio-companion.install +rm -f $NAME +touch $NAME +$EXTRACT grc/Makefile ourpython_PYTHON >>$NAME +$EXTRACT grc/Makefile dist_etc_DATA >>$NAME +$EXTRACT grc/base/Makefile ourpython_PYTHON >>$NAME +$EXTRACT grc/base/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT grc/blocks/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT grc/examples/Makefile dist_audiodata_DATA >>$NAME +$EXTRACT grc/examples/Makefile dist_simpledata_DATA >>$NAME +$EXTRACT grc/examples/Makefile dist_trellisdata_DATA >>$NAME +$EXTRACT grc/examples/Makefile dist_usrpdata_DATA >>$NAME +$EXTRACT grc/examples/Makefile dist_xmlrpcdata_DATA >>$NAME +$EXTRACT grc/freedesktop/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT grc/freedesktop/Makefile dist_bin_SCRIPTS >>$NAME +$EXTRACT grc/grc_gnuradio/Makefile root_python_PYTHON >>$NAME +$EXTRACT grc/grc_gnuradio/Makefile blks2_python_PYTHON >>$NAME +$EXTRACT grc/grc_gnuradio/Makefile usrp_python_PYTHON >>$NAME +$EXTRACT grc/grc_gnuradio/Makefile wxgui_python_PYTHON >>$NAME +$EXTRACT grc/gui/Makefile ourpython_PYTHON >>$NAME +$EXTRACT grc/python/Makefile ourpython_PYTHON >>$NAME +$EXTRACT grc/python/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT grc/scripts/Makefile dist_bin_SCRIPTS >>$NAME --- gnuradio-3.2.2.dfsg.orig/debian/libgnuradio-usrp2-0.install +++ gnuradio-3.2.2.dfsg/debian/libgnuradio-usrp2-0.install @@ -0,0 +1,3 @@ +usr/lib/libgnuradio-usrp2.la +usr/lib/libgnuradio-usrp2.so.* +usr/lib/pkgconfig/gnuradio-usrp2.pc --- gnuradio-3.2.2.dfsg.orig/debian/gnuradio-sounder.install +++ gnuradio-3.2.2.dfsg/debian/gnuradio-sounder.install @@ -0,0 +1,4 @@ +usr/lib/python2.7/dist-packages/gnuradio/sounder.py +usr/bin/usrp_sounder.py +usr/share/usrp/rev2/usrp_sounder.rbf +usr/share/usrp/rev4/usrp_sounder.rbf --- gnuradio-3.2.2.dfsg.orig/debian/python-gnuradio-gsm-fr-vocoder.install +++ gnuradio-3.2.2.dfsg/debian/python-gnuradio-gsm-fr-vocoder.install @@ -0,0 +1,3 @@ +usr/lib/python2.7/dist-packages/gnuradio/vocoder/gsm_full_rate.py +usr/lib/python2.7/dist-packages/gnuradio/vocoder/_gsm_full_rate.la +usr/lib/python2.7/dist-packages/gnuradio/vocoder/_gsm_full_rate.so --- gnuradio-3.2.2.dfsg.orig/debian/grc.conf +++ gnuradio-3.2.2.dfsg/debian/grc.conf @@ -0,0 +1,9 @@ +# This file contains system wide configuration data for GNU Radio. +# You may override any setting on a per-user basis by editing +# ~/.gnuradio/config.conf + +[grc] +pythonw = python +doc_dir = /usr/share/doc/gnuradio-doc +global_blocks_path = /usr/share/gnuradio/grc/blocks +local_blocks_path = /usr/local/share/gnuradio/grc/blocks --- gnuradio-3.2.2.dfsg.orig/debian/python-gnuradio-qtgui.install +++ gnuradio-3.2.2.dfsg/debian/python-gnuradio-qtgui.install @@ -0,0 +1,4 @@ +usr/lib/python2.7/dist-packages/gnuradio/qtgui/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/qtgui/qtgui.py +usr/lib/python2.7/dist-packages/gnuradio/qtgui/_qtgui.la +usr/lib/python2.7/dist-packages/gnuradio/qtgui/_qtgui.so* --- gnuradio-3.2.2.dfsg.orig/debian/gnuradio-companion.install +++ gnuradio-3.2.2.dfsg/debian/gnuradio-companion.install @@ -0,0 +1,299 @@ +usr/lib/python2.7/dist-packages/gnuradio/grc/__init__.py +etc/gnuradio/conf.d/grc.conf +usr/lib/python2.7/dist-packages/gnuradio/grc/base/odict.py +usr/lib/python2.7/dist-packages/gnuradio/grc/base/ParseXML.py +usr/lib/python2.7/dist-packages/gnuradio/grc/base/Block.py +usr/lib/python2.7/dist-packages/gnuradio/grc/base/Connection.py +usr/lib/python2.7/dist-packages/gnuradio/grc/base/Constants.py +usr/lib/python2.7/dist-packages/gnuradio/grc/base/Element.py +usr/lib/python2.7/dist-packages/gnuradio/grc/base/FlowGraph.py +usr/lib/python2.7/dist-packages/gnuradio/grc/base/Param.py +usr/lib/python2.7/dist-packages/gnuradio/grc/base/Platform.py +usr/lib/python2.7/dist-packages/gnuradio/grc/base/Port.py +usr/lib/python2.7/dist-packages/gnuradio/grc/base/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/grc/base/block_tree.dtd +usr/lib/python2.7/dist-packages/gnuradio/grc/base/flow_graph.dtd +usr/share/gnuradio/grc/blocks/block_tree.xml +usr/share/gnuradio/grc/blocks/audio_sink.xml +usr/share/gnuradio/grc/blocks/audio_source.xml +usr/share/gnuradio/grc/blocks/band_pass_filter.xml +usr/share/gnuradio/grc/blocks/band_reject_filter.xml +usr/share/gnuradio/grc/blocks/blks2_am_demod_cf.xml +usr/share/gnuradio/grc/blocks/blks2_analysis_filterbank.xml +usr/share/gnuradio/grc/blocks/blks2_dxpsk_demod.xml +usr/share/gnuradio/grc/blocks/blks2_dxpsk_mod.xml +usr/share/gnuradio/grc/blocks/blks2_error_rate.xml +usr/share/gnuradio/grc/blocks/blks2_fm_deemph.xml +usr/share/gnuradio/grc/blocks/blks2_fm_demod_cf.xml +usr/share/gnuradio/grc/blocks/blks2_fm_preemph.xml +usr/share/gnuradio/grc/blocks/blks2_gmsk_demod.xml +usr/share/gnuradio/grc/blocks/blks2_gmsk_mod.xml +usr/share/gnuradio/grc/blocks/blks2_logpwrfft_x.xml +usr/share/gnuradio/grc/blocks/blks2_nbfm_rx.xml +usr/share/gnuradio/grc/blocks/blks2_nbfm_tx.xml +usr/share/gnuradio/grc/blocks/blks2_ofdm_demod.xml +usr/share/gnuradio/grc/blocks/blks2_ofdm_mod.xml +usr/share/gnuradio/grc/blocks/blks2_packet_decoder.xml +usr/share/gnuradio/grc/blocks/blks2_packet_encoder.xml +usr/share/gnuradio/grc/blocks/blks2_qamx_demod.xml +usr/share/gnuradio/grc/blocks/blks2_qamx_mod.xml +usr/share/gnuradio/grc/blocks/blks2_rational_resampler_xxx.xml +usr/share/gnuradio/grc/blocks/blks2_selector.xml +usr/share/gnuradio/grc/blocks/blks2_standard_squelch.xml +usr/share/gnuradio/grc/blocks/blks2_stream_to_vector_decimator.xml +usr/share/gnuradio/grc/blocks/blks2_synthesis_filterbank.xml +usr/share/gnuradio/grc/blocks/blks2_tcp_sink.xml +usr/share/gnuradio/grc/blocks/blks2_tcp_source.xml +usr/share/gnuradio/grc/blocks/blks2_valve.xml +usr/share/gnuradio/grc/blocks/blks2_variable_sink_x.xml +usr/share/gnuradio/grc/blocks/blks2_wfm_rcv.xml +usr/share/gnuradio/grc/blocks/blks2_wfm_rcv_pll.xml +usr/share/gnuradio/grc/blocks/blks2_wfm_tx.xml +usr/share/gnuradio/grc/blocks/const_source_x.xml +usr/share/gnuradio/grc/blocks/gr_add_const_vxx.xml +usr/share/gnuradio/grc/blocks/gr_add_xx.xml +usr/share/gnuradio/grc/blocks/gr_agc2_xx.xml +usr/share/gnuradio/grc/blocks/gr_agc_xx.xml +usr/share/gnuradio/grc/blocks/gr_and_xx.xml +usr/share/gnuradio/grc/blocks/gr_argmax_xx.xml +usr/share/gnuradio/grc/blocks/gr_binary_slicer_fb.xml +usr/share/gnuradio/grc/blocks/gr_channel_model.xml +usr/share/gnuradio/grc/blocks/gr_char_to_float.xml +usr/share/gnuradio/grc/blocks/gr_chunks_to_symbols.xml +usr/share/gnuradio/grc/blocks/gr_clock_recovery_mm_xx.xml +usr/share/gnuradio/grc/blocks/gr_cma_equalizer_cc.xml +usr/share/gnuradio/grc/blocks/gr_complex_to_arg.xml +usr/share/gnuradio/grc/blocks/gr_complex_to_float.xml +usr/share/gnuradio/grc/blocks/gr_complex_to_imag.xml +usr/share/gnuradio/grc/blocks/gr_complex_to_interleaved_short.xml +usr/share/gnuradio/grc/blocks/gr_complex_to_mag.xml +usr/share/gnuradio/grc/blocks/gr_complex_to_mag_squared.xml +usr/share/gnuradio/grc/blocks/gr_complex_to_real.xml +usr/share/gnuradio/grc/blocks/gr_conjugate_cc.xml +usr/share/gnuradio/grc/blocks/gr_constellation_decoder_cb.xml +usr/share/gnuradio/grc/blocks/gr_correlate_access_code_bb.xml +usr/share/gnuradio/grc/blocks/gr_costas_loop_cc.xml +usr/share/gnuradio/grc/blocks/gr_cpfsk_bc.xml +usr/share/gnuradio/grc/blocks/gr_dd_mpsk_sync_cc.xml +usr/share/gnuradio/grc/blocks/gr_decode_ccsds_27_fb.xml +usr/share/gnuradio/grc/blocks/gr_deinterleave.xml +usr/share/gnuradio/grc/blocks/gr_delay.xml +usr/share/gnuradio/grc/blocks/gr_descrambler_bb.xml +usr/share/gnuradio/grc/blocks/gr_diff_decoder_bb.xml +usr/share/gnuradio/grc/blocks/gr_diff_encoder_bb.xml +usr/share/gnuradio/grc/blocks/gr_diff_phasor_cc.xml +usr/share/gnuradio/grc/blocks/gr_divide_xx.xml +usr/share/gnuradio/grc/blocks/gr_dpll_bb.xml +usr/share/gnuradio/grc/blocks/gr_encode_ccsds_27_bb.xml +usr/share/gnuradio/grc/blocks/gr_feedforward_agc_cc.xml +usr/share/gnuradio/grc/blocks/gr_fft_filter_xxx.xml +usr/share/gnuradio/grc/blocks/gr_fft_vxx.xml +usr/share/gnuradio/grc/blocks/gr_file_sink.xml +usr/share/gnuradio/grc/blocks/gr_file_source.xml +usr/share/gnuradio/grc/blocks/gr_filter_delay_fc.xml +usr/share/gnuradio/grc/blocks/gr_fir_filter_xxx.xml +usr/share/gnuradio/grc/blocks/gr_float_to_char.xml +usr/share/gnuradio/grc/blocks/gr_float_to_complex.xml +usr/share/gnuradio/grc/blocks/gr_float_to_short.xml +usr/share/gnuradio/grc/blocks/gr_float_to_uchar.xml +usr/share/gnuradio/grc/blocks/gr_fractional_interpolator_xx.xml +usr/share/gnuradio/grc/blocks/gr_freq_xlating_fir_filter_xxx.xml +usr/share/gnuradio/grc/blocks/gr_frequency_modulator_fc.xml +usr/share/gnuradio/grc/blocks/gr_glfsr_source_x.xml +usr/share/gnuradio/grc/blocks/gr_goertzel_fc.xml +usr/share/gnuradio/grc/blocks/gr_head.xml +usr/share/gnuradio/grc/blocks/gr_hilbert_fc.xml +usr/share/gnuradio/grc/blocks/gr_iir_filter_ffd.xml +usr/share/gnuradio/grc/blocks/gr_integrate_xx.xml +usr/share/gnuradio/grc/blocks/gr_interleave.xml +usr/share/gnuradio/grc/blocks/gr_interleaved_short_to_complex.xml +usr/share/gnuradio/grc/blocks/gr_interp_fir_filter_xxx.xml +usr/share/gnuradio/grc/blocks/gr_iqcomp_cc.xml +usr/share/gnuradio/grc/blocks/gr_keep_one_in_n.xml +usr/share/gnuradio/grc/blocks/gr_kludge_copy.xml +usr/share/gnuradio/grc/blocks/gr_map_bb.xml +usr/share/gnuradio/grc/blocks/gr_max_xx.xml +usr/share/gnuradio/grc/blocks/gr_moving_average_xx.xml +usr/share/gnuradio/grc/blocks/gr_mpsk_receiver_cc.xml +usr/share/gnuradio/grc/blocks/gr_mpsk_sync_cc.xml +usr/share/gnuradio/grc/blocks/gr_multiply_const_vxx.xml +usr/share/gnuradio/grc/blocks/gr_multiply_xx.xml +usr/share/gnuradio/grc/blocks/gr_mute_xx.xml +usr/share/gnuradio/grc/blocks/gr_nlog10_ff.xml +usr/share/gnuradio/grc/blocks/gr_noise_source_x.xml +usr/share/gnuradio/grc/blocks/gr_nop.xml +usr/share/gnuradio/grc/blocks/gr_not_xx.xml +usr/share/gnuradio/grc/blocks/gr_null_sink.xml +usr/share/gnuradio/grc/blocks/gr_null_source.xml +usr/share/gnuradio/grc/blocks/gr_or_xx.xml +usr/share/gnuradio/grc/blocks/gr_packed_to_unpacked_xx.xml +usr/share/gnuradio/grc/blocks/gr_peak_detector2_fb.xml +usr/share/gnuradio/grc/blocks/gr_peak_detector_xb.xml +usr/share/gnuradio/grc/blocks/gr_phase_modulator_fc.xml +usr/share/gnuradio/grc/blocks/gr_pll_carriertracking_cc.xml +usr/share/gnuradio/grc/blocks/gr_pll_freqdet_cf.xml +usr/share/gnuradio/grc/blocks/gr_pll_refout_cc.xml +usr/share/gnuradio/grc/blocks/gr_pn_correlator_cc.xml +usr/share/gnuradio/grc/blocks/gr_probe_avg_mag_sqrd_x.xml +usr/share/gnuradio/grc/blocks/gr_probe_density_b.xml +usr/share/gnuradio/grc/blocks/gr_probe_mpsk_snr_c.xml +usr/share/gnuradio/grc/blocks/gr_pwr_squelch_xx.xml +usr/share/gnuradio/grc/blocks/gr_quadrature_demod_cf.xml +usr/share/gnuradio/grc/blocks/gr_rational_resampler_base_xxx.xml +usr/share/gnuradio/grc/blocks/gr_repeat.xml +usr/share/gnuradio/grc/blocks/gr_rms_xx.xml +usr/share/gnuradio/grc/blocks/gr_sample_and_hold_xx.xml +usr/share/gnuradio/grc/blocks/gr_scrambler_bb.xml +usr/share/gnuradio/grc/blocks/gr_short_to_float.xml +usr/share/gnuradio/grc/blocks/gr_sig_source_x.xml +usr/share/gnuradio/grc/blocks/gr_simple_correlator.xml +usr/share/gnuradio/grc/blocks/gr_simple_framer.xml +usr/share/gnuradio/grc/blocks/gr_simple_squelch_cc.xml +usr/share/gnuradio/grc/blocks/gr_single_pole_iir_filter_xx.xml +usr/share/gnuradio/grc/blocks/gr_skiphead.xml +usr/share/gnuradio/grc/blocks/gr_stream_to_streams.xml +usr/share/gnuradio/grc/blocks/gr_stream_to_vector.xml +usr/share/gnuradio/grc/blocks/gr_streams_to_stream.xml +usr/share/gnuradio/grc/blocks/gr_streams_to_vector.xml +usr/share/gnuradio/grc/blocks/gr_sub_xx.xml +usr/share/gnuradio/grc/blocks/gr_threshold_ff.xml +usr/share/gnuradio/grc/blocks/gr_throttle.xml +usr/share/gnuradio/grc/blocks/gr_uchar_to_float.xml +usr/share/gnuradio/grc/blocks/gr_udp_sink.xml +usr/share/gnuradio/grc/blocks/gr_udp_source.xml +usr/share/gnuradio/grc/blocks/gr_unpack_k_bits_bb.xml +usr/share/gnuradio/grc/blocks/gr_unpacked_to_packed_xx.xml +usr/share/gnuradio/grc/blocks/gr_vco_f.xml +usr/share/gnuradio/grc/blocks/gr_vector_sink_x.xml +usr/share/gnuradio/grc/blocks/gr_vector_source_x.xml +usr/share/gnuradio/grc/blocks/gr_vector_to_stream.xml +usr/share/gnuradio/grc/blocks/gr_vector_to_streams.xml +usr/share/gnuradio/grc/blocks/gr_wavfile_sink.xml +usr/share/gnuradio/grc/blocks/gr_wavfile_source.xml +usr/share/gnuradio/grc/blocks/gr_xor_xx.xml +usr/share/gnuradio/grc/blocks/high_pass_filter.xml +usr/share/gnuradio/grc/blocks/import.xml +usr/share/gnuradio/grc/blocks/low_pass_filter.xml +usr/share/gnuradio/grc/blocks/note.xml +usr/share/gnuradio/grc/blocks/notebook.xml +usr/share/gnuradio/grc/blocks/options.xml +usr/share/gnuradio/grc/blocks/pad_sink.xml +usr/share/gnuradio/grc/blocks/pad_source.xml +usr/share/gnuradio/grc/blocks/parameter.xml +usr/share/gnuradio/grc/blocks/probe_function.xml +usr/share/gnuradio/grc/blocks/random_source_x.xml +usr/share/gnuradio/grc/blocks/root_raised_cosine_filter.xml +usr/share/gnuradio/grc/blocks/trellis_encoder_xx.xml +usr/share/gnuradio/grc/blocks/trellis_metrics_x.xml +usr/share/gnuradio/grc/blocks/trellis_permutation.xml +usr/share/gnuradio/grc/blocks/trellis_siso_combined_f.xml +usr/share/gnuradio/grc/blocks/trellis_siso_f.xml +usr/share/gnuradio/grc/blocks/trellis_viterbi_combined_xx.xml +usr/share/gnuradio/grc/blocks/trellis_viterbi_x.xml +usr/share/gnuradio/grc/blocks/usrp2_probe.xml +usr/share/gnuradio/grc/blocks/usrp2_sink_xxxx.xml +usr/share/gnuradio/grc/blocks/usrp2_source_xxxx.xml +usr/share/gnuradio/grc/blocks/usrp_dual_sink_x.xml +usr/share/gnuradio/grc/blocks/usrp_dual_source_x.xml +usr/share/gnuradio/grc/blocks/usrp_probe.xml +usr/share/gnuradio/grc/blocks/usrp_simple_sink_x.xml +usr/share/gnuradio/grc/blocks/usrp_simple_source_x.xml +usr/share/gnuradio/grc/blocks/variable.xml +usr/share/gnuradio/grc/blocks/variable_check_box.xml +usr/share/gnuradio/grc/blocks/variable_chooser.xml +usr/share/gnuradio/grc/blocks/variable_config.xml +usr/share/gnuradio/grc/blocks/variable_slider.xml +usr/share/gnuradio/grc/blocks/variable_static_text.xml +usr/share/gnuradio/grc/blocks/variable_text_box.xml +usr/share/gnuradio/grc/blocks/wxgui_constellationsink2.xml +usr/share/gnuradio/grc/blocks/wxgui_fftsink2.xml +usr/share/gnuradio/grc/blocks/wxgui_histosink2.xml +usr/share/gnuradio/grc/blocks/wxgui_numbersink2.xml +usr/share/gnuradio/grc/blocks/wxgui_scopesink2.xml +usr/share/gnuradio/grc/blocks/wxgui_waterfallsink2.xml +usr/share/gnuradio/grc/blocks/xmlrpc_client.xml +usr/share/gnuradio/grc/blocks/xmlrpc_server.xml +usr/share/gnuradio/examples/grc/audio/dial_tone.grc +usr/share/gnuradio/examples/grc/simple/ber_simulation.grc +usr/share/gnuradio/examples/grc/simple/dpsk_loopback.grc +usr/share/gnuradio/examples/grc/simple/variable_config.grc +usr/share/gnuradio/examples/grc/simple/var_sink_taps.grc +usr/share/gnuradio/examples/grc/trellis/readme.txt +usr/share/gnuradio/examples/grc/trellis/interference_cancellation.grc +usr/share/gnuradio/examples/grc/usrp/usrp2_const_wave.grc +usr/share/gnuradio/examples/grc/usrp/usrp2_dpsk_mod.grc +usr/share/gnuradio/examples/grc/usrp/usrp2_fft.grc +usr/share/gnuradio/examples/grc/usrp/usrp_two_tone_loopback.grc +usr/share/gnuradio/examples/grc/usrp/usrp_wbfm_receive.grc +usr/share/gnuradio/examples/grc/xmlrpc/readme.txt +usr/share/gnuradio/examples/grc/xmlrpc/xmlrpc_client.grc +usr/share/gnuradio/examples/grc/xmlrpc/xmlrpc_client_script.py +usr/share/gnuradio/examples/grc/xmlrpc/xmlrpc_server.grc +usr/share/gnuradio/grc/freedesktop/grc-icon-256.png +usr/share/gnuradio/grc/freedesktop/grc-icon-128.png +usr/share/gnuradio/grc/freedesktop/grc-icon-64.png +usr/share/gnuradio/grc/freedesktop/grc-icon-48.png +usr/share/gnuradio/grc/freedesktop/grc-icon-32.png +usr/share/gnuradio/grc/freedesktop/gnuradio-grc.xml +usr/share/gnuradio/grc/freedesktop/gnuradio-grc.desktop +usr/share/gnuradio/grc/freedesktop/gnuradio-usrp2_probe.desktop +usr/share/gnuradio/grc/freedesktop/gnuradio-usrp_probe.desktop +usr/bin/grc_setup_freedesktop +usr/lib/python2.7/dist-packages/grc_gnuradio/__init__.py +usr/lib/python2.7/dist-packages/grc_gnuradio/blks2/__init__.py +usr/lib/python2.7/dist-packages/grc_gnuradio/blks2/error_rate.py +usr/lib/python2.7/dist-packages/grc_gnuradio/blks2/packet.py +usr/lib/python2.7/dist-packages/grc_gnuradio/blks2/probe.py +usr/lib/python2.7/dist-packages/grc_gnuradio/blks2/selector.py +usr/lib/python2.7/dist-packages/grc_gnuradio/blks2/tcp.py +usr/lib/python2.7/dist-packages/grc_gnuradio/blks2/variable_sink.py +usr/lib/python2.7/dist-packages/grc_gnuradio/usrp/__init__.py +usr/lib/python2.7/dist-packages/grc_gnuradio/usrp/common.py +usr/lib/python2.7/dist-packages/grc_gnuradio/usrp/dual_usrp.py +usr/lib/python2.7/dist-packages/grc_gnuradio/usrp/simple_usrp.py +usr/lib/python2.7/dist-packages/grc_gnuradio/wxgui/__init__.py +usr/lib/python2.7/dist-packages/grc_gnuradio/wxgui/panel.py +usr/lib/python2.7/dist-packages/grc_gnuradio/wxgui/top_block_gui.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Block.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Colors.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Constants.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Connection.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Element.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/FlowGraph.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Param.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Platform.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Port.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Utils.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/ActionHandler.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Actions.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Bars.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/BlockTreeWindow.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Dialogs.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/DrawingArea.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/FileDialogs.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/MainWindow.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Messages.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/NotebookPage.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/ParamsDialog.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/Preferences.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/StateCache.py +usr/lib/python2.7/dist-packages/gnuradio/grc/gui/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/convert_hier.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/expr_utils.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/extract_category.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/extract_docs.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/Block.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/Connection.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/Constants.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/FlowGraph.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/Generator.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/Param.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/Platform.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/Port.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/grc/python/block.dtd +usr/lib/python2.7/dist-packages/gnuradio/grc/python/default_flow_graph.grc +usr/lib/python2.7/dist-packages/gnuradio/grc/python/flow_graph.tmpl +usr/bin/grc +usr/bin/usrp2_probe +usr/bin/usrp_probe --- gnuradio-3.2.2.dfsg.orig/debian/python-gnuradio-video-sdl.install +++ gnuradio-3.2.2.dfsg/debian/python-gnuradio-video-sdl.install @@ -0,0 +1,3 @@ +usr/lib/python2.7/dist-packages/gnuradio/video_sdl.py +usr/lib/python2.7/dist-packages/gnuradio/_video_sdl.la +usr/lib/python2.7/dist-packages/gnuradio/_video_sdl.so --- gnuradio-3.2.2.dfsg.orig/debian/control +++ gnuradio-3.2.2.dfsg/debian/control @@ -0,0 +1,576 @@ +################################################################################ +# Single source deb for entire distribution # +################################################################################ + +Source: gnuradio +Section: comm +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Bdale Garbee +Build-Conflicts: automake1.8, automake1.9 +Build-Depends: automake, debhelper (>= 5), doxygen, ghostscript, guile-1.8, libasound2-dev, libaudio-dev, libblas-dev, libboost-dev, libboost-program-options-dev, libboost-thread-dev, libcppunit-dev, libfftw3-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev, libgsl0-dev, libjack-dev, libpng12-dev, libqt4-dev, libqt4-opengl-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, libsdl1.2-dev, libtool, libusb-dev, libwxgtk2.8-dev, libxext-dev, libxrender-dev, libxt-dev, pkg-config, portaudio19-dev, python-central, python-cheetah, python-dev, python-gtk2, python-lxml, python-numpy, python-qt4, python-qt4-dev, python-wxgtk2.8, sdcc, swig, texlive-latex-base, xdg-utils, xmlto +Standards-Version: 3.8.3 +XS-Python-Version: >=2.5 + +################################################################################ +# C++ auxiliary libraries # +################################################################################ + +Package: libgruel0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: GNU Radio Utility Etcetera Library + This package implements a variety of low-level utility + routines for GNU Radio. + +Package: libgruel-dev +Section: libdevel +Architecture: any +Depends: libgruel0 (= ${binary:Version}) +Description: GNU Radio Utility Etcetera Library + This package implements a variety of low-level utility + routines for GNU Radio. + . + This package contains header files needed by developers. + +Package: libgromnithread0 +Section: libs +Architecture: any +Replaces: libgnuradio-omnithread0c2a +Conflicts: libgnuradio-omnithread0c2a +Depends: ${shlibs:Depends} +Description: GNU Radio Omnithreads Abstraction Library + This package is a fork of the omniORB-4.0.1 threading library + for use with GNU Radio. + +Package: libgromnithread-dev +Section: libdevel +Architecture: any +Replaces: libgnuradio-omnithread0-dev +Conflicts: libgnuradio-omnithread0-dev +Depends: libgromnithread0 (= ${binary:Version}) +Description: GNU Radio Omnithreads Abstraction Library + This package is a fork of the omniORB-4.0.1 threading library + for use with GNU Radio. + . + This package contains header files needed by developers. + +Package: libpmt0 +Section: libs +Architecture: any +Replaces: libpmt0c2a +Conflicts: libpmt0c2a +Depends: libgromnithread0 (= ${binary:Version}), ${shlibs:Depends} +Description: GNU Radio Polymorphic Type Library + This package implements polymorphic types. These are similar + to lisp or Python data objects, and implement transparent + reference counting using the boost shared_ptr templates. + +Package: libpmt-dev +Section: libdevel +Architecture: any +Replaces: libpmt0-dev +Conflicts: libpmt0-dev +Depends: libpmt0 (= ${binary:Version}), libgromnithread-dev (= ${binary:Version}) +Description: GNU Radio Polymorphic Type Library + This package implements polymorphic types. These are similar + to lisp or Python data objects, and implement transparent + reference counting using the boost shared_ptr templates. + . + This package contains header files needed by developers. + +################################################################################ +# C++ M-Block library packages # +################################################################################ + +Package: libmblock0 +Section: libs +Architecture: any +Replaces: libmblock0c2a +Conflicts: libmblock0c2a +Depends: libpmt0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}, guile-1.8 +Description: GNU Radio Message Block Library + This package provides the GNU Radio message block library. + +Package: libmblock-dev +Section: libdevel +Architecture: any +Replaces: libmblock0-dev +Conflicts: libmblock0-dev +Depends: libmblock0 (= ${binary:Version}), libgromnithread-dev (= ${binary:Version}), libpmt-dev (= ${binary:Version}) +Description: GNU Radio Message Block Library + This package provides the GNU Radio message block library. + . + This package contains header files needed by developers. + +################################################################################ +# C++ USRP/USRP2 library packages # +################################################################################ + +Package: libusrp0 +Section: comm +Architecture: any +Depends: ${shlibs:Depends}, adduser +Replaces: libusrp0c2a, usrp-firmware +Conflicts: usrp-firmware +Suggests: usrp-doc +Description: Client side library for the USRP(1) hardware + The Universal Software Radio Peripheral (USRP) is an USB-connected, + low-cost and open board. It features four high-speed analog-to-digital + and digital-to-analog converters, an FPGA and a microcontroller. It's + ideal for capturing or transmitting various signals, usually in + combination with GNU Radio. The design schemas are available under a + free license. + . + This package contains the client-side library, providing an easy interface + for communicating with the USRP. + +Package: libusrp-dev +Section: libdevel +Architecture: any +Replaces: libusrp0-dev +Depends: libusrp0 (= ${binary:Version}), libusb-dev, libboost-thread-dev +Description: Client side library for the USRP(1) hardware + The Universal Software Radio Peripheral (USRP) is an USB-connected, + low-cost and open board. It features four high-speed analog-to-digital + and digital-to-analog converters, an FPGA and a microcontroller. It's + ideal for capturing or transmitting various signals, usually in + combination with GNU Radio. The design schemas are available under a + free license. + . + This package contains the client-side library, providing an easy interface + for communicating with the USRP. + . + This package contains header files needed by developers. + +Package: libusrp2-0 +Section: comm +Architecture: any +Depends: libgruel0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}, adduser +Description: Client side library for the USRP2 hardware + The Universal Software Radio Peripheral 2 (USRP2) is a GbE-connected, + low-cost and open board. It features two high-speed analog-to-digital + and digital-to-analog converters, an FPGA and a microcontroller. It's + ideal for capturing or transmitting various signals, usually in + combination with GNU Radio. The design schemas are available under a + free license. + . + This package contains the client-side C++ library, providing the low- + level (non-GNU Radio) hardware interface. + +Package: libusrp2-dev +Section: libdevel +Architecture: any +Depends: libusrp2-0 (= ${binary:Version}), libboost-thread-dev, libgromnithread-dev (= ${binary:Version}), libgruel-dev (= ${binary:Version}) +Description: Client side library for the USRP2 hardware + The Universal Software Radio Peripheral 2 (USRP2) is a GbE-connected, + low-cost and open board. It features two high-speed analog-to-digital + and digital-to-analog converters, an FPGA and a microcontroller. It's + ideal for capturing or transmitting various signals, usually in + combination with GNU Radio. The design schemas are available under a + free license. + . + This package contains the client-side C++ library, providing the low- + level (non-GNU Radio) hardware interface. + . + This package contains header files needed by developers. + +################################################################################ +# C++ GNU Radio block library packages # +################################################################################ + +Package: libgnuradio-core0 +Section: libs +Architecture: any +Depends: libgruel0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs:Depends} +Conflicts: libgnuradio-core0c2, libgnuradio-core0c2a +Replaces: libgnuradio-core0c2, libgnuradio-core0c2a +Suggests: gnuradio-doc +Description: The GNU Sofware Radio Core Library + This package contains the core GNU Radio libraries. + +Package: libgnuradio-core-dev +Section: libdevel +Architecture: any +Replaces: libgnuradio-core0-dev +Conflicts: libgnuradio-core0-dev +Depends: libgnuradio-core0 (= ${binary:Version}), libgruel-dev (= ${binary:Version}), libgromnithread-dev (= ${binary:Version}), libboost-thread-dev, libboost-date-time-dev, libgsl0-dev, libatlas-base-dev, libfftw3-dev, swig +Description: The GNU Software Radio Core Library + This package contains the core GNU Radio libraries. + . + This package contains header files needed by developers. + +Package: libgnuradio-audio-alsa0 +Section: libs +Architecture: any +Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends} +Description: GNU Radio C++ block for ALSA sound system + This package contains the ALSA sound system driver for GNU Radio. + +Package: libgnuradio-audio-alsa-dev +Section: libdevel +Architecture: any +Depends: libgnuradio-audio-alsa0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libasound2-dev +Description: GNU Radio C++ block for ALSA sound system + This package contains the ALSA sound system driver for GNU Radio. + . + This package contains header files needed by developers. + +Package: libgnuradio-qtgui0 +Section: libs +Architecture: any +Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends} +Description: GNU Radio C++ blocks fro QT-based GUI applications + This package contains the C++ library for using GNU Radio inside + QT-based GUI applications. + +Package: libgnuradio-qtgui-dev +Section: libdevel +Architecture: any +Depends: libgnuradio-qtgui0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libqt4-dev, libqwtplot3d-qt4-dev +Description: GNU Radio C++ blocks fro QT-based GUI applications + This package contains the C++ library for using GNU Radio inside + QT-based GUI applications. + . + This package contains header files needed by developers. + +Package: libgnuradio-usrp0 +Section: libs +Architecture: any +Depends: libgnuradio-core0 (= ${binary:Version}), libusrp0 (= ${binary:Version}), ${shlibs:Depends} +Description: GNU Radio C++ blocks for USRP(1) hardware + This package contains the C++ API blocks for the Universal Software Radio + Peripheral. + +Package: libgnuradio-usrp-dev +Section: libdevel +Architecture: any +Depends: libgnuradio-usrp0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp-dev (= ${binary:Version}) +Description: GNU Radio C++ blocks for USRP(1) hardware + This package contains the C++ API blocks for the Universal Software Radio + Peripheral. + . + This package contains header files needed by developers. + +Package: libgnuradio-usrp2-0 +Section: libs +Architecture: any +Depends: libgnuradio-core0 (= ${binary:Version}), libusrp2-0 (= ${binary:Version}), ${shlibs:Depends} +Description: GNU Radio C++ blocks for USRP2 hardware + This package contains the C++ API blocks for the Universal Software Radio + Peripheral 2. + +Package: libgnuradio-usrp2-dev +Section: libdevel +Architecture: any +Depends: libgnuradio-usrp2-0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp2-dev (= ${binary:Version}) +Description: GNU Radio C++ blocks for USRP2 hardware + This package contains the C++ API blocks for the Universal Software Radio + Peripheral 2. + . + This package contains header files needed by developers. + +################################################################################ +# Python libraries for USRP # +################################################################################ + +Package: python-usrp +Architecture: any +Depends: ${python:Depends}, libusrp0 (= ${binary:Version}), ${shlibs:Depends} +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: Python bindings for the USRP library + This package provides auxiliary routines in Python for manipulating the USRP + hardware. + +################################################################################ +# Python libraries for GNU Radio components # +################################################################################ + +Package: python-gnuradio-core +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-numpy +Conflicts: python-gnuradio (< 3.2) +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: Python bindings for GNU Radio core library + This package provides the modules that enable one to use gnuradio + from Python scripts. + +Package: python-gnuradio-wxgui +Architecture: any +Depends: ${python:Depends}, python-gnuradio-core (= ${binary:Version}), python-wxgtk2.8, python-opengl, python-numpy +Conflicts: python-wxgtk2.6 +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: GNU Radio Graphical Interface Routines based on wxPython + This package provides high level GUI construction classes based + upon the wxPython bindings for wxWidgets. + +Package: python-gnuradio-usrp +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, python-usrp +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: Python bindings for GNU Radio USRP driver + This package provides the Python interface to the GNU Radio USRP + driver and daughterboard drivers. + +Package: python-gnuradio-usrp2 +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: Python bindings for GNU Radio USRP driver + This package provides the Python interface to the GNU Radio USRP + driver and daughterboard drivers. + +Package: python-gnuradio-audio-alsa +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa0 (= ${binary:Version}), python-gnuradio-core +Section: python +Provides: ${python:Provides}, python-gnuradio-audio +XB-Python-Version: ${python:Versions} +Description: Python bindings for GNU Radio ALSA audio driver + This package provides the Python wrappers around the GNU Radio ALSA + audio driver. + +Package: python-gnuradio-audio-portaudio +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core +Provides: ${python:Provides}, python-gnuradio-audio +Section: python +XB-Python-Version: ${python:Versions} +Description: GNU Radio Python PortAudio Driver + This package provides the Python interface to the GNU Radio driver + for the PortAudio audio system. + +Package: python-gnuradio-audio-jack +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core +Section: python +Provides: ${python:Provides}, python-gnuradio-audio +XB-Python-Version: ${python:Versions} +Description: GNU Radio Python JACK Audio Driver + This package provides the Python interface to the GNU Radio driver + for the JACK audio system. + +Package: python-gnuradio-audio-oss +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core +Section: python +Provides: ${python:Provides}, python-gnuradio-audio +XB-Python-Version: ${python:Versions} +Description: GNU Radio Python OSS Audio Driver + This package provides the Python interface to the GNU Radio driver + for the OSS audio system. + +Package: python-gnuradio-cvsd-vocoder +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: GNU Radio CVSD Vocoder + This package provides an implementation of a CVSD vocoder for + GNU Radio. + +Package: python-gnuradio-gsm-fr-vocoder +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: GNU Radio GSM Full-Rate Vocoder + This package provides an implementation of a full-rate GSM vocoder + for GNU Radio. + +Package: python-gnuradio-qtgui +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui0 (= ${binary:Version}), python-gnuradio-core +Section: python +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Python bindings for GNU Radio ALSA audio driver + This package provides the Python wrappers around the GNU Radio QT + GUI C++ blocks. + +Package: python-gnuradio-trellis +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: GNU Radio Trellis-Coded Modulation library + This package provides an implementation of trellis-coded modulation + for GNU Radio. + +Package: python-gnuradio-video-sdl +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: GNU Radio SDL Interface Library + This package provides an interface to the SDL rendering library + for GNU Radio. + +################################################################################ +# GNU Radio Utilities, Examples, and Applications # +################################################################################ + +Package: gnuradio-utils +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-usrp2, python-gnuradio-wxgui, python-matplotlib, python-tk, python-scipy +Provides: ${python:Provides} +Section: comm +XB-Python-Version: ${python:Versions} +Description: GNU Radio Utilities + This package provides commonly used utilities for GNU Radio + +Package: gnuradio-examples +Architecture: any +Depends: ${python:Depends}, python-gnuradio-core +Provides: ${python:Provides} +Recommends: python-gnuradio-wxgui, python-gnuradio +Section: comm +XB-Python-Version: ${python:Versions} +Description: GNU Radio Example Programs + This package provides examples of GNU Radio usage using Python. + +Package: gnuradio-pager +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp +Provides: ${python:Provides} +Section: comm +XB-Python-Version: ${python:Versions} +Description: GNU Radio FLEX Pager Decoder + This package provides a decoder for the FLEX paging protocol for GNU Radio + +Package: gnuradio-sounder +Architecture: any +Replaces: gnuradio-sounder-firmware +Conflicts: gnuradio-sounder-firmware +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp +Provides: ${python:Provides} +Section: comm +XB-Python-Version: ${python:Versions} +Description: GNU Radio Channel Sounder Application + This package provides an RF channel sounder application for GNU Radio + +Package: gnuradio-gpio +Architecture: any +Replaces: gnuradio-gpio-firmware +Conflicts: gnuradio-gpio-firmware +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp +Provides: ${python:Provides} +Section: comm +XB-Python-Version: ${python:Versions} +Description: GNU Radio Streaming Digital Application + This package provides streaming digital GPIO capabilities for GNU Radio + +Package: gnuradio-radar-mono +Architecture: any +Replaces: gnuradio-radar-mono-firmware +Conflicts: gnuradio-radar-mono-firmware +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp +Provides: ${python:Provides} +Section: comm +XB-Python-Version: ${python:Versions} +Description: GNU Radio Monostatic Radar Application + This package provides a monostatic radar application for GNU Radio + +Package: gnuradio-radio-astronomy +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-wxgui +Provides: ${python:Provides} +Section: comm +XB-Python-Version: ${python:Versions} +Description: GNU Radio Radio Astronomy Applications + This package provides radio astronomy applications for GNU Radio + +Package: gnuradio-companion +Architecture: any +Depends: ${python:Depends}, gnuradio, gnuradio-doc, usrp-doc, python-lxml, python-cheetah, python-gtk2 +Provides: ${python:Provides} +Section: comm +XB-Python-Version: ${python:Versions} +Description: The GNU Radio Companion + GRC is a graphical flowgraph editor for the GNU Software Radio + +################################################################################ +# Documentation packages # +################################################################################ + +Package: gnuradio-doc +Section: doc +Architecture: all +Description: Software Defined Radio + This package contains the documentation for the GNU Radio software + defined radio system. + +Package: usrp-doc +Section: doc +Architecture: all +Description: Software Defined Radio + This package contains the documentation for the Universal Software Radio + Peripheral (USRP) hardware and interface library. + +################################################################################ +# Meta-packages # +################################################################################ + +Package: libgnuradio +Section: libs +Architecture: all +Depends: libgnuradio-core0 +Recommends: libgnuradio-audio-alsa0, libgnuradio-qtqui, libgnuradio-usrp0, libgnuradio-usrp2-0 +Description: GNU Radio C++ API libraries + This is a virtual package that depends, recommends, or suggests all of the + binary packages that make up the GNU Radio C++ API. For development headers, + install libgnuradio-dev. + +Package: libgnuradio-dev +Section: libdevel +Architecture: all +Depends: libgnuradio (= ${binary:Version}), libgnuradio-core-dev +Recommends: libgnuradio-audio-alsa-dev, libgnuradio-qtgui-dev, libgnuradio-usrp-dev, libgnuradio-usrp2-dev, +Suggests: gnuradio-doc, usrp-doc +Replaces: gnuradio-dev +Description: Development headers for GNU Radio C++ development + This is a virtual package that depends or recommends the development header + packages for the GNU Radio C++ API. It is only needed if you intend + to develop custom GNU Radio signal processing blocks in C++. + +Package: python-gnuradio +Section: python +Architecture: all +Depends: python-gnuradio-core +Recommends: python-gnuradio-wxgui, python-gnuradio-audio-alsa | python-gnuradio-audio, python-gnuradio-cvsd-vocoder, python-gnuradio-gsm-fr-vocoder, python-gnuradio-qtgui, python-gnuradio-trellis, python-gnuradio-video-sdl, python-gnuradio-usrp, python-gnuradio-usrp2 +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Python Libraries for GNU Radio Components + This is a virtual package that depends or recommends all of the packages that + make up the GNU Radio Python API. + +Package: gnuradio-apps +Section: comm +Architecture: all +Depends: gnuradio-gpio, gnuradio-pager, gnuradio-sounder, gnuradio-radio-astronomy, gnuradio-radar-mono +Description: The GNU Software Radio Toolkit - applications + This is a virtual package that depends on top-level GNU Radio application + packages. + +Package: gnuradio +Section: comm +Architecture: all +Recommends: libgnuradio, libgnuradio-dev, gnuradio-doc, python-gnuradio, gnuradio-utils, gnuradio-examples, gnuradio-apps +Description: The GNU Software Radio Toolkit + This is a virtual package that installs the entire GNU Radio and USRP software + set. --- gnuradio-3.2.2.dfsg.orig/debian/gnuradio-doc.install +++ gnuradio-3.2.2.dfsg/debian/gnuradio-doc.install @@ -0,0 +1,3 @@ +usr/share/doc/gnuradio*/README* /usr/share/doc/gnuradio-doc +usr/share/doc/gnuradio*/html usr/share/doc/gnuradio-doc +usr/share/doc/gnuradio*/xml usr/share/doc/gnuradio-doc --- gnuradio-3.2.2.dfsg.orig/debian/python-gnuradio-cvsd-vocoder.install +++ gnuradio-3.2.2.dfsg/debian/python-gnuradio-cvsd-vocoder.install @@ -0,0 +1,4 @@ +usr/lib/python2.7/dist-packages/gnuradio/blks2impl/cvsd.py +usr/lib/python2.7/dist-packages/gnuradio/vocoder/cvsd_vocoder.py +usr/lib/python2.7/dist-packages/gnuradio/vocoder/_cvsd_vocoder.la +usr/lib/python2.7/dist-packages/gnuradio/vocoder/_cvsd_vocoder.so --- gnuradio-3.2.2.dfsg.orig/debian/libgnuradio-audio-alsa0.install +++ gnuradio-3.2.2.dfsg/debian/libgnuradio-audio-alsa0.install @@ -0,0 +1,3 @@ +usr/lib/libgnuradio-audio-alsa.la +usr/lib/libgnuradio-audio-alsa.so.* +etc/gnuradio/conf.d/gr-audio-alsa.conf --- gnuradio-3.2.2.dfsg.orig/debian/libusrp2-dev.install +++ gnuradio-3.2.2.dfsg/debian/libusrp2-dev.install @@ -0,0 +1,13 @@ +usr/include/usrp2/copiers.h +usr/include/usrp2/copy_handler.h +usr/include/usrp2/data_handler.h +usr/include/usrp2/metadata.h +usr/include/usrp2/mimo_config.h +usr/include/usrp2/rx_nop_handler.h +usr/include/usrp2/rx_sample_handler.h +usr/include/usrp2/strtod_si.h +usr/include/usrp2/tune_result.h +usr/include/usrp2/usrp2.h +usr/include/usrp2/usrp2_cdefs.h +usr/lib/libusrp2.so +usr/lib/pkgconfig/usrp2.pc --- gnuradio-3.2.2.dfsg.orig/debian/python-gnuradio-trellis.install +++ gnuradio-3.2.2.dfsg/debian/python-gnuradio-trellis.install @@ -0,0 +1,32 @@ +usr/lib/python2.7/dist-packages/gnuradio/trellis.py +usr/lib/python2.7/dist-packages/gnuradio/_trellis.la +usr/lib/python2.7/dist-packages/gnuradio/_trellis.so +usr/share/gnuradio/examples/trellis/README +usr/share/gnuradio/examples/trellis/fsm_utils.py +usr/share/gnuradio/examples/trellis/test_tcm.py +usr/share/gnuradio/examples/trellis/test_tcm1.py +usr/share/gnuradio/examples/trellis/test_tcm2.py +usr/share/gnuradio/examples/trellis/test_tcm_parallel.py +usr/share/gnuradio/examples/trellis/test_tcm_combined.py +usr/share/gnuradio/examples/trellis/test_sccc_hard.py +usr/share/gnuradio/examples/trellis/test_sccc_soft.py +usr/share/gnuradio/examples/trellis/test_sccc_turbo.py +usr/share/gnuradio/examples/trellis/test_viterbi_equalization1.py +usr/share/gnuradio/examples/trellis/test_viterbi_equalization.py +usr/share/gnuradio/examples/trellis/test_turbo_equalization.py +usr/share/gnuradio/examples/trellis/test_turbo_equalization1.py +usr/share/gnuradio/examples/trellis/test_turbo_equalization2.py +usr/share/gnuradio/examples/trellis/fsm_files/awgn1o2_128.fsm +usr/share/gnuradio/examples/trellis/fsm_files/awgn1o2_16.fsm +usr/share/gnuradio/examples/trellis/fsm_files/awgn1o2_4.fsm +usr/share/gnuradio/examples/trellis/fsm_files/awgn1o2_8.fsm +usr/share/gnuradio/examples/trellis/fsm_files/awgn2o3_16.fsm +usr/share/gnuradio/examples/trellis/fsm_files/awgn2o3_4.fsm +usr/share/gnuradio/examples/trellis/fsm_files/awgn2o3_4_msb.fsm +usr/share/gnuradio/examples/trellis/fsm_files/awgn2o3_4_msbG.fsm +usr/share/gnuradio/examples/trellis/fsm_files/awgn2o3_8.fsm +usr/share/gnuradio/examples/trellis/fsm_files/awgn2o4_4.fsm +usr/share/gnuradio/examples/trellis/fsm_files/disconnected.fsm +usr/share/gnuradio/examples/trellis/fsm_files/rep3.fsm +usr/share/gnuradio/examples/trellis/fsm_files/rep5.fsm +usr/share/gnuradio/examples/trellis/fsm_files/simple.fsm --- gnuradio-3.2.2.dfsg.orig/debian/libgruel-dev.dirs +++ gnuradio-3.2.2.dfsg/debian/libgruel-dev.dirs @@ -0,0 +1,2 @@ +usr/lib/pkgconfig +usr/include/gruel --- gnuradio-3.2.2.dfsg.orig/debian/libpmt0.install +++ gnuradio-3.2.2.dfsg/debian/libpmt0.install @@ -0,0 +1,2 @@ +usr/lib/libpmt.la +usr/lib/libpmt.so.* --- gnuradio-3.2.2.dfsg.orig/debian/libusrp2-0.install +++ gnuradio-3.2.2.dfsg/debian/libusrp2-0.install @@ -0,0 +1,5 @@ +usr/lib/libusrp2.la +usr/lib/libusrp2.so.* +usr/bin/usrp2_socket_opener +usr/bin/find_usrps +etc/security/limits.d/libusrp2-0.limits --- gnuradio-3.2.2.dfsg.orig/debian/python-usrp.install +++ gnuradio-3.2.2.dfsg/debian/python-usrp.install @@ -0,0 +1,6 @@ +usr/lib/python2.7/dist-packages/usrpm/_usrp_prims.la +usr/lib/python2.7/dist-packages/usrpm/_usrp_prims.so +usr/lib/python2.7/dist-packages/usrpm/usrp_prims.py +usr/lib/python2.7/dist-packages/usrpm/__init__.py +usr/lib/python2.7/dist-packages/usrpm/usrp_fpga_regs.py +usr/lib/python2.7/dist-packages/usrpm/usrp_dbid.py --- gnuradio-3.2.2.dfsg.orig/debian/libgnuradio-audio-alsa-dev.install +++ gnuradio-3.2.2.dfsg/debian/libgnuradio-audio-alsa-dev.install @@ -0,0 +1,4 @@ +usr/include/gnuradio/audio_alsa_sink.h +usr/include/gnuradio/audio_alsa_source.h +usr/lib/libgnuradio-audio-alsa.so +usr/lib/pkgconfig/gr-audio-alsa.pc --- gnuradio-3.2.2.dfsg.orig/debian/compat +++ gnuradio-3.2.2.dfsg/debian/compat @@ -0,0 +1 @@ +5 --- gnuradio-3.2.2.dfsg.orig/debian/python-gnuradio-usrp.install +++ gnuradio-3.2.2.dfsg/debian/python-gnuradio-usrp.install @@ -0,0 +1,4 @@ +usr/lib/python2.7/dist-packages/gnuradio/usrp/usrp_swig.py +usr/lib/python2.7/dist-packages/gnuradio/usrp/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/usrp/_usrp_swig.la +usr/lib/python2.7/dist-packages/gnuradio/usrp/_usrp_swig.so --- gnuradio-3.2.2.dfsg.orig/debian/python-gnuradio-wxgui.install +++ gnuradio-3.2.2.dfsg/debian/python-gnuradio-wxgui.install @@ -0,0 +1,41 @@ +etc/gnuradio/conf.d/gr-wxgui.conf +usr/lib/python2.7/dist-packages/gnuradio/wxgui/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/common.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/constants.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/constsink_gl.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/const_window.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/form.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/fftsink2.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/fftsink_nongl.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/fftsink_gl.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/fft_window.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/gui.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/histosink_gl.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/histo_window.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/numbersink2.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/number_window.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/plot.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/powermate.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/pubsub.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/scopesink2.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/scopesink_nongl.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/scopesink_gl.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/scope_window.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/waterfallsink2.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/waterfallsink_nongl.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/waterfallsink_gl.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/waterfall_window.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/slider.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/stdgui2.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/forms/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/forms/forms.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/forms/converters.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/plotter/__init__.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/plotter/bar_plotter.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/plotter/channel_plotter.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/plotter/common.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/plotter/gltext.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/plotter/grid_plotter_base.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/plotter/plotter_base.py +usr/lib/python2.7/dist-packages/gnuradio/wxgui/plotter/waterfall_plotter.py +usr/lib/pkgconfig/gr-wxgui.pc --- gnuradio-3.2.2.dfsg.orig/debian/copyright +++ gnuradio-3.2.2.dfsg/debian/copyright @@ -0,0 +1,144 @@ +GNU Radio was re-packaged by Bdale Garbee to reflect +upstream restructuring on Wed, 6 Sep 2006 16:02:03 -0600. Much was +learned and portions were taken from the previous Debian packages built +by Ramakrishnan Muthukrishnan and Steinar H. Gunderson. + +GNU Radio was downloaded from http://gnuradio.org/ + +Upstream Authors: + Eric Blossom + Matt Ettus + Johnathan Corgan + +See the AUTHORS file for a more complete list of contributors. +The current upstream maintainer is Johnathan Corgan. + +Copyright: + +GNU Radio is copyrighted by the Free Software Foundation and is licensed +under the GNU General Public License (GPL), version 3 or later, a copy of +which is available on a Debian system at: + + /usr/share/common-licenses/GPL + +The GNU Radio source distribution also incorporates a few components that +carry other copyrights and license assertions, as follows: + +gcell/ibm/sync/ppu_source/* +gcell/ibm/sync/spu_source/* + (C)Copyright 2001,2007, + International Business Machines Corporation, + Sony Computer Entertainment, Incorporated, + Toshiba Corporation, + + All Rights Reserved. + + Redistribution and use in source and binary forms, with or + without modification, are permitted provided that the + following conditions are met: + + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + - Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials + provided with the distribution. + + - Neither the name of IBM Corporation nor the names of its + contributors may be used to endorse or promote products + derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + The gcell subsystem is not included in Debian binary package builds. + +gnuradio-core/src/lib/g72x/* + This source code is released by Sun Microsystems, Inc. to the public + domain. Please give your acknowledgement in product literature if + this code is used in your product implementation. + +gnuradio-core/src/lib/general/malloc16.c + Copyright 2001 Phil Karn, KA9Q + May be used under the terms of the GNU Public License (GPL) + +gnuradio-core/src/lib/reed-solomon/* + Copyright 2002, Phil Karn, KA9Q + May be used under the terms of the GNU Public License (GPL) + +gr-gsm-fr-vocoders/src/lib/gsm/* + Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann, + Technische Universitaet Berlin + + Permission to use, copy, modify, and distribute this software + for any purpose with or without fee is hereby granted, + provided that this notice is not removed and that neither + the authors nor the Technische Universitaet Berlin are + deemed to have made any representations as to the suitability + of this software for any purpose nor are held responsible + for any defects of this software. THERE IS ABSOLUTELY NO + WARRANTY FOR THIS SOFTWARE. + +gruel/src/include/gruel/thread_group.h + Copyright (C) 2001-2003 William E. Kempf + Copyright (C) 2007 Anthony Williams + Copyright 2008 Free Software Foundation, Inc. + + The original was distributed under the Boost Software License, + Version 1.0, but this derivative work is now covered by the overall + license assertion for GNU Radio. + +gnuradio-core/src/lib/general/gr_remez.cc + Copyright (c) 1995,1998 Jake Janovetz (janovetz@uiuc.edu) + Copyright (c) 2004 Free Software Foundation, Inc. + + The original was distributed under LGPL version 2 or later, this + derivative work is now covered by the overall license assertion + for GNU Radio. + +gr-gpio/src/fpga/include/common_config*.vh + Copyright (C) 2006,2007 Matt Ettus + Copyright (C) 2008 Corgan Enterprises LLC + + The original was distributed under GPL version 2 or later, this + derivative work is now covered by the overall license assertion + for GNU Radio. + +gr-wxgui/src/python/plot.py + (C) 2002, 2007 Gordon Williams + + The original was licensed "Use as you wish", this derivative work + is now covered by the overall license assertion for GNU Radio. + +gr-wxgui/src/python/plotter/gltext.py + Copyright (C) 2007 Christian Brugger, Stefan Hacker + + The original was distributed under GPL version 2 or later, this + derivative work is now covered by the overall license assertion + for GNU Radio. + +Various files in the omnithread library carry these copyrights: + Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 1994,1995,1996,1997 Olivetti & Oracle Research Laboratory + Copyright Wavetek Wandel & Goltermann, Plymouth. + Copyright (C) 1994,1995,1996, 1997 Immisch, becker & Partner + Copyright (C) 1998 Steven Brennes + Copyright (C) 1995-1999 AT&T Laboratories Cambridge + + The original omnithread library was distributed under LGPL version 2 + or later, this derivative work is now covered by the overall license + assertion for GNU Radio. + --- gnuradio-3.2.2.dfsg.orig/debian/libgnuradio-core-dev.dirs +++ gnuradio-3.2.2.dfsg/debian/libgnuradio-core-dev.dirs @@ -0,0 +1,3 @@ +usr/lib/pkgconfig +usr/include/gnuradio +usr/include/gnuradio/swig --- gnuradio-3.2.2.dfsg.orig/debian/libgnuradio-core0.install +++ gnuradio-3.2.2.dfsg/debian/libgnuradio-core0.install @@ -0,0 +1,3 @@ +etc/gnuradio/conf.d/gnuradio-core.conf +usr/lib/libgnuradio-core.la +usr/lib/libgnuradio-core.so.* --- gnuradio-3.2.2.dfsg.orig/debian/libgnuradio-qtgui0.install +++ gnuradio-3.2.2.dfsg/debian/libgnuradio-qtgui0.install @@ -0,0 +1,2 @@ +usr/lib/libgnuradio-qtgui.la +usr/lib/libgnuradio-qtgui.so.* --- gnuradio-3.2.2.dfsg.orig/debian/libusrp0.dirs +++ gnuradio-3.2.2.dfsg/debian/libusrp0.dirs @@ -0,0 +1,3 @@ +etc/udev/rules.d +/usr/share/usrp/rev2 +/usr/share/usrp/rev4 --- gnuradio-3.2.2.dfsg.orig/debian/python-gnuradio-usrp2.install +++ gnuradio-3.2.2.dfsg/debian/python-gnuradio-usrp2.install @@ -0,0 +1,3 @@ +usr/lib/python2.7/dist-packages/gnuradio/usrp2.py +usr/lib/python2.7/dist-packages/gnuradio/_usrp2.la +usr/lib/python2.7/dist-packages/gnuradio/_usrp2.so --- gnuradio-3.2.2.dfsg.orig/debian/libgnuradio-core-dev.install +++ gnuradio-3.2.2.dfsg/debian/libgnuradio-core-dev.install @@ -0,0 +1,720 @@ +usr/include/gnuradio/gr_fir_ccc.h +usr/include/gnuradio/gr_fir_ccc_generic.h +usr/include/gnuradio/gr_fir_ccf.h +usr/include/gnuradio/gr_fir_ccf_generic.h +usr/include/gnuradio/gr_fir_fcc.h +usr/include/gnuradio/gr_fir_fcc_generic.h +usr/include/gnuradio/gr_fir_fff.h +usr/include/gnuradio/gr_fir_fff_generic.h +usr/include/gnuradio/gr_fir_filter_ccc.h +usr/include/gnuradio/gr_fir_filter_ccf.h +usr/include/gnuradio/gr_fir_filter_fcc.h +usr/include/gnuradio/gr_fir_filter_fff.h +usr/include/gnuradio/gr_fir_filter_fsf.h +usr/include/gnuradio/gr_fir_filter_scc.h +usr/include/gnuradio/gr_fir_fsf.h +usr/include/gnuradio/gr_fir_fsf_generic.h +usr/include/gnuradio/gr_fir_scc.h +usr/include/gnuradio/gr_fir_scc_generic.h +usr/include/gnuradio/gr_fir_sysconfig.h +usr/include/gnuradio/gr_fir_sysconfig_generic.h +usr/include/gnuradio/gr_fir_util.h +usr/include/gnuradio/gr_freq_xlating_fir_filter_ccc.h +usr/include/gnuradio/gr_freq_xlating_fir_filter_ccf.h +usr/include/gnuradio/gr_freq_xlating_fir_filter_fcc.h +usr/include/gnuradio/gr_freq_xlating_fir_filter_fcf.h +usr/include/gnuradio/gr_freq_xlating_fir_filter_scc.h +usr/include/gnuradio/gr_freq_xlating_fir_filter_scf.h +usr/include/gnuradio/gr_interp_fir_filter_ccc.h +usr/include/gnuradio/gr_interp_fir_filter_ccf.h +usr/include/gnuradio/gr_interp_fir_filter_fcc.h +usr/include/gnuradio/gr_interp_fir_filter_fff.h +usr/include/gnuradio/gr_interp_fir_filter_fsf.h +usr/include/gnuradio/gr_interp_fir_filter_scc.h +usr/include/gnuradio/gr_rational_resampler_base_ccc.h +usr/include/gnuradio/gr_rational_resampler_base_ccf.h +usr/include/gnuradio/gr_rational_resampler_base_fcc.h +usr/include/gnuradio/gr_rational_resampler_base_fff.h +usr/include/gnuradio/gr_rational_resampler_base_fsf.h +usr/include/gnuradio/gr_rational_resampler_base_scc.h +usr/include/gnuradio/complex_dotprod_generic.h +usr/include/gnuradio/complex_dotprod_x86.h +usr/include/gnuradio/fcomplex_dotprod_x86.h +usr/include/gnuradio/ccomplex_dotprod_generic.h +usr/include/gnuradio/ccomplex_dotprod_x86.h +usr/include/gnuradio/float_dotprod_generic.h +usr/include/gnuradio/float_dotprod_x86.h +usr/include/gnuradio/gr_adaptive_fir_ccf.h +usr/include/gnuradio/gr_altivec.h +usr/include/gnuradio/gr_cma_equalizer_cc.h +usr/include/gnuradio/gr_cpu.h +usr/include/gnuradio/gr_fft_filter_ccc.h +usr/include/gnuradio/gr_fft_filter_fff.h +usr/include/gnuradio/gr_filter_delay_fc.h +usr/include/gnuradio/gr_fir_sysconfig_x86.h +usr/include/gnuradio/gr_fir_sysconfig_powerpc.h +usr/include/gnuradio/gr_fractional_interpolator_ff.h +usr/include/gnuradio/gr_fractional_interpolator_cc.h +usr/include/gnuradio/gr_goertzel_fc.h +usr/include/gnuradio/gr_hilbert_fc.h +usr/include/gnuradio/gr_iir_filter_ffd.h +usr/include/gnuradio/gr_rotator.h +usr/include/gnuradio/gr_sincos.h +usr/include/gnuradio/gr_single_pole_iir.h +usr/include/gnuradio/gr_single_pole_iir_filter_ff.h +usr/include/gnuradio/gr_single_pole_iir_filter_cc.h +usr/include/gnuradio/gr_vec_types.h +usr/include/gnuradio/gri_goertzel.h +usr/include/gnuradio/gri_iir.h +usr/include/gnuradio/gri_mmse_fir_interpolator.h +usr/include/gnuradio/gri_mmse_fir_interpolator_cc.h +usr/include/gnuradio/qa_filter.h +usr/include/gnuradio/short_dotprod_generic.h +usr/include/gnuradio/short_dotprod_x86.h +usr/include/gnuradio/sse_debug.h +usr/include/gnuradio/swig/filter.i +usr/include/gnuradio/swig/filter_generated.i +usr/include/gnuradio/swig/gr_adaptive_fir_ccf.i +usr/include/gnuradio/swig/gr_cma_equalizer_cc.i +usr/include/gnuradio/swig/gr_fft_filter_ccc.i +usr/include/gnuradio/swig/gr_fft_filter_fff.i +usr/include/gnuradio/swig/gr_filter_delay_fc.i +usr/include/gnuradio/swig/gr_fractional_interpolator_ff.i +usr/include/gnuradio/swig/gr_fractional_interpolator_cc.i +usr/include/gnuradio/swig/gr_goertzel_fc.i +usr/include/gnuradio/swig/gr_hilbert_fc.i +usr/include/gnuradio/swig/gr_iir_filter_ffd.i +usr/include/gnuradio/swig/gr_single_pole_iir_filter_ff.i +usr/include/gnuradio/swig/gr_single_pole_iir_filter_cc.i +usr/include/gnuradio/swig/gr_fir_filter_ccc.i +usr/include/gnuradio/swig/gr_fir_filter_ccf.i +usr/include/gnuradio/swig/gr_fir_filter_fcc.i +usr/include/gnuradio/swig/gr_fir_filter_fff.i +usr/include/gnuradio/swig/gr_fir_filter_fsf.i +usr/include/gnuradio/swig/gr_fir_filter_scc.i +usr/include/gnuradio/swig/gr_freq_xlating_fir_filter_ccc.i +usr/include/gnuradio/swig/gr_freq_xlating_fir_filter_ccf.i +usr/include/gnuradio/swig/gr_freq_xlating_fir_filter_fcc.i +usr/include/gnuradio/swig/gr_freq_xlating_fir_filter_fcf.i +usr/include/gnuradio/swig/gr_freq_xlating_fir_filter_scc.i +usr/include/gnuradio/swig/gr_freq_xlating_fir_filter_scf.i +usr/include/gnuradio/swig/gr_interp_fir_filter_ccc.i +usr/include/gnuradio/swig/gr_interp_fir_filter_ccf.i +usr/include/gnuradio/swig/gr_interp_fir_filter_fcc.i +usr/include/gnuradio/swig/gr_interp_fir_filter_fff.i +usr/include/gnuradio/swig/gr_interp_fir_filter_fsf.i +usr/include/gnuradio/swig/gr_interp_fir_filter_scc.i +usr/include/gnuradio/swig/gr_rational_resampler_base_ccc.i +usr/include/gnuradio/swig/gr_rational_resampler_base_ccf.i +usr/include/gnuradio/swig/gr_rational_resampler_base_fcc.i +usr/include/gnuradio/swig/gr_rational_resampler_base_fff.i +usr/include/gnuradio/swig/gr_rational_resampler_base_fsf.i +usr/include/gnuradio/swig/gr_rational_resampler_base_scc.i +usr/include/gnuradio/gr_agc_cc.h +usr/include/gnuradio/gr_agc_ff.h +usr/include/gnuradio/gr_agc2_cc.h +usr/include/gnuradio/gr_agc2_ff.h +usr/include/gnuradio/gr_align_on_samplenumbers_ss.h +usr/include/gnuradio/gr_bin_statistics_f.h +usr/include/gnuradio/gr_binary_slicer_fb.h +usr/include/gnuradio/gr_bytes_to_syms.h +usr/include/gnuradio/gr_char_to_float.h +usr/include/gnuradio/gr_check_counting_s.h +usr/include/gnuradio/gr_check_lfsr_32k_s.h +usr/include/gnuradio/gr_circular_file.h +usr/include/gnuradio/gr_clock_recovery_mm_cc.h +usr/include/gnuradio/gr_clock_recovery_mm_ff.h +usr/include/gnuradio/gr_complex_to_interleaved_short.h +usr/include/gnuradio/gr_complex_to_xxx.h +usr/include/gnuradio/gr_conjugate_cc.h +usr/include/gnuradio/gr_constellation_decoder_cb.h +usr/include/gnuradio/gr_correlate_access_code_bb.h +usr/include/gnuradio/gr_costas_loop_cc.h +usr/include/gnuradio/gr_count_bits.h +usr/include/gnuradio/gr_cpfsk_bc.h +usr/include/gnuradio/gr_crc32.h +usr/include/gnuradio/gr_ctcss_squelch_ff.h +usr/include/gnuradio/gr_dd_mpsk_sync_cc.h +usr/include/gnuradio/gr_decode_ccsds_27_fb.h +usr/include/gnuradio/gr_diff_decoder_bb.h +usr/include/gnuradio/gr_diff_encoder_bb.h +usr/include/gnuradio/gr_deinterleave.h +usr/include/gnuradio/gr_delay.h +usr/include/gnuradio/gr_diff_phasor_cc.h +usr/include/gnuradio/gr_dpll_bb.h +usr/include/gnuradio/gr_encode_ccsds_27_bb.h +usr/include/gnuradio/gr_expj.h +usr/include/gnuradio/gr_fake_channel_coder_pp.h +usr/include/gnuradio/gr_feedforward_agc_cc.h +usr/include/gnuradio/gr_feval.h +usr/include/gnuradio/gr_fft_vcc.h +usr/include/gnuradio/gr_fft_vcc_fftw.h +usr/include/gnuradio/gr_fft_vfc.h +usr/include/gnuradio/gr_firdes.h +usr/include/gnuradio/gr_float_to_char.h +usr/include/gnuradio/gr_float_to_complex.h +usr/include/gnuradio/gr_float_to_short.h +usr/include/gnuradio/gr_float_to_uchar.h +usr/include/gnuradio/gr_fmdet_cf.h +usr/include/gnuradio/gr_framer_sink_1.h +usr/include/gnuradio/gr_frequency_modulator_fc.h +usr/include/gnuradio/gr_fxpt.h +usr/include/gnuradio/gr_fxpt_nco.h +usr/include/gnuradio/gr_fxpt_vco.h +usr/include/gnuradio/gr_glfsr_source_b.h +usr/include/gnuradio/gr_glfsr_source_f.h +usr/include/gnuradio/gr_head.h +usr/include/gnuradio/gr_interleave.h +usr/include/gnuradio/gr_interleaved_short_to_complex.h +usr/include/gnuradio/gr_iqcomp_cc.h +usr/include/gnuradio/gr_keep_one_in_n.h +usr/include/gnuradio/gr_kludge_copy.h +usr/include/gnuradio/gr_lfsr_32k_source_s.h +usr/include/gnuradio/gr_lms_dfe_cc.h +usr/include/gnuradio/gr_lms_dfe_ff.h +usr/include/gnuradio/gr_log2_const.h +usr/include/gnuradio/gr_map_bb.h +usr/include/gnuradio/gr_math.h +usr/include/gnuradio/gr_misc.h +usr/include/gnuradio/gr_mpsk_receiver_cc.h +usr/include/gnuradio/gr_nco.h +usr/include/gnuradio/gr_nlog10_ff.h +usr/include/gnuradio/gr_nop.h +usr/include/gnuradio/gr_null_sink.h +usr/include/gnuradio/gr_null_source.h +usr/include/gnuradio/gr_ofdm_frame_acquisition.h +usr/include/gnuradio/gr_ofdm_cyclic_prefixer.h +usr/include/gnuradio/gr_ofdm_demapper_vcb.h +usr/include/gnuradio/gr_ofdm_mapper_bcv.h +usr/include/gnuradio/gr_ofdm_frame_sink.h +usr/include/gnuradio/gr_ofdm_insert_preamble.h +usr/include/gnuradio/gr_ofdm_sampler.h +usr/include/gnuradio/gr_pa_2x2_phase_combiner.h +usr/include/gnuradio/gr_packet_sink.h +usr/include/gnuradio/gr_peak_detector2_fb.h +usr/include/gnuradio/gr_phase_modulator_fc.h +usr/include/gnuradio/gr_pll_carriertracking_cc.h +usr/include/gnuradio/gr_pll_freqdet_cf.h +usr/include/gnuradio/gr_pll_refout_cc.h +usr/include/gnuradio/gr_pn_correlator_cc.h +usr/include/gnuradio/gr_prefix.h +usr/include/gnuradio/gr_prefs.h +usr/include/gnuradio/gr_probe_avg_mag_sqrd_c.h +usr/include/gnuradio/gr_probe_avg_mag_sqrd_cf.h +usr/include/gnuradio/gr_probe_avg_mag_sqrd_f.h +usr/include/gnuradio/gr_probe_signal_f.h +usr/include/gnuradio/gr_pwr_squelch_cc.h +usr/include/gnuradio/gr_pwr_squelch_ff.h +usr/include/gnuradio/gr_quadrature_demod_cf.h +usr/include/gnuradio/gr_rail_ff.h +usr/include/gnuradio/gr_random.h +usr/include/gnuradio/gr_regenerate_bb.h +usr/include/gnuradio/gr_remez.h +usr/include/gnuradio/gr_repeat.h +usr/include/gnuradio/gr_reverse.h +usr/include/gnuradio/gr_rms_cf.h +usr/include/gnuradio/gr_rms_ff.h +usr/include/gnuradio/gr_short_to_float.h +usr/include/gnuradio/gr_simple_correlator.h +usr/include/gnuradio/gr_simple_framer.h +usr/include/gnuradio/gr_simple_framer_sync.h +usr/include/gnuradio/gr_simple_squelch_cc.h +usr/include/gnuradio/gr_squash_ff.h +usr/include/gnuradio/gr_skiphead.h +usr/include/gnuradio/gr_squelch_base_cc.h +usr/include/gnuradio/gr_squelch_base_ff.h +usr/include/gnuradio/gr_stream_mux.h +usr/include/gnuradio/gr_stream_to_streams.h +usr/include/gnuradio/gr_stream_to_vector.h +usr/include/gnuradio/gr_streams_to_stream.h +usr/include/gnuradio/gr_streams_to_vector.h +usr/include/gnuradio/gr_stretch_ff.h +usr/include/gnuradio/gr_test_types.h +usr/include/gnuradio/gr_test.h +usr/include/gnuradio/gr_threshold_ff.h +usr/include/gnuradio/gr_throttle.h +usr/include/gnuradio/gr_uchar_to_float.h +usr/include/gnuradio/gr_vco.h +usr/include/gnuradio/gr_vco_f.h +usr/include/gnuradio/gr_vector_to_stream.h +usr/include/gnuradio/gr_vector_to_streams.h +usr/include/gnuradio/gr_wavelet_ff.h +usr/include/gnuradio/gr_wvps_ff.h +usr/include/gnuradio/gri_add_const_ss.h +usr/include/gnuradio/gri_agc_cc.h +usr/include/gnuradio/gri_agc_ff.h +usr/include/gnuradio/gri_agc2_cc.h +usr/include/gnuradio/gri_agc2_ff.h +usr/include/gnuradio/gri_char_to_float.h +usr/include/gnuradio/gri_debugger_hook.h +usr/include/gnuradio/gri_fft.h +usr/include/gnuradio/gri_float_to_char.h +usr/include/gnuradio/gri_float_to_short.h +usr/include/gnuradio/gri_float_to_uchar.h +usr/include/gnuradio/gri_lfsr.h +usr/include/gnuradio/gri_glfsr.h +usr/include/gnuradio/gri_interleaved_short_to_complex.h +usr/include/gnuradio/gri_lfsr_15_1_0.h +usr/include/gnuradio/gri_lfsr_32k.h +usr/include/gnuradio/gri_short_to_float.h +usr/include/gnuradio/gri_uchar_to_float.h +usr/include/gnuradio/malloc16.h +usr/include/gnuradio/random.h +usr/include/gnuradio/gr_unpack_k_bits_bb.h +usr/include/gnuradio/gr_descrambler_bb.h +usr/include/gnuradio/gr_scrambler_bb.h +usr/include/gnuradio/gr_probe_mpsk_snr_c.h +usr/include/gnuradio/gr_probe_density_b.h +usr/include/gnuradio/swig/general.i +usr/include/gnuradio/swig/gr_agc_cc.i +usr/include/gnuradio/swig/gr_agc_ff.i +usr/include/gnuradio/swig/gr_agc2_cc.i +usr/include/gnuradio/swig/gr_agc2_ff.i +usr/include/gnuradio/swig/gr_align_on_samplenumbers_ss.i +usr/include/gnuradio/swig/gr_bin_statistics_f.i +usr/include/gnuradio/swig/gr_binary_slicer_fb.i +usr/include/gnuradio/swig/gr_bytes_to_syms.i +usr/include/gnuradio/swig/gr_char_to_float.i +usr/include/gnuradio/swig/gr_check_counting_s.i +usr/include/gnuradio/swig/gr_check_lfsr_32k_s.i +usr/include/gnuradio/swig/gr_clock_recovery_mm_cc.i +usr/include/gnuradio/swig/gr_clock_recovery_mm_ff.i +usr/include/gnuradio/swig/gr_complex_to_interleaved_short.i +usr/include/gnuradio/swig/gr_complex_to_xxx.i +usr/include/gnuradio/swig/gr_conjugate_cc.i +usr/include/gnuradio/swig/gr_constellation_decoder_cb.i +usr/include/gnuradio/swig/gr_correlate_access_code_bb.i +usr/include/gnuradio/swig/gr_costas_loop_cc.i +usr/include/gnuradio/swig/gr_cpfsk_bc.i +usr/include/gnuradio/swig/gr_crc32.i +usr/include/gnuradio/swig/gr_ctcss_squelch_ff.i +usr/include/gnuradio/swig/gr_dd_mpsk_sync_cc.i +usr/include/gnuradio/swig/gr_decode_ccsds_27_fb.i +usr/include/gnuradio/swig/gr_diff_decoder_bb.i +usr/include/gnuradio/swig/gr_diff_encoder_bb.i +usr/include/gnuradio/swig/gr_diff_phasor_cc.i +usr/include/gnuradio/swig/gr_dpll_bb.i +usr/include/gnuradio/swig/gr_deinterleave.i +usr/include/gnuradio/swig/gr_delay.i +usr/include/gnuradio/swig/gr_encode_ccsds_27_bb.i +usr/include/gnuradio/swig/gr_fake_channel_coder_pp.i +usr/include/gnuradio/swig/gr_feedforward_agc_cc.i +usr/include/gnuradio/swig/gr_feval.i +usr/include/gnuradio/swig/gr_fft_vcc.i +usr/include/gnuradio/swig/gr_fft_vfc.i +usr/include/gnuradio/swig/gr_firdes.i +usr/include/gnuradio/swig/gr_float_to_char.i +usr/include/gnuradio/swig/gr_float_to_complex.i +usr/include/gnuradio/swig/gr_float_to_short.i +usr/include/gnuradio/swig/gr_float_to_uchar.i +usr/include/gnuradio/swig/gr_fmdet_cf.i +usr/include/gnuradio/swig/gr_frequency_modulator_fc.i +usr/include/gnuradio/swig/gr_framer_sink_1.i +usr/include/gnuradio/swig/gr_glfsr_source_b.i +usr/include/gnuradio/swig/gr_glfsr_source_f.i +usr/include/gnuradio/swig/gr_head.i +usr/include/gnuradio/swig/gr_interleave.i +usr/include/gnuradio/swig/gr_interleaved_short_to_complex.i +usr/include/gnuradio/swig/gr_iqcomp_cc.i +usr/include/gnuradio/swig/gr_keep_one_in_n.i +usr/include/gnuradio/swig/gr_kludge_copy.i +usr/include/gnuradio/swig/gr_lfsr_32k_source_s.i +usr/include/gnuradio/swig/gr_lms_dfe_cc.i +usr/include/gnuradio/swig/gr_lms_dfe_ff.i +usr/include/gnuradio/swig/gr_map_bb.i +usr/include/gnuradio/swig/gr_mpsk_receiver_cc.i +usr/include/gnuradio/swig/gr_nlog10_ff.i +usr/include/gnuradio/swig/gr_nop.i +usr/include/gnuradio/swig/gr_null_sink.i +usr/include/gnuradio/swig/gr_null_source.i +usr/include/gnuradio/swig/gr_ofdm_frame_acquisition.i +usr/include/gnuradio/swig/gr_ofdm_cyclic_prefixer.i +usr/include/gnuradio/swig/gr_ofdm_demapper_vcb.i +usr/include/gnuradio/swig/gr_ofdm_mapper_bcv.i +usr/include/gnuradio/swig/gr_ofdm_frame_sink.i +usr/include/gnuradio/swig/gr_ofdm_insert_preamble.i +usr/include/gnuradio/swig/gr_ofdm_sampler.i +usr/include/gnuradio/swig/gr_pa_2x2_phase_combiner.i +usr/include/gnuradio/swig/gr_packet_sink.i +usr/include/gnuradio/swig/gr_peak_detector2_fb.i +usr/include/gnuradio/swig/gr_phase_modulator_fc.i +usr/include/gnuradio/swig/gr_pll_carriertracking_cc.i +usr/include/gnuradio/swig/gr_pll_freqdet_cf.i +usr/include/gnuradio/swig/gr_pll_refout_cc.i +usr/include/gnuradio/swig/gr_pn_correlator_cc.i +usr/include/gnuradio/swig/gr_prefix.i +usr/include/gnuradio/swig/gr_prefs.i +usr/include/gnuradio/swig/gr_probe_avg_mag_sqrd_c.i +usr/include/gnuradio/swig/gr_probe_avg_mag_sqrd_cf.i +usr/include/gnuradio/swig/gr_probe_avg_mag_sqrd_f.i +usr/include/gnuradio/swig/gr_probe_signal_f.i +usr/include/gnuradio/swig/gr_pwr_squelch_cc.i +usr/include/gnuradio/swig/gr_pwr_squelch_ff.i +usr/include/gnuradio/swig/gr_quadrature_demod_cf.i +usr/include/gnuradio/swig/gr_rail_ff.i +usr/include/gnuradio/swig/gr_regenerate_bb.i +usr/include/gnuradio/swig/gr_remez.i +usr/include/gnuradio/swig/gr_rms_cf.i +usr/include/gnuradio/swig/gr_rms_ff.i +usr/include/gnuradio/swig/gr_repeat.i +usr/include/gnuradio/swig/gr_short_to_float.i +usr/include/gnuradio/swig/gr_simple_correlator.i +usr/include/gnuradio/swig/gr_simple_framer.i +usr/include/gnuradio/swig/gr_simple_squelch_cc.i +usr/include/gnuradio/swig/gr_skiphead.i +usr/include/gnuradio/swig/gr_squash_ff.i +usr/include/gnuradio/swig/gr_squelch_base_cc.i +usr/include/gnuradio/swig/gr_squelch_base_ff.i +usr/include/gnuradio/swig/gr_stream_mux.i +usr/include/gnuradio/swig/gr_stream_to_streams.i +usr/include/gnuradio/swig/gr_stream_to_vector.i +usr/include/gnuradio/swig/gr_streams_to_stream.i +usr/include/gnuradio/swig/gr_streams_to_vector.i +usr/include/gnuradio/swig/gr_stretch_ff.i +usr/include/gnuradio/swig/gr_test.i +usr/include/gnuradio/swig/gr_threshold_ff.i +usr/include/gnuradio/swig/gr_throttle.i +usr/include/gnuradio/swig/gr_uchar_to_float.i +usr/include/gnuradio/swig/gr_vco_f.i +usr/include/gnuradio/swig/gr_vector_to_stream.i +usr/include/gnuradio/swig/gr_vector_to_streams.i +usr/include/gnuradio/swig/gr_unpack_k_bits_bb.i +usr/include/gnuradio/swig/gr_wavelet_ff.i +usr/include/gnuradio/swig/gr_wvps_ff.i +usr/include/gnuradio/swig/gri_agc_cc.i +usr/include/gnuradio/swig/gri_agc_ff.i +usr/include/gnuradio/swig/gri_agc2_cc.i +usr/include/gnuradio/swig/gri_agc2_ff.i +usr/include/gnuradio/swig/gr_descrambler_bb.i +usr/include/gnuradio/swig/gr_scrambler_bb.i +usr/include/gnuradio/swig/gr_probe_mpsk_snr_c.i +usr/include/gnuradio/swig/gr_probe_density_b.i +usr/include/gnuradio/gr_add_cc.h +usr/include/gnuradio/gr_add_const_cc.h +usr/include/gnuradio/gr_add_const_ff.h +usr/include/gnuradio/gr_add_const_ii.h +usr/include/gnuradio/gr_add_const_sf.h +usr/include/gnuradio/gr_add_const_ss.h +usr/include/gnuradio/gr_add_const_vcc.h +usr/include/gnuradio/gr_add_const_vff.h +usr/include/gnuradio/gr_add_const_vii.h +usr/include/gnuradio/gr_add_const_vss.h +usr/include/gnuradio/gr_add_ff.h +usr/include/gnuradio/gr_add_ii.h +usr/include/gnuradio/gr_add_ss.h +usr/include/gnuradio/gr_and_bb.h +usr/include/gnuradio/gr_and_const_bb.h +usr/include/gnuradio/gr_and_const_ii.h +usr/include/gnuradio/gr_and_const_ss.h +usr/include/gnuradio/gr_and_ii.h +usr/include/gnuradio/gr_and_ss.h +usr/include/gnuradio/gr_argmax_fs.h +usr/include/gnuradio/gr_argmax_is.h +usr/include/gnuradio/gr_argmax_ss.h +usr/include/gnuradio/gr_chunks_to_symbols_bc.h +usr/include/gnuradio/gr_chunks_to_symbols_bf.h +usr/include/gnuradio/gr_chunks_to_symbols_ic.h +usr/include/gnuradio/gr_chunks_to_symbols_if.h +usr/include/gnuradio/gr_chunks_to_symbols_sc.h +usr/include/gnuradio/gr_chunks_to_symbols_sf.h +usr/include/gnuradio/gr_divide_cc.h +usr/include/gnuradio/gr_divide_ff.h +usr/include/gnuradio/gr_divide_ii.h +usr/include/gnuradio/gr_divide_ss.h +usr/include/gnuradio/gr_integrate_cc.h +usr/include/gnuradio/gr_integrate_ff.h +usr/include/gnuradio/gr_integrate_ii.h +usr/include/gnuradio/gr_integrate_ss.h +usr/include/gnuradio/gr_max_ff.h +usr/include/gnuradio/gr_max_ii.h +usr/include/gnuradio/gr_max_ss.h +usr/include/gnuradio/gr_moving_average_cc.h +usr/include/gnuradio/gr_moving_average_ff.h +usr/include/gnuradio/gr_moving_average_ii.h +usr/include/gnuradio/gr_moving_average_ss.h +usr/include/gnuradio/gr_multiply_cc.h +usr/include/gnuradio/gr_multiply_const_cc.h +usr/include/gnuradio/gr_multiply_const_ff.h +usr/include/gnuradio/gr_multiply_const_ii.h +usr/include/gnuradio/gr_multiply_const_ss.h +usr/include/gnuradio/gr_multiply_const_vcc.h +usr/include/gnuradio/gr_multiply_const_vff.h +usr/include/gnuradio/gr_multiply_const_vii.h +usr/include/gnuradio/gr_multiply_const_vss.h +usr/include/gnuradio/gr_multiply_ff.h +usr/include/gnuradio/gr_multiply_ii.h +usr/include/gnuradio/gr_multiply_ss.h +usr/include/gnuradio/gr_mute_cc.h +usr/include/gnuradio/gr_mute_ff.h +usr/include/gnuradio/gr_mute_ii.h +usr/include/gnuradio/gr_mute_ss.h +usr/include/gnuradio/gr_noise_source_c.h +usr/include/gnuradio/gr_noise_source_f.h +usr/include/gnuradio/gr_noise_source_i.h +usr/include/gnuradio/gr_noise_source_s.h +usr/include/gnuradio/gr_not_bb.h +usr/include/gnuradio/gr_not_ii.h +usr/include/gnuradio/gr_not_ss.h +usr/include/gnuradio/gr_or_bb.h +usr/include/gnuradio/gr_or_ii.h +usr/include/gnuradio/gr_or_ss.h +usr/include/gnuradio/gr_packed_to_unpacked_bb.h +usr/include/gnuradio/gr_packed_to_unpacked_ii.h +usr/include/gnuradio/gr_packed_to_unpacked_ss.h +usr/include/gnuradio/gr_peak_detector_fb.h +usr/include/gnuradio/gr_peak_detector_ib.h +usr/include/gnuradio/gr_peak_detector_sb.h +usr/include/gnuradio/gr_sample_and_hold_bb.h +usr/include/gnuradio/gr_sample_and_hold_ff.h +usr/include/gnuradio/gr_sample_and_hold_ii.h +usr/include/gnuradio/gr_sample_and_hold_ss.h +usr/include/gnuradio/gr_sig_source_c.h +usr/include/gnuradio/gr_sig_source_f.h +usr/include/gnuradio/gr_sig_source_i.h +usr/include/gnuradio/gr_sig_source_s.h +usr/include/gnuradio/gr_sub_cc.h +usr/include/gnuradio/gr_sub_ff.h +usr/include/gnuradio/gr_sub_ii.h +usr/include/gnuradio/gr_sub_ss.h +usr/include/gnuradio/gr_unpacked_to_packed_bb.h +usr/include/gnuradio/gr_unpacked_to_packed_ii.h +usr/include/gnuradio/gr_unpacked_to_packed_ss.h +usr/include/gnuradio/gr_vector_sink_b.h +usr/include/gnuradio/gr_vector_sink_c.h +usr/include/gnuradio/gr_vector_sink_f.h +usr/include/gnuradio/gr_vector_sink_i.h +usr/include/gnuradio/gr_vector_sink_s.h +usr/include/gnuradio/gr_vector_source_b.h +usr/include/gnuradio/gr_vector_source_c.h +usr/include/gnuradio/gr_vector_source_f.h +usr/include/gnuradio/gr_vector_source_i.h +usr/include/gnuradio/gr_vector_source_s.h +usr/include/gnuradio/gr_xor_bb.h +usr/include/gnuradio/gr_xor_ii.h +usr/include/gnuradio/gr_xor_ss.h +usr/include/gnuradio/gr_endianness.h +usr/include/gnuradio/gr_noise_type.h +usr/include/gnuradio/gr_sig_source_waveform.h +usr/include/gnuradio/swig/gr_add_cc.i +usr/include/gnuradio/swig/gr_add_const_cc.i +usr/include/gnuradio/swig/gr_add_const_ff.i +usr/include/gnuradio/swig/gr_add_const_ii.i +usr/include/gnuradio/swig/gr_add_const_sf.i +usr/include/gnuradio/swig/gr_add_const_ss.i +usr/include/gnuradio/swig/gr_add_const_vcc.i +usr/include/gnuradio/swig/gr_add_const_vff.i +usr/include/gnuradio/swig/gr_add_const_vii.i +usr/include/gnuradio/swig/gr_add_const_vss.i +usr/include/gnuradio/swig/gr_add_ff.i +usr/include/gnuradio/swig/gr_add_ii.i +usr/include/gnuradio/swig/gr_add_ss.i +usr/include/gnuradio/swig/gr_and_bb.i +usr/include/gnuradio/swig/gr_and_const_bb.i +usr/include/gnuradio/swig/gr_and_const_ii.i +usr/include/gnuradio/swig/gr_and_const_ss.i +usr/include/gnuradio/swig/gr_and_ii.i +usr/include/gnuradio/swig/gr_and_ss.i +usr/include/gnuradio/swig/gr_argmax_fs.i +usr/include/gnuradio/swig/gr_argmax_is.i +usr/include/gnuradio/swig/gr_argmax_ss.i +usr/include/gnuradio/swig/gr_chunks_to_symbols_bc.i +usr/include/gnuradio/swig/gr_chunks_to_symbols_bf.i +usr/include/gnuradio/swig/gr_chunks_to_symbols_ic.i +usr/include/gnuradio/swig/gr_chunks_to_symbols_if.i +usr/include/gnuradio/swig/gr_chunks_to_symbols_sc.i +usr/include/gnuradio/swig/gr_chunks_to_symbols_sf.i +usr/include/gnuradio/swig/gr_divide_cc.i +usr/include/gnuradio/swig/gr_divide_ff.i +usr/include/gnuradio/swig/gr_divide_ii.i +usr/include/gnuradio/swig/gr_divide_ss.i +usr/include/gnuradio/swig/gr_integrate_cc.i +usr/include/gnuradio/swig/gr_integrate_ff.i +usr/include/gnuradio/swig/gr_integrate_ii.i +usr/include/gnuradio/swig/gr_integrate_ss.i +usr/include/gnuradio/swig/gr_max_ff.i +usr/include/gnuradio/swig/gr_max_ii.i +usr/include/gnuradio/swig/gr_max_ss.i +usr/include/gnuradio/swig/gr_moving_average_cc.i +usr/include/gnuradio/swig/gr_moving_average_ff.i +usr/include/gnuradio/swig/gr_moving_average_ii.i +usr/include/gnuradio/swig/gr_moving_average_ss.i +usr/include/gnuradio/swig/gr_multiply_cc.i +usr/include/gnuradio/swig/gr_multiply_const_cc.i +usr/include/gnuradio/swig/gr_multiply_const_ff.i +usr/include/gnuradio/swig/gr_multiply_const_ii.i +usr/include/gnuradio/swig/gr_multiply_const_ss.i +usr/include/gnuradio/swig/gr_multiply_const_vcc.i +usr/include/gnuradio/swig/gr_multiply_const_vff.i +usr/include/gnuradio/swig/gr_multiply_const_vii.i +usr/include/gnuradio/swig/gr_multiply_const_vss.i +usr/include/gnuradio/swig/gr_multiply_ff.i +usr/include/gnuradio/swig/gr_multiply_ii.i +usr/include/gnuradio/swig/gr_multiply_ss.i +usr/include/gnuradio/swig/gr_mute_cc.i +usr/include/gnuradio/swig/gr_mute_ff.i +usr/include/gnuradio/swig/gr_mute_ii.i +usr/include/gnuradio/swig/gr_mute_ss.i +usr/include/gnuradio/swig/gr_noise_source_c.i +usr/include/gnuradio/swig/gr_noise_source_f.i +usr/include/gnuradio/swig/gr_noise_source_i.i +usr/include/gnuradio/swig/gr_noise_source_s.i +usr/include/gnuradio/swig/gr_not_bb.i +usr/include/gnuradio/swig/gr_not_ii.i +usr/include/gnuradio/swig/gr_not_ss.i +usr/include/gnuradio/swig/gr_or_bb.i +usr/include/gnuradio/swig/gr_or_ii.i +usr/include/gnuradio/swig/gr_or_ss.i +usr/include/gnuradio/swig/gr_packed_to_unpacked_bb.i +usr/include/gnuradio/swig/gr_packed_to_unpacked_ii.i +usr/include/gnuradio/swig/gr_packed_to_unpacked_ss.i +usr/include/gnuradio/swig/gr_peak_detector_fb.i +usr/include/gnuradio/swig/gr_peak_detector_ib.i +usr/include/gnuradio/swig/gr_peak_detector_sb.i +usr/include/gnuradio/swig/gr_sample_and_hold_bb.i +usr/include/gnuradio/swig/gr_sample_and_hold_ff.i +usr/include/gnuradio/swig/gr_sample_and_hold_ii.i +usr/include/gnuradio/swig/gr_sample_and_hold_ss.i +usr/include/gnuradio/swig/gr_sig_source_c.i +usr/include/gnuradio/swig/gr_sig_source_f.i +usr/include/gnuradio/swig/gr_sig_source_i.i +usr/include/gnuradio/swig/gr_sig_source_s.i +usr/include/gnuradio/swig/gr_sub_cc.i +usr/include/gnuradio/swig/gr_sub_ff.i +usr/include/gnuradio/swig/gr_sub_ii.i +usr/include/gnuradio/swig/gr_sub_ss.i +usr/include/gnuradio/swig/gr_unpacked_to_packed_bb.i +usr/include/gnuradio/swig/gr_unpacked_to_packed_ii.i +usr/include/gnuradio/swig/gr_unpacked_to_packed_ss.i +usr/include/gnuradio/swig/gr_vector_sink_b.i +usr/include/gnuradio/swig/gr_vector_sink_c.i +usr/include/gnuradio/swig/gr_vector_sink_f.i +usr/include/gnuradio/swig/gr_vector_sink_i.i +usr/include/gnuradio/swig/gr_vector_sink_s.i +usr/include/gnuradio/swig/gr_vector_source_b.i +usr/include/gnuradio/swig/gr_vector_source_c.i +usr/include/gnuradio/swig/gr_vector_source_f.i +usr/include/gnuradio/swig/gr_vector_source_i.i +usr/include/gnuradio/swig/gr_vector_source_s.i +usr/include/gnuradio/swig/gr_xor_bb.i +usr/include/gnuradio/swig/gr_xor_ii.i +usr/include/gnuradio/swig/gr_xor_ss.i +usr/include/gnuradio/swig/gr_endianness.i +usr/include/gnuradio/swig/gengen.i +usr/include/gnuradio/swig/gengen_generated.i +usr/include/gnuradio/gr_file_sink.h +usr/include/gnuradio/gr_file_sink_base.h +usr/include/gnuradio/gr_file_source.h +usr/include/gnuradio/gr_file_descriptor_sink.h +usr/include/gnuradio/gr_file_descriptor_source.h +usr/include/gnuradio/gr_histo_sink_f.h +usr/include/gnuradio/gr_message_sink.h +usr/include/gnuradio/gr_message_source.h +usr/include/gnuradio/gr_oscope_guts.h +usr/include/gnuradio/gr_oscope_sink_f.h +usr/include/gnuradio/gr_oscope_sink_x.h +usr/include/gnuradio/gr_trigger_mode.h +usr/include/gnuradio/gri_logger.h +usr/include/gnuradio/i2c.h +usr/include/gnuradio/i2c_bitbang.h +usr/include/gnuradio/i2c_bbio.h +usr/include/gnuradio/i2c_bbio_pp.h +usr/include/gnuradio/microtune_4702.h +usr/include/gnuradio/microtune_4937.h +usr/include/gnuradio/microtune_4702_eval_board.h +usr/include/gnuradio/microtune_4937_eval_board.h +usr/include/gnuradio/microtune_eval_board_defs.h +usr/include/gnuradio/microtune_xxxx.h +usr/include/gnuradio/microtune_xxxx_eval_board.h +usr/include/gnuradio/ppio.h +usr/include/gnuradio/ppio_ppdev.h +usr/include/gnuradio/sdr_1000.h +usr/include/gnuradio/gr_udp_sink.h +usr/include/gnuradio/gr_udp_source.h +usr/include/gnuradio/gr_wavfile_source.h +usr/include/gnuradio/gr_wavfile_sink.h +usr/include/gnuradio/gri_wavfile.h +usr/include/gnuradio/swig/io.i +usr/include/gnuradio/swig/gr_file_sink.i +usr/include/gnuradio/swig/gr_file_sink_base.i +usr/include/gnuradio/swig/gr_file_source.i +usr/include/gnuradio/swig/gr_file_descriptor_sink.i +usr/include/gnuradio/swig/gr_file_descriptor_source.i +usr/include/gnuradio/swig/gr_histo_sink.i +usr/include/gnuradio/swig/gr_message_sink.i +usr/include/gnuradio/swig/gr_message_source.i +usr/include/gnuradio/swig/gr_oscope_sink.i +usr/include/gnuradio/swig/microtune_xxxx_eval_board.i +usr/include/gnuradio/swig/microtune_4702_eval_board.i +usr/include/gnuradio/swig/microtune_4937_eval_board.i +usr/include/gnuradio/swig/ppio.i +usr/include/gnuradio/swig/sdr_1000.i +usr/include/gnuradio/swig/gr_udp_sink.i +usr/include/gnuradio/swig/gr_udp_source.i +usr/include/gnuradio/swig/gr_wavfile_source.i +usr/include/gnuradio/swig/gr_wavfile_sink.i +usr/include/gnuradio/rs.h +usr/include/gnuradio/gr_basic_block.h +usr/include/gnuradio/gr_flowgraph.h +usr/include/gnuradio/gr_flat_flowgraph.h +usr/include/gnuradio/gr_block.h +usr/include/gnuradio/gr_block_detail.h +usr/include/gnuradio/gr_block_executor.h +usr/include/gnuradio/gr_hier_block2.h +usr/include/gnuradio/gr_hier_block2_detail.h +usr/include/gnuradio/gr_buffer.h +usr/include/gnuradio/gr_complex.h +usr/include/gnuradio/gr_dispatcher.h +usr/include/gnuradio/gr_error_handler.h +usr/include/gnuradio/gr_io_signature.h +usr/include/gnuradio/gr_local_sighandler.h +usr/include/gnuradio/gr_message.h +usr/include/gnuradio/gr_msg_handler.h +usr/include/gnuradio/gr_msg_queue.h +usr/include/gnuradio/gr_pagesize.h +usr/include/gnuradio/gr_preferences.h +usr/include/gnuradio/gr_realtime.h +usr/include/gnuradio/gr_runtime_types.h +usr/include/gnuradio/gr_scheduler.h +usr/include/gnuradio/gr_scheduler_sts.h +usr/include/gnuradio/gr_scheduler_tpb.h +usr/include/gnuradio/gr_select_handler.h +usr/include/gnuradio/gr_single_threaded_scheduler.h +usr/include/gnuradio/gr_sptr_magic.h +usr/include/gnuradio/gr_sync_block.h +usr/include/gnuradio/gr_sync_decimator.h +usr/include/gnuradio/gr_sync_interpolator.h +usr/include/gnuradio/gr_top_block.h +usr/include/gnuradio/gr_top_block_impl.h +usr/include/gnuradio/gr_tpb_detail.h +usr/include/gnuradio/gr_tpb_thread_body.h +usr/include/gnuradio/gr_timer.h +usr/include/gnuradio/gr_tmp_path.h +usr/include/gnuradio/gr_types.h +usr/include/gnuradio/gr_vmcircbuf.h +usr/include/gnuradio/swig/gr_basic_block.i +usr/include/gnuradio/swig/gr_block.i +usr/include/gnuradio/swig/gr_block_detail.i +usr/include/gnuradio/swig/gr_hier_block2.i +usr/include/gnuradio/swig/gr_buffer.i +usr/include/gnuradio/swig/gr_dispatcher.i +usr/include/gnuradio/swig/gr_error_handler.i +usr/include/gnuradio/swig/gr_io_signature.i +usr/include/gnuradio/swig/gr_message.i +usr/include/gnuradio/swig/gr_msg_handler.i +usr/include/gnuradio/swig/gr_msg_queue.i +usr/include/gnuradio/swig/gr_realtime.i +usr/include/gnuradio/swig/gr_single_threaded_scheduler.i +usr/include/gnuradio/swig/gr_sync_block.i +usr/include/gnuradio/swig/gr_sync_decimator.i +usr/include/gnuradio/swig/gr_sync_interpolator.i +usr/include/gnuradio/swig/gr_top_block.i +usr/include/gnuradio/swig/runtime.i +usr/include/gnuradio/gr_channel_model.h +usr/include/gnuradio/swig/hier.i +usr/include/gnuradio/swig/gr_channel_model.i +usr/include/gnuradio/gnuradio_swig_bug_workaround.h +usr/include/gnuradio/swig/gnuradio.i +usr/include/gnuradio/swig/gr_swig_block_magic.i +usr/include/gnuradio/swig/gr_shared_ptr.i +usr/lib/libgnuradio-core.so +usr/lib/pkgconfig/gnuradio-core.pc --- gnuradio-3.2.2.dfsg.orig/debian/libgnuradio-qtgui-dev.install +++ gnuradio-3.2.2.dfsg/debian/libgnuradio-qtgui-dev.install @@ -0,0 +1,15 @@ +usr/include/gnuradio/FrequencyDisplayPlot.h +usr/include/gnuradio/TimeDomainDisplayPlot.h +usr/include/gnuradio/WaterfallDisplayPlot.h +usr/include/gnuradio/Waterfall3DDisplayPlot.h +usr/include/gnuradio/waterfallGlobalData.h +usr/include/gnuradio/ConstellationDisplayPlot.h +usr/include/gnuradio/highResTimeFunctions.h +usr/include/gnuradio/plot_waterfall.h +usr/include/gnuradio/spectrumdisplayform.h +usr/include/gnuradio/SpectrumGUIClass.h +usr/include/gnuradio/spectrumUpdateEvents.h +usr/include/gnuradio/qtgui.h +usr/include/gnuradio/qtgui_sink_c.h +usr/include/gnuradio/qtgui_sink_f.h +usr/lib/libgnuradio-qtgui.so --- gnuradio-3.2.2.dfsg.orig/debian/usrp-doc.install +++ gnuradio-3.2.2.dfsg/debian/usrp-doc.install @@ -0,0 +1,2 @@ +usr/share/doc/usrp*/html usr/share/doc/usrp-doc +usr/share/doc/usrp*/README /usr/share/doc/usrp-doc --- gnuradio-3.2.2.dfsg.orig/debian/python-gnuradio-audio-jack.install +++ gnuradio-3.2.2.dfsg/debian/python-gnuradio-audio-jack.install @@ -0,0 +1,4 @@ +etc/gnuradio/conf.d/gr-audio-jack.conf +usr/lib/python2.7/dist-packages/gnuradio/audio_jack.py +usr/lib/python2.7/dist-packages/gnuradio/_audio_jack.la +usr/lib/python2.7/dist-packages/gnuradio/_audio_jack.so --- gnuradio-3.2.2.dfsg.orig/debian/gnuradio-utils.install +++ gnuradio-3.2.2.dfsg/debian/gnuradio-utils.install @@ -0,0 +1,26 @@ +usr/lib/python2.7/dist-packages/gnuradio/plot_data.py +usr/bin/gr_plot_char.py +usr/bin/gr_plot_const.py +usr/bin/gr_plot_fft.py +usr/bin/gr_plot_fft_c.py +usr/bin/gr_plot_fft_f.py +usr/bin/gr_plot_psd.py +usr/bin/gr_plot_psd_c.py +usr/bin/gr_plot_psd_f.py +usr/bin/gr_plot_float.py +usr/bin/gr_plot_int.py +usr/bin/gr_plot_iq.py +usr/bin/gr_plot_short.py +usr/bin/lsusrp +usr/bin/usrp_fft.py +usr/bin/usrp_oscope.py +usr/bin/usrp_print_db.py +usr/bin/usrp_rx_cfile.py +usr/bin/usrp_rx_nogui.py +usr/bin/usrp_siggen.py +usr/bin/usrp_test_counting.py +usr/bin/usrp_test_loopback.py +usr/bin/usrp2_fft.py +usr/bin/usrp2_rx_cfile.py +usr/bin/usrp2_siggen.py +usr/bin/usrp2_siggen_gui.py --- gnuradio-3.2.2.dfsg.orig/debian/libusrp0.postinst +++ gnuradio-3.2.2.dfsg/debian/libusrp0.postinst @@ -0,0 +1,16 @@ +#! /bin/sh + +set -e + +if [ "$1" != "configure" ]; then + exit 0 +fi + +# Create usrp group for udev access +if ! getent group usrp >/dev/null; then + addgroup --system usrp +fi + +#DEBHELPER# + +exit 0 --- gnuradio-3.2.2.dfsg.orig/debian/libmblock-dev.install +++ gnuradio-3.2.2.dfsg/debian/libmblock-dev.install @@ -0,0 +1,3 @@ +usr/include/mblock/* +usr/lib/libmblock.so +usr/lib/pkgconfig/mblock.pc --- gnuradio-3.2.2.dfsg.orig/debian/python-gnuradio-audio-portaudio.install +++ gnuradio-3.2.2.dfsg/debian/python-gnuradio-audio-portaudio.install @@ -0,0 +1,4 @@ +etc/gnuradio/conf.d/gr-audio-portaudio.conf +usr/lib/python2.7/dist-packages/gnuradio/audio_portaudio.py +usr/lib/python2.7/dist-packages/gnuradio/_audio_portaudio.la +usr/lib/python2.7/dist-packages/gnuradio/_audio_portaudio.so --- gnuradio-3.2.2.dfsg.orig/debian/gnuradio-radar-mono.install +++ gnuradio-3.2.2.dfsg/debian/gnuradio-radar-mono.install @@ -0,0 +1,4 @@ +usr/lib/python2.7/dist-packages/gnuradio/radar_mono.py +usr/bin/usrp_radar_mono.py +usr/share/usrp/rev2/usrp_radar_mono.rbf +usr/share/usrp/rev4/usrp_radar_mono.rbf --- gnuradio-3.2.2.dfsg.orig/debian/libusrp0.udev +++ gnuradio-3.2.2.dfsg/debian/libusrp0.udev @@ -0,0 +1 @@ +ACTION=="add", BUS=="usb", SYSFS{idVendor}=="fffe", SYSFS{idProduct}=="0002", GROUP:="usrp", MODE:="0660" --- gnuradio-3.2.2.dfsg.orig/debian/pyversions +++ gnuradio-3.2.2.dfsg/debian/pyversions @@ -0,0 +1 @@ +2.6 --- gnuradio-3.2.2.dfsg.orig/mblock/Makefile.in +++ gnuradio-3.2.2.dfsg/mblock/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -184,8 +185,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -211,8 +210,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -237,11 +234,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -249,8 +243,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -261,8 +253,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -290,12 +280,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -310,16 +301,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -333,8 +318,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -350,8 +333,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -779,7 +760,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -804,7 +785,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -995,6 +976,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1003,18 +986,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/mblock/doc/Makefile.in +++ gnuradio-3.2.2.dfsg/mblock/doc/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -140,8 +141,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -167,8 +166,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -193,11 +190,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -205,8 +199,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -217,8 +209,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -246,12 +236,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -266,16 +257,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -289,8 +274,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -306,8 +289,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -680,6 +661,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -688,18 +671,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/mblock/src/Makefile.in +++ gnuradio-3.2.2.dfsg/mblock/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/mblock/src/include/Makefile.in +++ gnuradio-3.2.2.dfsg/mblock/src/include/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/mblock/src/include/mblock/Makefile.in +++ gnuradio-3.2.2.dfsg/mblock/src/include/mblock/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -890,6 +871,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -898,18 +881,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/mblock/src/scheme/Makefile.in +++ gnuradio-3.2.2.dfsg/mblock/src/scheme/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -151,8 +152,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -178,8 +177,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -204,11 +201,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -216,8 +210,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -228,8 +220,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -257,12 +247,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -277,16 +268,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -300,8 +285,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -317,8 +300,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -624,7 +605,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -649,7 +630,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -833,6 +814,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -841,18 +824,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/mblock/src/scheme/gnuradio/Makefile.in +++ gnuradio-3.2.2.dfsg/mblock/src/scheme/gnuradio/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -139,8 +140,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -166,8 +165,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -192,11 +189,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -204,8 +198,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -216,8 +208,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -245,12 +235,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -265,16 +256,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -288,8 +273,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -305,8 +288,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -681,6 +662,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -689,18 +672,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/mblock/src/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/mblock/src/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -223,8 +224,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -250,8 +249,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -276,11 +273,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -288,8 +282,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -300,8 +292,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -329,12 +319,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -349,16 +340,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -372,8 +357,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -389,8 +372,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1117,6 +1098,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1125,18 +1108,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-libLTLIBRARIES install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/omnithread/Makefile.in +++ gnuradio-3.2.2.dfsg/omnithread/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -212,8 +213,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -239,8 +238,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -265,11 +262,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -277,8 +271,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -289,8 +281,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -318,12 +308,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -338,16 +329,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -361,8 +346,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -378,8 +361,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -902,7 +883,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -927,7 +908,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1121,6 +1102,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1129,18 +1112,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-libLTLIBRARIES install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/omnithread/gnuradio/Makefile.in +++ gnuradio-3.2.2.dfsg/omnithread/gnuradio/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -886,6 +867,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -894,18 +877,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-audio-alsa/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-audio-alsa/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -187,8 +188,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -214,8 +213,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -240,11 +237,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -252,8 +246,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -264,8 +256,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -293,12 +283,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -313,16 +304,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -336,8 +321,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -353,8 +336,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -800,7 +781,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -825,7 +806,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1016,6 +997,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1024,18 +1007,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-audio-alsa/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-audio-alsa/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -269,8 +270,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -296,8 +295,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -322,11 +319,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -334,8 +328,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -346,8 +338,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -375,12 +365,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -395,16 +386,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -418,8 +403,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -435,8 +418,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1324,6 +1305,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1334,18 +1317,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-libLTLIBRARIES install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-wxgui/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-wxgui/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -187,8 +188,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -214,8 +213,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -240,11 +237,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -252,8 +246,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -264,8 +256,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -293,12 +283,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -313,16 +304,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -336,8 +321,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -353,8 +336,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -802,7 +783,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -827,7 +808,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1018,6 +999,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1026,18 +1009,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-wxgui/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-wxgui/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-wxgui/src/python/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-wxgui/src/python/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -187,8 +188,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -214,8 +213,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -240,11 +237,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -252,8 +246,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -264,8 +256,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -293,12 +283,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -313,16 +304,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -336,8 +321,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -353,8 +336,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -855,7 +836,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -880,7 +861,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1071,6 +1052,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1079,18 +1062,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-wxgui/src/python/plotter/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-wxgui/src/python/plotter/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -172,8 +173,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -199,8 +198,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -225,11 +222,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -237,8 +231,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -249,8 +241,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -278,12 +268,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -298,16 +289,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -321,8 +306,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -338,8 +321,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -859,6 +840,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -867,18 +850,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-usrp2/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-usrp2/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -185,8 +186,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -212,8 +211,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -238,11 +235,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -250,8 +244,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -262,8 +254,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -291,12 +281,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -311,16 +302,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -334,8 +319,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -351,8 +334,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -776,7 +757,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -801,7 +782,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -992,6 +973,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1000,18 +983,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-usrp2/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-usrp2/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -260,8 +261,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -287,8 +286,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -313,11 +310,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -325,8 +319,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -337,8 +329,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -366,12 +356,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -386,16 +377,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -409,8 +394,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -426,8 +409,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1354,6 +1335,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1364,18 +1347,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-libLTLIBRARIES install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/c++/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/c++/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -803,6 +784,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -811,18 +794,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -758,7 +739,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -783,7 +764,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -971,6 +952,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -979,18 +962,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/usrp2/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/usrp2/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -177,8 +178,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -204,8 +203,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -230,11 +227,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -242,8 +236,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -254,8 +246,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -283,12 +273,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -303,16 +294,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -326,8 +311,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -343,8 +326,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -865,6 +846,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -873,18 +856,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/multi-antenna/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/multi-antenna/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -167,8 +168,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -194,8 +193,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -220,11 +217,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -232,8 +226,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -244,8 +236,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -273,12 +263,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -293,16 +284,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -316,8 +301,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -333,8 +316,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -835,6 +816,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -843,18 +826,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/ofdm/fusb_options.py +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/ofdm/fusb_options.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # # Copyright 2006 Free Software Foundation, Inc. # --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/ofdm/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/ofdm/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -177,8 +178,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -204,8 +203,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -230,11 +227,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -242,8 +236,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -254,8 +246,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -283,12 +273,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -303,16 +294,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -326,8 +311,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -343,8 +326,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -874,6 +855,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -882,18 +865,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/multi_usrp/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/multi_usrp/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -177,8 +178,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -204,8 +203,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -230,11 +227,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -242,8 +236,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -254,8 +246,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -283,12 +273,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -303,16 +294,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -326,8 +311,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -343,8 +326,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -864,6 +845,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -872,18 +855,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/usrp/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/usrp/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -167,8 +168,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -194,8 +193,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -220,11 +217,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -232,8 +226,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -244,8 +236,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -273,12 +263,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -293,16 +284,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -316,8 +301,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -333,8 +316,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -852,6 +833,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -860,18 +843,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/mp-sched/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/mp-sched/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -176,8 +177,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -203,8 +202,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -229,11 +226,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -241,8 +235,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -253,8 +245,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -282,12 +272,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -302,16 +293,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -325,8 +310,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -342,8 +325,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -865,6 +846,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -873,18 +856,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/audio/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/audio/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -167,8 +168,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -194,8 +193,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -220,11 +217,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -232,8 +226,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -244,8 +236,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -273,12 +263,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -293,16 +284,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -316,8 +301,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -333,8 +316,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -844,6 +825,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -852,18 +835,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/apps/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/apps/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -626,7 +607,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -651,7 +632,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -835,6 +816,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -843,18 +826,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/apps/hf_explorer/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/apps/hf_explorer/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -177,8 +178,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -204,8 +203,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -230,11 +227,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -242,8 +236,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -254,8 +246,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -283,12 +273,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -303,16 +294,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -326,8 +311,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -343,8 +326,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -864,6 +845,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -872,18 +855,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/apps/hf_radio/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/apps/hf_radio/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -177,8 +178,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -204,8 +203,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -230,11 +227,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -242,8 +236,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -254,8 +246,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -283,12 +273,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -303,16 +294,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -326,8 +311,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -343,8 +326,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -872,6 +853,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -880,18 +863,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/digital_voice/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/digital_voice/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -167,8 +168,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -194,8 +193,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -220,11 +217,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -232,8 +226,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -244,8 +236,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -273,12 +263,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -293,16 +284,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -316,8 +301,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -333,8 +316,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -834,6 +815,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/digital-bert/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/digital-bert/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -177,8 +178,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -204,8 +203,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -230,11 +227,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -242,8 +236,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -254,8 +246,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -283,12 +273,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -303,16 +294,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -326,8 +311,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -343,8 +326,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -866,6 +847,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -874,18 +857,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/digital/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/digital/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -177,8 +178,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -204,8 +203,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -230,11 +227,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -242,8 +236,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -254,8 +246,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -283,12 +273,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -303,16 +294,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -326,8 +311,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -343,8 +326,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -883,6 +864,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -891,18 +874,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gnuradio-examples/python/network/Makefile.in +++ gnuradio-3.2.2.dfsg/gnuradio-examples/python/network/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -167,8 +168,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -194,8 +193,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -220,11 +217,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -232,8 +226,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -244,8 +236,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -273,12 +263,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -293,16 +284,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -316,8 +301,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -333,8 +316,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -838,6 +819,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -846,18 +829,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-audio-portaudio/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-audio-portaudio/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -185,8 +186,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -212,8 +211,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -238,11 +235,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -250,8 +244,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -262,8 +254,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -291,12 +281,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -311,16 +302,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -334,8 +319,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -351,8 +334,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -774,7 +755,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -799,7 +780,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -990,6 +971,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -998,18 +981,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-audio-portaudio/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-audio-portaudio/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -261,8 +262,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -288,8 +287,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -314,11 +311,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -326,8 +320,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -338,8 +330,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -367,12 +357,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -387,16 +378,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -410,8 +395,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -427,8 +410,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1302,6 +1283,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1313,18 +1296,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/docs/Makefile.in +++ gnuradio-3.2.2.dfsg/docs/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -174,8 +175,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -201,8 +200,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -227,11 +224,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -239,8 +233,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -251,8 +243,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -280,12 +270,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -300,16 +291,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -323,8 +308,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -340,8 +323,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -744,7 +725,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -769,7 +750,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -957,6 +938,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -965,18 +948,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/docs/doxygen/Makefile.in +++ gnuradio-3.2.2.dfsg/docs/doxygen/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -186,8 +187,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -213,8 +212,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -239,11 +236,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -251,8 +245,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -263,8 +255,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -292,12 +282,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -312,16 +303,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -335,8 +320,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -352,8 +335,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -779,7 +760,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -804,7 +785,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -995,6 +976,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1003,18 +986,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/docs/doxygen/xml-swig/Makefile.in +++ gnuradio-3.2.2.dfsg/docs/doxygen/xml-swig/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -140,8 +141,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -167,8 +166,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -193,11 +190,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -205,8 +199,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -217,8 +209,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -246,12 +236,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -266,16 +257,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -289,8 +274,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -306,8 +289,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -682,6 +663,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -690,18 +673,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/docs/doxygen/other/Makefile.in +++ gnuradio-3.2.2.dfsg/docs/doxygen/other/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,8 +164,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -190,8 +189,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -216,11 +213,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -228,8 +222,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -240,8 +232,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -269,12 +259,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -289,16 +280,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -312,8 +297,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,8 +312,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -813,6 +794,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -821,18 +804,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-audio-jack/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-audio-jack/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -185,8 +186,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -212,8 +211,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -238,11 +235,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -250,8 +244,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -262,8 +254,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -291,12 +281,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -311,16 +302,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -334,8 +319,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -351,8 +334,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -774,7 +755,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -799,7 +780,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -990,6 +971,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -998,18 +981,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-audio-jack/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-audio-jack/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -260,8 +261,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -287,8 +286,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -313,11 +310,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -325,8 +319,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -337,8 +329,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -366,12 +356,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -386,16 +377,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -409,8 +394,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -426,8 +409,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1299,6 +1280,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1309,18 +1292,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-trellis/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-trellis/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -175,8 +176,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -202,8 +201,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -228,11 +225,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -240,8 +234,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -252,8 +244,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -281,12 +271,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -301,16 +292,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -324,8 +309,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -341,8 +324,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -745,7 +726,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -770,7 +751,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -958,6 +939,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -966,18 +949,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-trellis/doc/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-trellis/doc/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -176,8 +177,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -203,8 +202,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -229,11 +226,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -241,8 +235,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -253,8 +245,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -282,12 +272,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -302,16 +293,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -325,8 +310,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -342,8 +325,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -848,6 +829,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -856,18 +839,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-trellis/src/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-trellis/src/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -152,8 +153,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -179,8 +178,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -205,11 +202,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -217,8 +211,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -229,8 +221,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,12 +248,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -278,16 +269,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -301,8 +286,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,8 +301,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -625,7 +606,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +631,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -834,6 +815,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -842,18 +825,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-trellis/src/examples/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-trellis/src/examples/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -189,8 +190,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -216,8 +215,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -242,11 +239,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -254,8 +248,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -266,8 +258,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -295,12 +285,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -315,16 +306,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -338,8 +323,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -355,8 +338,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -815,7 +796,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -840,7 +821,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1031,6 +1012,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -1039,18 +1022,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive --- gnuradio-3.2.2.dfsg.orig/gr-trellis/src/examples/fsm_files/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-trellis/src/examples/fsm_files/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -173,8 +174,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -200,8 +199,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -226,11 +223,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -238,8 +232,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -250,8 +242,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -279,12 +269,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -299,16 +290,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -322,8 +307,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -339,8 +322,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -850,6 +831,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -858,18 +841,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-trellis/src/python/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-trellis/src/python/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -165,8 +166,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -192,8 +191,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -218,11 +215,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -230,8 +224,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -242,8 +234,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -271,12 +261,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -291,16 +282,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -314,8 +299,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -331,8 +314,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -903,6 +884,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -911,18 +894,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/gr-trellis/src/lib/Makefile.in +++ gnuradio-3.2.2.dfsg/gr-trellis/src/lib/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -328,8 +329,6 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_CPPFLAGS = @ALSA_CPPFLAGS@ -ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ AR = @AR@ @@ -355,8 +354,6 @@ CPPFLAGS = @CPPFLAGS@ CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_CPPFLAGS = @CPPUNIT_CPPFLAGS@ -CPPUNIT_INCLUDEDIR = @CPPUNIT_INCLUDEDIR@ CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ CXX = @CXX@ @@ -381,11 +378,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ -FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@ -FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@ FFTW3F_LIBS = @FFTW3F_LIBS@ FGREP = @FGREP@ -FLIBS = @FLIBS@ FUSB_TECH = @FUSB_TECH@ GREP = @GREP@ GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@ @@ -393,8 +387,6 @@ GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@ GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@ GSL_CFLAGS = @GSL_CFLAGS@ -GSL_CPPFLAGS = @GSL_CPPFLAGS@ -GSL_INCLUDEDIR = @GSL_INCLUDEDIR@ GSL_LIBS = @GSL_LIBS@ GUILE = @GUILE@ HAVE_DOT = @HAVE_DOT@ @@ -405,8 +397,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IPC_LIBS = @IPC_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ -JACK_CPPFLAGS = @JACK_CPPFLAGS@ -JACK_INCLUDEDIR = @JACK_INCLUDEDIR@ JACK_LIBS = @JACK_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -434,12 +424,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ -PORTAUDIO_CPPFLAGS = @PORTAUDIO_CPPFLAGS@ -PORTAUDIO_INCLUDEDIR = @PORTAUDIO_INCLUDEDIR@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ @@ -454,16 +445,10 @@ PYTHON_VERSION = @PYTHON_VERSION@ QMAKE_INCLUDES = @QMAKE_INCLUDES@ QTCORE_CFLAGS = @QTCORE_CFLAGS@ -QTCORE_CPPFLAGS = @QTCORE_CPPFLAGS@ -QTCORE_INCLUDEDIR = @QTCORE_INCLUDEDIR@ QTCORE_LIBS = @QTCORE_LIBS@ QTGUI_CFLAGS = @QTGUI_CFLAGS@ -QTGUI_CPPFLAGS = @QTGUI_CPPFLAGS@ -QTGUI_INCLUDEDIR = @QTGUI_INCLUDEDIR@ QTGUI_LIBS = @QTGUI_LIBS@ QTOPENGL_CFLAGS = @QTOPENGL_CFLAGS@ -QTOPENGL_CPPFLAGS = @QTOPENGL_CPPFLAGS@ -QTOPENGL_INCLUDEDIR = @QTOPENGL_INCLUDEDIR@ QTOPENGL_LIBS = @QTOPENGL_LIBS@ QT_INCLUDES = @QT_INCLUDES@ QT_LIBS = @QT_LIBS@ @@ -477,8 +462,6 @@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ -SDL_CPPFLAGS = @SDL_CPPFLAGS@ -SDL_INCLUDEDIR = @SDL_INCLUDEDIR@ SDL_LIBS = @SDL_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -494,8 +477,6 @@ SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@ USB_CFLAGS = @USB_CFLAGS@ -USB_CPPFLAGS = @USB_CPPFLAGS@ -USB_INCLUDEDIR = @USB_INCLUDEDIR@ USB_LIBS = @USB_LIBS@ USRP2_INCLUDES = @USRP2_INCLUDES@ USRP2_LA = @USRP2_LA@ @@ -1664,6 +1645,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -1674,18 +1657,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am --- gnuradio-3.2.2.dfsg.orig/dtools/bin/extract_install_filenames +++ gnuradio-3.2.2.dfsg/dtools/bin/extract_install_filenames @@ -0,0 +1,98 @@ +#!/usr/bin/env python + +""" +Example usage: + + $ extract_install_filenames gnuradio-core/src/lib/swig/Makefile grgrpython_PYTHON + +Produces: + + usr/local/lib64/python2.4/site-packages/gnuradio/gr/gnuradio_swig_python.py + usr/local/lib64/python2.4/site-packages/gnuradio/gr/gnuradio_swig_py_runtime.py + usr/local/lib64/python2.4/site-packages/gnuradio/gr/gnuradio_swig_py_general.py + usr/local/lib64/python2.4/site-packages/gnuradio/gr/gnuradio_swig_py_gengen.py + usr/local/lib64/python2.4/site-packages/gnuradio/gr/gnuradio_swig_py_filter.py + usr/local/lib64/python2.4/site-packages/gnuradio/gr/gnuradio_swig_py_io.py + +""" + +from optparse import OptionParser +import re +import sys +import tempfile +import os + +def make_makefile_tail(dirname, full_var_name): + + s = ''' +extract_install_filenames: + @echo $(%s) + @echo $(%s) + +''' % (dirname, full_var_name) + return s + + +def main(): + parser = OptionParser(usage="usage: %prog [options] Makefile AM-variable-name") + (options, args) = parser.parse_args() + if len(args) != 2: + parser.print_help() + raise SystemExit + + makefile_name = args[0] + makefile = open(makefile_name, 'r') + full_var_name = args[1] + + L = re.split('_', full_var_name) + prefix = '_'.join(L[:-1]) + suffix = L[-1] + + #print "prefix= ", prefix + #print "suffix= ", suffix + + if suffix.upper() != suffix: + raise SystemExit, "AM-variable-name is malformed. Expected something like grgrpython_PYTHON" + + if prefix[:5] == "dist_": + dirname = prefix[5:] + "dir" + else: + dirname = prefix + "dir" + #print "dirname =", dirname + + tail = make_makefile_tail(dirname, full_var_name) + + tmp_makefile = tempfile.NamedTemporaryFile() + #print "tmp_makefile =", tmp_makefile + tmp_name = tmp_makefile.name + #print "tmp_name =", tmp_name + s = makefile.read() + tmp_makefile.write(s) + tmp_makefile.write(tail) + tmp_makefile.flush() + + (head, tail) = os.path.split(makefile_name) + if head: + # cd to directory that contained the original Makefile + cmd = 'cd %s; make -s -f %s extract_install_filenames' % (head, tmp_name) + else: + cmd = 'make -s -f %s extract_install_filenames' % (tmp_name,) + + #print "cmd =", cmd + make = os.popen(cmd, 'r') + target_dirname = make.readline().rstrip() + target_files = make.readline().rstrip() + if target_dirname.startswith('/'): + target_dirname = target_dirname[1:] + + #print "target_dirname =", target_dirname + #print "target_files =", target_files + + for f in target_files.split(): + sys.stdout.write(os.path.join(target_dirname, f.split('/')[-1]) + '\n') + +if __name__ == '__main__': + main() + + +