Mercurial > hg > sonic-visualiser
changeset 943:4af426549de6 osx-retina
Update subrepos and config stuff
| author | Chris Cannam |
|---|---|
| date | Mon, 20 Apr 2015 11:52:50 +0100 |
| parents | d1ddf0171341 (current diff) abe5cfed6a88 (diff) |
| children | c0d61d610d33 |
| files | .hgsubstate |
| diffstat | 4 files changed, 27 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Wed Mar 18 15:10:36 2015 +0000 +++ b/.hgsubstate Mon Apr 20 11:52:50 2015 +0100 @@ -1,5 +1,5 @@ d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds -9429622647e63d68cd2aedf7c6c29ba6adaf4736 svapp -0559f25b99f2208ffb9ebb74ed173d3ec66f0e41 svcore -e39d5d2734eda8ab634b385e845ac0a0e4529725 svgui +dc1a360f2b694d73d4bc858b708db44249e2cddc svapp +32ab6c48efaa23d24a67315bccdc27f3ba1a18d5 svcore +e3c7da3d896e722b0ade45a422a97971de68558b svgui
--- a/configure Wed Mar 18 15:10:36 2015 +0000 +++ b/configure Mon Apr 20 11:52:50 2015 +0100 @@ -1,8 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Sonic Visualiser 2.4.1. -# -# Report bugs to <cannam@all-day-breakfast.com>. +# Generated by GNU Autoconf 2.69. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -266,8 +264,7 @@ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: cannam@all-day-breakfast.com about your system, + $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." @@ -578,13 +575,14 @@ MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='Sonic Visualiser' -PACKAGE_TARNAME='sonic-visualiser' -PACKAGE_VERSION='2.4.1' -PACKAGE_STRING='Sonic Visualiser 2.4.1' -PACKAGE_BUGREPORT='cannam@all-day-breakfast.com' -PACKAGE_URL='' - +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= +PACKAGE_URL= + +ac_unique_file="Sonic Visualiser" ac_unique_file="main/main.cpp" # Factoring default headers for most tests. ac_includes_default="\ @@ -834,7 +832,7 @@ localstatedir='${prefix}/var' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +docdir='${datarootdir}/doc/${PACKAGE}' infodir='${datarootdir}/info' htmldir='${docdir}' dvidir='${docdir}' @@ -1334,7 +1332,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Sonic Visualiser 2.4.1 to adapt to many kinds of systems. +\`configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1382,8 +1380,7 @@ --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root - [DATAROOTDIR/doc/sonic-visualiser] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1395,9 +1392,7 @@ fi if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of Sonic Visualiser 2.4.1:";; - esac + cat <<\_ACEOF Optional Features: @@ -1484,7 +1479,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 <cannam@all-day-breakfast.com>. +Report bugs to the package provider. _ACEOF ac_status=$? fi @@ -1547,7 +1542,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Sonic Visualiser configure 2.4.1 +configure generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1786,10 +1781,6 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------------- ## -## Report this to cannam@all-day-breakfast.com ## -## ------------------------------------------- ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 @@ -1887,7 +1878,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Sonic Visualiser $as_me 2.4.1, which was +It was created by $as_me, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -7499,7 +7490,7 @@ subdirs="$subdirs svcore svgui svapp" -ac_config_files="$ac_config_files config.pri version.h" +ac_config_files="$ac_config_files config.pri" cat >confcache <<\_ACEOF @@ -8044,7 +8035,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Sonic Visualiser $as_me 2.4.1, which was +This file was extended by $as_me, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8091,13 +8082,13 @@ Configuration files: $config_files -Report bugs to <cannam@all-day-breakfast.com>." +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="\\ -Sonic Visualiser config.status 2.4.1 +config.status configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -8210,7 +8201,6 @@ do case $ac_config_target in "config.pri") CONFIG_FILES="$CONFIG_FILES config.pri" ;; - "version.h") CONFIG_FILES="$CONFIG_FILES version.h" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac
--- a/configure.ac Wed Mar 18 15:10:36 2015 +0000 +++ b/configure.ac Mon Apr 20 11:52:50 2015 +0100 @@ -1,5 +1,5 @@ -AC_INIT([Sonic Visualiser], [2.4.1], cannam@all-day-breakfast.com) +AC_INIT([Sonic Visualiser], [], cannam@all-day-breakfast.com) AC_CONFIG_SRCDIR(main/main.cpp) @@ -121,7 +121,7 @@ AC_SUBST(QMAKE_CONFIG) AC_CONFIG_SUBDIRS([svcore svgui svapp]) -AC_CONFIG_FILES([config.pri version.h]) +AC_CONFIG_FILES([config.pri]) AC_OUTPUT