author | Michael Krelin <hacker@klever.net> | 2005-07-19 13:14:57 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2005-07-19 13:14:57 (UTC) |
commit | d7a8d4e0aac7a71c9f48f2de81c5eb76bae3771d (patch) (unidiff) | |
tree | 6a7bd33864d6ce6facc18d436f96207877b81455 | |
parent | 4c82851dd5d5644a89d4f269079bf901f763ee33 (diff) | |
download | libopkele-d7a8d4e0aac7a71c9f48f2de81c5eb76bae3771d.zip libopkele-d7a8d4e0aac7a71c9f48f2de81c5eb76bae3771d.tar.gz libopkele-d7a8d4e0aac7a71c9f48f2de81c5eb76bae3771d.tar.bz2 |
made konforka optional as intended in the first place
-rw-r--r-- | configure.ac | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index a31f5b1..af7a301 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -6,64 +6,66 @@ AM_INIT_AUTOMAKE([dist-bzip2]) | |||
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_RESULT([yes]) |
18 | ],[ | 18 | ],[ |
19 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) | 19 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) |
20 | ] | 20 | ] |
21 | ) | 21 | ) |
22 | 22 | ||
23 | WANT_KONFORKA="yes" | 23 | WANT_KONFORKA="yes" |
24 | AC_ARG_ENABLE([konforka], | 24 | AC_ARG_ENABLE([konforka], |
25 | AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]), | 25 | AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]), |
26 | [ | 26 | [ |
27 | test "${enableval}" = "no" && WANT_KONFORKA="no" | 27 | test "${enableval}" = "no" && WANT_KONFORKA="no" |
28 | ] | 28 | ] |
29 | ) | 29 | ) |
30 | if test "${WANT_KONFORKA}" = "yes" ; then | 30 | if test "${WANT_KONFORKA}" = "yes" ; then |
31 | PKG_CHECK_MODULES([KONFORKA],[konforka],[ | 31 | PKG_CHECK_MODULES([KONFORKA],[konforka],[ |
32 | AC_MSG_RESULT([yes]) | 32 | AC_MSG_RESULT([yes]) |
33 | AC_SUBST([KONFORKA_CFLAGS]) | 33 | AC_SUBST([KONFORKA_CFLAGS]) |
34 | AC_SUBST([KONFORKA_LIBS]) | 34 | AC_SUBST([KONFORKA_LIBS]) |
35 | AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) | 35 | AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) |
36 | AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library]) | 36 | AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library]) |
37 | AC_SUBST([KONFORKA_KONFORKA],[konforka]) | 37 | AC_SUBST([KONFORKA_KONFORKA],[konforka]) |
38 | ],[ | ||
39 | AC_MSG_RESULT([no]) | ||
38 | ] | 40 | ] |
39 | ) | 41 | ) |
40 | fi | 42 | fi |
41 | 43 | ||
42 | AC_LANG_PUSH([C++]) | 44 | AC_LANG_PUSH([C++]) |
43 | AC_CHECK_LIB([mimetic],[main],[ | 45 | AC_CHECK_LIB([mimetic],[main],[ |
44 | MIMETIC_LIBS=-lmimetic | 46 | MIMETIC_LIBS=-lmimetic |
45 | AC_SUBST([MIMETIC_CFLAGS]) | 47 | AC_SUBST([MIMETIC_CFLAGS]) |
46 | AC_SUBST([MIMETIC_LIBS]) | 48 | AC_SUBST([MIMETIC_LIBS]) |
47 | ],[ | 49 | ],[ |
48 | AC_MSG_ERROR([no mimetic library found. get one from http://codesink.org/mimetic_mime_library.html]) | 50 | AC_MSG_ERROR([no mimetic library found. get one from http://codesink.org/mimetic_mime_library.html]) |
49 | ] | 51 | ] |
50 | ) | 52 | ) |
51 | AC_LANG_POP([C++]) | 53 | AC_LANG_POP([C++]) |
52 | 54 | ||
53 | WANT_DOXYGEN="yes" | 55 | WANT_DOXYGEN="yes" |
54 | AC_ARG_ENABLE([doxygen], | 56 | AC_ARG_ENABLE([doxygen], |
55 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), | 57 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), |
56 | [ | 58 | [ |
57 | test "${enableval}" = "no" && WANT_DOXYGEN="no" | 59 | test "${enableval}" = "no" && WANT_DOXYGEN="no" |
58 | ] | 60 | ] |
59 | ) | 61 | ) |
60 | if test "${WANT_DOXYGEN}" = "yes" ; then | 62 | if test "${WANT_DOXYGEN}" = "yes" ; then |
61 | AC_WITH_DOXYGEN | 63 | AC_WITH_DOXYGEN |
62 | AC_WITH_DOT | 64 | AC_WITH_DOT |
63 | else | 65 | else |
64 | AM_CONDITIONAL([HAVE_DOXYGEN],[false]) | 66 | AM_CONDITIONAL([HAVE_DOXYGEN],[false]) |
65 | AM_CONDITIONAL([HAVE_DOT],[false]) | 67 | AM_CONDITIONAL([HAVE_DOT],[false]) |
66 | fi | 68 | fi |
67 | 69 | ||
68 | LIBCURL_CHECK_CONFIG(,,,[ | 70 | LIBCURL_CHECK_CONFIG(,,,[ |
69 | AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) | 71 | AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) |