summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-11-19 19:31:17 (UTC)
committer Michael Krelin <hacker@klever.net>2007-11-19 19:31:17 (UTC)
commitbc8cecfcf7e1dc593249200556e5553d7d025c05 (patch) (unidiff)
treecc08526c9d193b5436b33bf054480a840f4a7225
parent09494e1183dba8879d438b57f6921f46518087b0 (diff)
downloadlibopkele-bc8cecfcf7e1dc593249200556e5553d7d025c05.zip
libopkele-bc8cecfcf7e1dc593249200556e5553d7d025c05.tar.gz
libopkele-bc8cecfcf7e1dc593249200556e5553d7d025c05.tar.bz2
fix previous commit
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 68872d9..50dd8d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,96 +1,97 @@
1AC_INIT([libopkele], [0.3], [libopkele-bugs@klever.net]) 1AC_INIT([libopkele], [0.3], [libopkele-bugs@klever.net])
2AC_CONFIG_SRCDIR([include/opkele/opkele-config.h]) 2AC_CONFIG_SRCDIR([include/opkele/opkele-config.h])
3AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h]) 3AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h])
4AM_INIT_AUTOMAKE([dist-bzip2]) 4AM_INIT_AUTOMAKE([dist-bzip2])
5 5
6AC_PROG_INSTALL 6AC_PROG_INSTALL
7AC_PROG_CXX 7AC_PROG_CXX
8AC_PROG_CC 8AC_PROG_CC
9AC_PROG_LIBTOOL 9AC_PROG_LIBTOOL
10PKG_PROG_PKG_CONFIG 10PKG_PROG_PKG_CONFIG
11 11
12AC_HEADER_STDC 12AC_HEADER_STDC
13 13
14AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) 14AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
15 15
16PKG_CHECK_MODULES([OPENSSL],[openssl],,[ 16PKG_CHECK_MODULES([OPENSSL],[openssl],,[
17 AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) 17 AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/])
18]) 18])
19 19
20WANT_KONFORKA="yes" 20WANT_KONFORKA="yes"
21AC_ARG_ENABLE([konforka], 21AC_ARG_ENABLE([konforka],
22 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)]),
23 [ 23 [
24 test "${enableval}" = "no" && WANT_KONFORKA="no" 24 test "${enableval}" = "no" && WANT_KONFORKA="no"
25 ] 25 ]
26) 26)
27if test "${WANT_KONFORKA}" = "yes" ; then 27if test "${WANT_KONFORKA}" = "yes" ; then
28 PKG_CHECK_MODULES([KONFORKA],[konforka],[ 28 PKG_CHECK_MODULES([KONFORKA],[konforka],[
29 AC_SUBST([KONFORKA_CFLAGS]) 29 AC_SUBST([KONFORKA_CFLAGS])
30 AC_SUBST([KONFORKA_LIBS]) 30 AC_SUBST([KONFORKA_LIBS])
31 AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) 31 AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library])
32 AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library]) 32 AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library])
33 AC_SUBST([KONFORKA_KONFORKA],[konforka]) 33 AC_SUBST([KONFORKA_KONFORKA],[konforka])
34 ],[true]) 34 ],[true])
35fi 35fi
36 36
37WANT_DOXYGEN="yes" 37WANT_DOXYGEN="yes"
38AC_ARG_ENABLE([doxygen], 38AC_ARG_ENABLE([doxygen],
39 AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), 39 AC_HELP_STRING([--disable-doxygen],[do not generate documentation]),
40 [ 40 [
41 test "${enableval}" = "no" && WANT_DOXYGEN="no" 41 test "${enableval}" = "no" && WANT_DOXYGEN="no"
42 ] 42 ]
43) 43)
44if test "${WANT_DOXYGEN}" = "yes" ; then 44if test "${WANT_DOXYGEN}" = "yes" ; then
45 AC_WITH_DOXYGEN 45 AC_WITH_DOXYGEN
46 AC_WITH_DOT 46 AC_WITH_DOT
47else 47else
48 AM_CONDITIONAL([HAVE_DOXYGEN],[false]) 48 AM_CONDITIONAL([HAVE_DOXYGEN],[false])
49 AM_CONDITIONAL([HAVE_DOT],[false]) 49 AM_CONDITIONAL([HAVE_DOT],[false])
50fi 50fi
51 51
52LIBCURL_CHECK_CONFIG(,,,[ 52LIBCURL_CHECK_CONFIG(,,,[
53 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/])
54]) 54])
55 55
56if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then 56if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then
57 AC_SUBST([PCRE_CFLAGS]) 57 AC_SUBST([PCRE_CFLAGS])
58 AC_SUBST([PCRE_LIBS]) 58 AC_SUBST([PCRE_LIBS])
59 :
59else 60else
60 PKG_CHECK_MODULES([PCRE],[libpcre],,[ 61 PKG_CHECK_MODULES([PCRE],[libpcre],,[
61 AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) 62 AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/])
62 ]) 63 ])
63fi 64fi
64 65
65curl_ssl_verify_host="true" 66curl_ssl_verify_host="true"
66AC_ARG_ENABLE([ssl-verify-host], 67AC_ARG_ENABLE([ssl-verify-host],
67 AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), 68 AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]),
68 [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] 69 [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ]
69) 70)
70${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) 71${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host])
71 72
72curl_ssl_verify_peer="true" 73curl_ssl_verify_peer="true"
73AC_ARG_ENABLE([ssl-verify-peer], 74AC_ARG_ENABLE([ssl-verify-peer],
74 AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]), 75 AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]),
75 [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ] 76 [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ]
76) 77)
77${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity]) 78${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity])
78 79
79postels_law=true 80postels_law=true
80AC_ARG_ENABLE([postels-law], 81AC_ARG_ENABLE([postels-law],
81 AC_HELP_STRING([--disable-postels-law],[Be strict, do not adhere to Postel's Law ("be conservative in what you do, be liberal in what you accept from others", RFC 793)]), 82 AC_HELP_STRING([--disable-postels-law],[Be strict, do not adhere to Postel's Law ("be conservative in what you do, be liberal in what you accept from others", RFC 793)]),
82 [ test "${enableval}" = "no" && postels_law=false ] 83 [ test "${enableval}" = "no" && postels_law=false ]
83) 84)
84$postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law]) 85$postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law])
85 86
86AC_DEFINE_UNQUOTED([OPKELE_SRC_DIR],["$PWD"],[source directory]) 87AC_DEFINE_UNQUOTED([OPKELE_SRC_DIR],["$PWD"],[source directory])
87 88
88AC_CONFIG_FILES([ 89AC_CONFIG_FILES([
89 Makefile 90 Makefile
90 libopkele.pc 91 libopkele.pc
91 Doxyfile 92 Doxyfile
92 include/Makefile 93 include/Makefile
93 lib/Makefile 94 lib/Makefile
94 test/Makefile 95 test/Makefile
95]) 96])
96AC_OUTPUT 97AC_OUTPUT