summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2009-12-12 00:01:22 (UTC)
committer Michael Krelin <hacker@klever.net>2009-12-12 00:01:22 (UTC)
commitf888c15a5df36dcd767823cf5c223540270524c3 (patch) (unidiff)
tree98220ac6a827cce1880b47079c94854fb89a04d4
parent556f6f8ade5643b5ad798f4b0077843866c1b461 (diff)
downloadnapkin-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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac4
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 @@
1AC_INIT([napkin], [0.0], [napkin-bugs@klever.net]) 1AC_INIT([napkin], [0.0], [napkin-bugs@klever.net])
2AC_CONFIG_AUX_DIR([aux.d]) 2AC_CONFIG_AUX_DIR([aux.d])
3AC_CONFIG_SRCDIR([src/napkin.cc]) 3AC_CONFIG_SRCDIR([src/napkin.cc])
4AC_CONFIG_HEADERS([config.h]) 4AC_CONFIG_HEADERS([config.h])
5AM_INIT_AUTOMAKE([dist-bzip2]) 5AM_INIT_AUTOMAKE([dist-bzip2])
6 6
7AC_PROG_INSTALL 7AC_PROG_INSTALL
8AC_PROG_CXX 8AC_PROG_CXX
9AC_PROG_CC 9AC_PROG_CC
10AC_PROG_LIBTOOL 10AC_PROG_LIBTOOL
11PKG_PROG_PKG_CONFIG 11PKG_PROG_PKG_CONFIG
12 12
13onegetcwd=false 13onegetcwd=false
14AC_CHECK_FUNCS([get_current_dir_name getcwd],[onegetcwd=true;break]) 14AC_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
17AC_HEADER_STDC 17AC_HEADER_STDC
18 18
19AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) 19AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
20 20
21PKG_CHECK_MODULES([MODULES],[gtkmm-2.4 sqlite3],,[ 21PKG_CHECK_MODULES([MODULES],[gtkmm-2.4 sqlite3])
22 AC_MSG_ERROR([not all dependencies could be satisfied])
23])
24 22
25AC_MSG_CHECKING([whether to enable debugging code]) 23AC_MSG_CHECKING([whether to enable debugging code])
26ndebug=true 24ndebug=true
27AC_ARG_ENABLE([debug], 25AC_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)
31if $ndebug ; then 29if $ndebug ; then
32 AC_MSG_RESULT([no]) 30 AC_MSG_RESULT([no])
33 CPPFLAGS="${CPPFLAGS}-DNDEBUG" 31 CPPFLAGS="${CPPFLAGS}-DNDEBUG"
34else 32else
35 AC_MSG_RESULT([yes]) 33 AC_MSG_RESULT([yes])
36fi 34fi
37 35
38nitpick=false 36nitpick=false
39AC_MSG_CHECKING([whether to enable compiler nitpicking]) 37AC_MSG_CHECKING([whether to enable compiler nitpicking])
40AC_ARG_ENABLE([nitpicking], 38AC_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)
44if $nitpick ; then 42if $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 \