comparison configure.ac @ 551:e8e4552fbf70 with-dependencies

Merge from the default branch
author Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
date Fri, 10 May 2013 12:09:08 +0100
parents c928aa734e6b
children 358541da1cd8
comparison
equal deleted inserted replaced
546:1345e72335da 551:e8e4552fbf70
1 1
2 AC_INIT([Sonic Visualiser], 2.0.1, cannam@all-day-breakfast.com) 2 AC_INIT([Sonic Visualiser], 2.1, cannam@all-day-breakfast.com)
3 3
4 AC_CONFIG_SRCDIR(main/main.cpp) 4 AC_CONFIG_SRCDIR(main/main.cpp)
5 5
6 # Autoconf will set CXXFLAGS; we don't usually want it to, because we 6 # Autoconf will set CXXFLAGS; we don't usually want it to, because we
7 # either define our own flags (at least if GCC is in use) or else use 7 # either define our own flags (at least if GCC is in use) or else use
129 Please check the above messages for any warnings that you 129 Please check the above messages for any warnings that you
130 might care about, and then run "make". 130 might care about, and then run "make".
131 131
132 The file config.pri contains the configuration settings for 132 The file config.pri contains the configuration settings for
133 qmake. If you want to adjust these by hand, edit config.pri 133 qmake. If you want to adjust these by hand, edit config.pri
134 and run "qmake -r" again to regenerate the Makefile. 134 and run "$QMAKE -r" again to regenerate the Makefile.
135 ]) 135 ])