author | Michael Krelin <hacker@klever.net> | 2010-02-21 21:19:30 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2010-02-21 21:19:30 (UTC) |
commit | ce549cc7cc156ff1d6e15bcceb6c6178154af459 (patch) (unidiff) | |
tree | 8060239cf3143be7970deea422a501461b652ef9 | |
parent | 124c70b6d105d1d084bd2253d54c268cfa75f865 (diff) | |
download | iii-ce549cc7cc156ff1d6e15bcceb6c6178154af459.zip iii-ce549cc7cc156ff1d6e15bcceb6c6178154af459.tar.gz iii-ce549cc7cc156ff1d6e15bcceb6c6178154af459.tar.bz2 |
don't override default pkg-config if-not-found action
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 515d465..a719cdd 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,77 +1,75 @@ | |||
1 | AC_INIT([iii], [0.1], [iii-bugs@klever.net]) | 1 | AC_INIT([iii], [0.1], [iii-bugs@klever.net]) |
2 | AC_CONFIG_SRCDIR([src/iiid.cc]) | 2 | AC_CONFIG_SRCDIR([src/iiid.cc]) |
3 | AC_CONFIG_HEADERS([config.h]) | 3 | AC_CONFIG_HEADERS([config.h]) |
4 | AM_INIT_AUTOMAKE([dist-bzip2]) | 4 | AM_INIT_AUTOMAKE([dist-bzip2]) |
5 | 5 | ||
6 | AC_PROG_INSTALL | 6 | AC_PROG_INSTALL |
7 | AC_PROG_CXX | 7 | AC_PROG_CXX |
8 | AC_PROG_CC | 8 | AC_PROG_CC |
9 | PKG_PROG_PKG_CONFIG | 9 | PKG_PROG_PKG_CONFIG |
10 | 10 | ||
11 | AC_HEADER_STDC | 11 | AC_HEADER_STDC |
12 | 12 | ||
13 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 13 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
14 | 14 | ||
15 | PKG_CHECK_MODULES([MODULES],[gsoap++ openssl libconfuse],,[ | 15 | PKG_CHECK_MODULES([MODULES],[gsoap++ openssl libconfuse]) |
16 | AC_MSG_ERROR([one of the build dependencies isn't satisfied]) | ||
17 | ]) | ||
18 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) | 16 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) |
19 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) | 17 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) |
20 | if $have_uuid ; then | 18 | if $have_uuid ; then |
21 | AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) | 19 | AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) |
22 | AC_SUBST([UUID_UUID],[uuid]) | 20 | AC_SUBST([UUID_UUID],[uuid]) |
23 | fi | 21 | fi |
24 | 22 | ||
25 | AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false]) | 23 | AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false]) |
26 | test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.]) | 24 | test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.]) |
27 | 25 | ||
28 | notfound=false | 26 | notfound=false |
29 | AC_CHECK_HEADERS([archive.h],[ | 27 | AC_CHECK_HEADERS([archive.h],[ |
30 | AC_CHECK_LIB([archive],[archive_read_new],,[notfound=true]) | 28 | AC_CHECK_LIB([archive],[archive_read_new],,[notfound=true]) |
31 | ],[notfound=true]) | 29 | ],[notfound=true]) |
32 | $notfound && AC_MSG_ERROR([no required libarchive library found. get one from http://people.freebsd.org/~kientzle/libarchive/]) | 30 | $notfound && AC_MSG_ERROR([no required libarchive library found. get one from http://people.freebsd.org/~kientzle/libarchive/]) |
33 | 31 | ||
34 | notfound=false | 32 | notfound=false |
35 | AC_LANG_PUSH([C++]) | 33 | AC_LANG_PUSH([C++]) |
36 | AC_CHECK_HEADERS([autosprintf.h],[ | 34 | AC_CHECK_HEADERS([autosprintf.h],[ |
37 | AC_CHECK_LIB([asprintf],[main],,[notfound=true]) | 35 | AC_CHECK_LIB([asprintf],[main],,[notfound=true]) |
38 | ],[notfound=true]) | 36 | ],[notfound=true]) |
39 | $notfound && AC_MSG_ERROR([no autosprintf, part of gettext, found]) | 37 | $notfound && AC_MSG_ERROR([no autosprintf, part of gettext, found]) |
40 | AC_LANG_POP([C++]) | 38 | AC_LANG_POP([C++]) |
41 | 39 | ||
42 | nitpick=false | 40 | nitpick=false |
43 | AC_ARG_ENABLE([nitpicking], | 41 | AC_ARG_ENABLE([nitpicking], |
44 | AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), | 42 | AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), |
45 | [ test "$enableval" = "no" || nitpick=true ] | 43 | [ test "$enableval" = "no" || nitpick=true ] |
46 | ) | 44 | ) |
47 | if $nitpick ; then | 45 | if $nitpick ; then |
48 | CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ | 46 | CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ |
49 | -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ | 47 | -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ |
50 | -Wredundant-decls -ansi -Wlogical-op -Wmissing-noreturn" | 48 | -Wredundant-decls -ansi -Wlogical-op -Wmissing-noreturn" |
51 | C_NITPICK="$CPP_NITPICK" | 49 | C_NITPICK="$CPP_NITPICK" |
52 | CXX_NITPICK="$C_NITPICK" | 50 | CXX_NITPICK="$C_NITPICK" |
53 | 51 | ||
54 | CPPFLAGS="$CPPFLAGS $CPP_NITPICK" | 52 | CPPFLAGS="$CPPFLAGS $CPP_NITPICK" |
55 | CFLAGS="$CFLAGS $C_NITPICK" | 53 | CFLAGS="$CFLAGS $C_NITPICK" |
56 | CXXFLAGS="$CXXFLAGS $CXX_NITPICK" | 54 | CXXFLAGS="$CXXFLAGS $CXX_NITPICK" |
57 | fi | 55 | fi |
58 | 56 | ||
59 | ndebug=true | 57 | ndebug=true |
60 | AC_ARG_ENABLE([debug], | 58 | AC_ARG_ENABLE([debug], |
61 | AC_HELP_STRING([--enable-debug],[enable debugging code]), | 59 | AC_HELP_STRING([--enable-debug],[enable debugging code]), |
62 | [ test "$enableval" = "no" || ndebug=false ] | 60 | [ test "$enableval" = "no" || ndebug=false ] |
63 | ) | 61 | ) |
64 | if $ndebug ; then | 62 | if $ndebug ; then |
65 | CPPFLAGS_DEBUG="-DNDEBUG" | 63 | CPPFLAGS_DEBUG="-DNDEBUG" |
66 | else | 64 | else |
67 | CPPFLAGS_DEBUG="-DDEBUG" | 65 | CPPFLAGS_DEBUG="-DDEBUG" |
68 | fi | 66 | fi |
69 | AC_SUBST([CPPFLAGS_DEBUG]) | 67 | AC_SUBST([CPPFLAGS_DEBUG]) |
70 | 68 | ||
71 | AC_CONFIG_FILES([ | 69 | AC_CONFIG_FILES([ |
72 | Makefile | 70 | Makefile |
73 | src/Makefile | 71 | src/Makefile |
74 | doc/Makefile | 72 | doc/Makefile |
75 | doc/iiid.8 | 73 | doc/iiid.8 |
76 | ]) | 74 | ]) |
77 | AC_OUTPUT | 75 | AC_OUTPUT |