Mercurial > hg > sonic-annotator

comparison configure.ac @ 248:c8e5fcddf8be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Fri, 18 Mar 2016 15:15:55 +0000
parents 6153429ebf89
children 382f33b7f00e
comparison
equal deleted inserted replaced
247:5eadb3b687bb 248:c8e5fcddf8be
1 1
2 AC_INIT([Sonic Annotator], [1.2], cannam@all-day-breakfast.com) 2 AC_INIT([Sonic Annotator], [], cannam@all-day-breakfast.com)
3 3
4 AC_CONFIG_SRCDIR(runner/main.cpp) 4 AC_CONFIG_SRCDIR(runner/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
22 22
23 AC_PROG_CC 23 AC_PROG_CC
24 AC_PROG_CXX 24 AC_PROG_CXX
25 AC_PROG_INSTALL 25 AC_PROG_INSTALL
26 AC_PROG_MKDIR_P 26 AC_PROG_MKDIR_P
27
28 # We are daringly making use of C++11 now
29 AX_CXX_COMPILE_STDCXX_11(noext)
27 30
28 AC_HEADER_STDC 31 AC_HEADER_STDC
29 32
30 # These are the flags Autoconf guesses for us; we use them later if 33 # These are the flags Autoconf guesses for us; we use them later if
31 # the user has set none and we are not using GCC (so lack our own 34 # the user has set none and we are not using GCC (so lack our own
106 AC_SUBST(CXX) 109 AC_SUBST(CXX)
107 110
108 AC_SUBST(QMAKE_CONFIG) 111 AC_SUBST(QMAKE_CONFIG)
109 112
110 AC_CONFIG_SUBDIRS([svcore]) 113 AC_CONFIG_SUBDIRS([svcore])
111 AC_CONFIG_FILES([config.pri version.h]) 114 AC_CONFIG_FILES([config.pri])
112 115
113 AC_OUTPUT 116 AC_OUTPUT
114 117
115 if ! $QMAKE -r sonic-annotator.pro; then 118 if ! $QMAKE -r sonic-annotator.pro; then
116 AC_MSG_ERROR([qmake failed: Command was "$QMAKE -r"]) 119 AC_MSG_ERROR([qmake failed: Command was "$QMAKE -r"])