author | Michael Krelin <hacker@klever.net> | 2007-01-12 14:35:35 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-01-12 14:35:35 (UTC) |
commit | b4d71b02f52ce819db836e0e7418057f4d970da4 (patch) (unidiff) | |
tree | 7306f8edbe46af0d89a37b464d60ca3a8e1e8c30 /configure.ac | |
parent | 83516ff76d24142cdc5193875ee7b684652f2eaf (diff) | |
download | libopkele-b4d71b02f52ce819db836e0e7418057f4d970da4.zip libopkele-b4d71b02f52ce819db836e0e7418057f4d970da4.tar.gz libopkele-b4d71b02f52ce819db836e0e7418057f4d970da4.tar.bz2 |
cosmetic fixes for configure output0.1
-rw-r--r-- | configure.ac | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 4729e92..3d67866 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,65 +1,58 @@ | |||
1 | AC_INIT([libopkele], [0.1], [libopkele-bugs@klever.net]) | 1 | AC_INIT([libopkele], [0.1], [libopkele-bugs@klever.net]) |
2 | AC_CONFIG_SRCDIR([include/opkele/opkele-config.h]) | 2 | AC_CONFIG_SRCDIR([include/opkele/opkele-config.h]) |
3 | AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h]) | 3 | AC_CONFIG_HEADERS([config.h include/opkele/acconfig.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 | AC_PROG_LIBTOOL | 9 | AC_PROG_LIBTOOL |
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 | AC_WITH_PKGCONFIG | 14 | AC_WITH_PKGCONFIG |
15 | 15 | ||
16 | PKG_CHECK_MODULES([OPENSSL],[openssl],[ | 16 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ |
17 | AC_MSG_RESULT([yes]) | 17 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) |
18 | ],[ | 18 | ]) |
19 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) | ||
20 | ] | ||
21 | ) | ||
22 | 19 | ||
23 | WANT_KONFORKA="yes" | 20 | WANT_KONFORKA="yes" |
24 | AC_ARG_ENABLE([konforka], | 21 | AC_ARG_ENABLE([konforka], |
25 | AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]), | 22 | AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]), |
26 | [ | 23 | [ |
27 | test "${enableval}" = "no" && WANT_KONFORKA="no" | 24 | test "${enableval}" = "no" && WANT_KONFORKA="no" |
28 | ] | 25 | ] |
29 | ) | 26 | ) |
30 | if test "${WANT_KONFORKA}" = "yes" ; then | 27 | if test "${WANT_KONFORKA}" = "yes" ; then |
31 | PKG_CHECK_MODULES([KONFORKA],[konforka],[ | 28 | PKG_CHECK_MODULES([KONFORKA],[konforka],[ |
32 | AC_MSG_RESULT([yes]) | 29 | AC_SUBST([KONFORKA_CFLAGS]) |
33 | AC_SUBST([KONFORKA_CFLAGS]) | 30 | AC_SUBST([KONFORKA_LIBS]) |
34 | AC_SUBST([KONFORKA_LIBS]) | 31 | AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) |
35 | AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) | 32 | AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library]) |
36 | AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library]) | 33 | AC_SUBST([KONFORKA_KONFORKA],[konforka]) |
37 | AC_SUBST([KONFORKA_KONFORKA],[konforka]) | 34 | ]) |
38 | ],[ | ||
39 | AC_MSG_RESULT([no]) | ||
40 | ] | ||
41 | ) | ||
42 | fi | 35 | fi |
43 | 36 | ||
44 | WANT_DOXYGEN="yes" | 37 | WANT_DOXYGEN="yes" |
45 | AC_ARG_ENABLE([doxygen], | 38 | AC_ARG_ENABLE([doxygen], |
46 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), | 39 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), |
47 | [ | 40 | [ |
48 | test "${enableval}" = "no" && WANT_DOXYGEN="no" | 41 | test "${enableval}" = "no" && WANT_DOXYGEN="no" |
49 | ] | 42 | ] |
50 | ) | 43 | ) |
51 | if test "${WANT_DOXYGEN}" = "yes" ; then | 44 | if test "${WANT_DOXYGEN}" = "yes" ; then |
52 | AC_WITH_DOXYGEN | 45 | AC_WITH_DOXYGEN |
53 | AC_WITH_DOT | 46 | AC_WITH_DOT |
54 | else | 47 | else |
55 | AM_CONDITIONAL([HAVE_DOXYGEN],[false]) | 48 | AM_CONDITIONAL([HAVE_DOXYGEN],[false]) |
56 | AM_CONDITIONAL([HAVE_DOT],[false]) | 49 | AM_CONDITIONAL([HAVE_DOT],[false]) |
57 | fi | 50 | fi |
58 | 51 | ||
59 | LIBCURL_CHECK_CONFIG(,,,[ | 52 | LIBCURL_CHECK_CONFIG(,,,[ |
60 | AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) | 53 | AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) |
61 | ]) | 54 | ]) |
62 | AC_WITH_PCRE([ | 55 | AC_WITH_PCRE([ |
63 | AC_WITH_PCREPP(,[ | 56 | AC_WITH_PCREPP(,[ |
64 | AC_MSG_ERROR([no pcre++ library found. get one at http://www.daemon.de/PCRE]) | 57 | AC_MSG_ERROR([no pcre++ library found. get one at http://www.daemon.de/PCRE]) |
65 | ]) | 58 | ]) |