summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index c5759b0..283757f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,68 +61,68 @@ else
61 AM_CONDITIONAL([HAVE_DOXYGEN],[false]) 61 AM_CONDITIONAL([HAVE_DOXYGEN],[false])
62 AM_CONDITIONAL([HAVE_DOT],[false]) 62 AM_CONDITIONAL([HAVE_DOT],[false])
63fi 63fi
64 64
65LIBCURL_CHECK_CONFIG(,,,[ 65LIBCURL_CHECK_CONFIG(,,,[
66 AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) 66 AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/])
67]) 67])
68 68
69if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then 69if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then
70 AC_SUBST([PCRE_CFLAGS]) 70 AC_SUBST([PCRE_CFLAGS])
71 AC_SUBST([PCRE_LIBS]) 71 AC_SUBST([PCRE_LIBS])
72 : 72 :
73else 73else
74 PKG_CHECK_MODULES([PCRE],[libpcre],,[ 74 PKG_CHECK_MODULES([PCRE],[libpcre],,[
75 AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) 75 AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/])
76 ]) 76 ])
77fi 77fi
78 78
79curl_ssl_verify_host="true" 79curl_ssl_verify_host="true"
80AC_ARG_ENABLE([ssl-verify-host], 80AC_ARG_ENABLE([ssl-verify-host],
81 AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), 81 AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]),
82 [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] 82 [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ]
83) 83)
84${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) 84${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host])
85 85
86curl_ssl_verify_peer="true" 86curl_ssl_verify_peer="true"
87AC_ARG_ENABLE([ssl-verify-peer], 87AC_ARG_ENABLE([ssl-verify-peer],
88 AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]), 88 AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]),
89 [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ] 89 [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ]
90) 90)
91${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity]) 91${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity])
92 92
93postels_law=true 93postels_law=true
94AC_ARG_ENABLE([postels-law], 94AC_ARG_ENABLE([postels-law],
95 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)]), 95 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)]),
96 [ test "${enableval}" = "no" && postels_law=false ] 96 [ test "${enableval}" = "no" && postels_law=false ]
97) 97)
98$postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law]) 98$postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law])
99 99
100AC_DEFINE_UNQUOTED([OPKELE_SRC_DIR],["$PWD"],[source directory]) 100AC_DEFINE_UNQUOTED([OPKELE_SRC_DIR],["$PWD"],[source directory])
101 101
102nitpick=false 102nitpick=false
103AC_ARG_ENABLE([nitpicking], 103AC_ARG_ENABLE([nitpicking],
104 AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), 104 AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]),
105 [ test "$enableval" = "no" || nitpick=true ] 105 [ test "$enableval" = "no" || nitpick=true ]
106) 106)
107if $nitpick ; then 107if $nitpick ; then
108 CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ 108 CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \
109 -Wunsafe-loop-optimizations -Wconversion -Wmissing-declarations \ 109 -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \
110 -Wmissing-format-attribute -Wredundant-decls" 110 -Wredundant-decls -ansi"
111 # -Wlogical-op -Wmissing-noreturn 111 # -Wlogical-op -Wmissing-noreturn
112 C_NITPICK="$CPP_NITPICK" 112 C_NITPICK="$CPP_NITPICK"
113 CXX_NITPICK="$C_NITPICK" 113 CXX_NITPICK="$C_NITPICK"
114 114
115 CPPFLAGS="$CPPFLAGS $CPP_NITPICK" 115 CPPFLAGS="$CPPFLAGS $CPP_NITPICK"
116 CFLAGS="$CFLAGS $C_NITPICK" 116 CFLAGS="$CFLAGS $C_NITPICK"
117 CXXFLAGS="$CXXFLAGS $CXX_NITPICK" 117 CXXFLAGS="$CXXFLAGS $CXX_NITPICK"
118fi 118fi
119 119
120AC_CONFIG_FILES([ 120AC_CONFIG_FILES([
121 Makefile 121 Makefile
122 libopkele.pc 122 libopkele.pc
123 Doxyfile 123 Doxyfile
124 include/Makefile 124 include/Makefile
125 lib/Makefile 125 lib/Makefile
126 test/Makefile 126 test/Makefile
127]) 127])
128AC_OUTPUT 128AC_OUTPUT