summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-01-12 14:35:35 (UTC)
committer Michael Krelin <hacker@klever.net>2007-01-12 14:35:35 (UTC)
commitb4d71b02f52ce819db836e0e7418057f4d970da4 (patch) (unidiff)
tree7306f8edbe46af0d89a37b464d60ca3a8e1e8c30
parent83516ff76d24142cdc5193875ee7b684652f2eaf (diff)
downloadlibopkele-b4d71b02f52ce819db836e0e7418057f4d970da4.zip
libopkele-b4d71b02f52ce819db836e0e7418057f4d970da4.tar.gz
libopkele-b4d71b02f52ce819db836e0e7418057f4d970da4.tar.bz2
cosmetic fixes for configure output0.1
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac25
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
@@ -4,50 +4,43 @@ AC_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
10 10
11AC_HEADER_STDC 11AC_HEADER_STDC
12 12
13AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) 13AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
14AC_WITH_PKGCONFIG 14AC_WITH_PKGCONFIG
15 15
16PKG_CHECK_MODULES([OPENSSL],[openssl],[ 16PKG_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
23WANT_KONFORKA="yes" 20WANT_KONFORKA="yes"
24AC_ARG_ENABLE([konforka], 21AC_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)
30if test "${WANT_KONFORKA}" = "yes" ; then 27if 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 )
42fi 35fi
43 36
44WANT_DOXYGEN="yes" 37WANT_DOXYGEN="yes"
45AC_ARG_ENABLE([doxygen], 38AC_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)
51if test "${WANT_DOXYGEN}" = "yes" ; then 44if test "${WANT_DOXYGEN}" = "yes" ; then
52 AC_WITH_DOXYGEN 45 AC_WITH_DOXYGEN
53 AC_WITH_DOT 46 AC_WITH_DOT