author | Michael Krelin <hacker@klever.net> | 2009-12-12 00:01:22 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2009-12-12 00:01:22 (UTC) |
commit | f888c15a5df36dcd767823cf5c223540270524c3 (patch) (unidiff) | |
tree | 98220ac6a827cce1880b47079c94854fb89a04d4 | |
parent | 556f6f8ade5643b5ad798f4b0077843866c1b461 (diff) | |
download | napkin-f888c15a5df36dcd767823cf5c223540270524c3.zip napkin-f888c15a5df36dcd767823cf5c223540270524c3.tar.gz napkin-f888c15a5df36dcd767823cf5c223540270524c3.tar.bz2 |
removed customized message on PKG_CHECK_MODULES
the one provided by default is way better
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | configure.ac | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index fbf373b..18eff06 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,47 +1,45 @@ | |||
1 | AC_INIT([napkin], [0.0], [napkin-bugs@klever.net]) | 1 | AC_INIT([napkin], [0.0], [napkin-bugs@klever.net]) |
2 | AC_CONFIG_AUX_DIR([aux.d]) | 2 | AC_CONFIG_AUX_DIR([aux.d]) |
3 | AC_CONFIG_SRCDIR([src/napkin.cc]) | 3 | AC_CONFIG_SRCDIR([src/napkin.cc]) |
4 | AC_CONFIG_HEADERS([config.h]) | 4 | AC_CONFIG_HEADERS([config.h]) |
5 | AM_INIT_AUTOMAKE([dist-bzip2]) | 5 | AM_INIT_AUTOMAKE([dist-bzip2]) |
6 | 6 | ||
7 | AC_PROG_INSTALL | 7 | AC_PROG_INSTALL |
8 | AC_PROG_CXX | 8 | AC_PROG_CXX |
9 | AC_PROG_CC | 9 | AC_PROG_CC |
10 | AC_PROG_LIBTOOL | 10 | AC_PROG_LIBTOOL |
11 | PKG_PROG_PKG_CONFIG | 11 | PKG_PROG_PKG_CONFIG |
12 | 12 | ||
13 | onegetcwd=false | 13 | onegetcwd=false |
14 | AC_CHECK_FUNCS([get_current_dir_name getcwd],[onegetcwd=true;break]) | 14 | AC_CHECK_FUNCS([get_current_dir_name getcwd],[onegetcwd=true;break]) |
15 | $onegetcwd || AC_MSG_ERROR([no function to get current directory found. weird.]) | 15 | $onegetcwd || AC_MSG_ERROR([no function to get current directory found. weird.]) |
16 | 16 | ||
17 | AC_HEADER_STDC | 17 | AC_HEADER_STDC |
18 | 18 | ||
19 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 19 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
20 | 20 | ||
21 | PKG_CHECK_MODULES([MODULES],[gtkmm-2.4 sqlite3],,[ | 21 | PKG_CHECK_MODULES([MODULES],[gtkmm-2.4 sqlite3]) |
22 | AC_MSG_ERROR([not all dependencies could be satisfied]) | ||
23 | ]) | ||
24 | 22 | ||
25 | AC_MSG_CHECKING([whether to enable debugging code]) | 23 | AC_MSG_CHECKING([whether to enable debugging code]) |
26 | ndebug=true | 24 | ndebug=true |
27 | AC_ARG_ENABLE([debug], | 25 | AC_ARG_ENABLE([debug], |
28 | AC_HELP_STRING([--enable-debug],[enable debugging/development code]), | 26 | AC_HELP_STRING([--enable-debug],[enable debugging/development code]), |
29 | [ test "$enableval" = "no" || ndebug=false ] | 27 | [ test "$enableval" = "no" || ndebug=false ] |
30 | ) | 28 | ) |
31 | if $ndebug ; then | 29 | if $ndebug ; then |
32 | AC_MSG_RESULT([no]) | 30 | AC_MSG_RESULT([no]) |
33 | CPPFLAGS="${CPPFLAGS}-DNDEBUG" | 31 | CPPFLAGS="${CPPFLAGS}-DNDEBUG" |
34 | else | 32 | else |
35 | AC_MSG_RESULT([yes]) | 33 | AC_MSG_RESULT([yes]) |
36 | fi | 34 | fi |
37 | 35 | ||
38 | nitpick=false | 36 | nitpick=false |
39 | AC_MSG_CHECKING([whether to enable compiler nitpicking]) | 37 | AC_MSG_CHECKING([whether to enable compiler nitpicking]) |
40 | AC_ARG_ENABLE([nitpicking], | 38 | AC_ARG_ENABLE([nitpicking], |
41 | AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), | 39 | AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), |
42 | [ test "$enableval" = "no" || nitpick=true ] | 40 | [ test "$enableval" = "no" || nitpick=true ] |
43 | ) | 41 | ) |
44 | if $nitpick ; then | 42 | if $nitpick ; then |
45 | AC_MSG_RESULT([yes]) | 43 | AC_MSG_RESULT([yes]) |
46 | CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ | 44 | CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ |
47 | -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ | 45 | -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ |