-rw-r--r-- | acinclude.m4 | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 80defc7..fbb4cdc 100644 --- a/acinclude.m4 +++ b/acinclude.m4 | |||
@@ -118,49 +118,66 @@ AC_DEFUN([AC_WITH_PCREPP],[ | |||
118 | AC_ARG_WITH([pcrepp], | 118 | AC_ARG_WITH([pcrepp], |
119 | AC_HELP_STRING([--with-pcrepp=location],[Look for pcre++ in specified locations]), | 119 | AC_HELP_STRING([--with-pcrepp=location],[Look for pcre++ in specified locations]), |
120 | [ | 120 | [ |
121 | if test "${withval}" = "no" ; then | 121 | if test "${withval}" = "no" ; then |
122 | WANT_PCREPP="no" | 122 | WANT_PCREPP="no" |
123 | else | 123 | else |
124 | if test -x "${withval}" ; then | 124 | if test -x "${withval}" ; then |
125 | PCREPP_CONFIG="${withval}" | 125 | PCREPP_CONFIG="${withval}" |
126 | elif test -x "${withval}/pcre++-config" ; then | 126 | elif test -x "${withval}/pcre++-config" ; then |
127 | PCREPP_CONFIG="${withval}/pcre++-config" | 127 | PCREPP_CONFIG="${withval}/pcre++-config" |
128 | elif test -x "${withval}/bin/pcre++-config" ; then | 128 | elif test -x "${withval}/bin/pcre++-config" ; then |
129 | PCREPP_CONFIG="${withval}/bin/pcre++-config" | 129 | PCREPP_CONFIG="${withval}/bin/pcre++-config" |
130 | fi | 130 | fi |
131 | fi | 131 | fi |
132 | ] | 132 | ] |
133 | ) | 133 | ) |
134 | if test "${WANT_PCREPP}" = "no" ; then | 134 | if test "${WANT_PCREPP}" = "no" ; then |
135 | ifelse([$2], , :, [$2]) | 135 | ifelse([$2], , :, [$2]) |
136 | else | 136 | else |
137 | if test "${HAVE_PCRE}" != "yes" ; then | 137 | if test "${HAVE_PCRE}" != "yes" ; then |
138 | ifelse([$2], , :, [$2]) | 138 | ifelse([$2], , :, [$2]) |
139 | else | 139 | else |
140 | if test -z "${PCREPP_CONFIG}" ; then | 140 | if test -z "${PCREPP_CONFIG}" ; then |
141 | AC_PATH_PROG([PCREPP_CONFIG],[pcre++-config],false,[${PCREPP_LOCATIONS}]) | 141 | AC_PATH_PROG([PCREPP_CONFIG],[pcre++-config],false,[${PCREPP_LOCATIONS}]) |
142 | if test "${PCREPP_CONFIG}" = "false" ; then | 142 | if test "${PCREPP_CONFIG}" = "false" ; then |
143 | ifelse([$2], , :, [$2]) | 143 | ifelse([$2], , :, [$2]) |
144 | else | 144 | else |
145 | HAVE_PCREPP="yes" | 145 | HAVE_PCREPP="yes" |
146 | PCREPP_PREFIX="`${PCREPP_CONFIG} --prefix`" | 146 | PCREPP_PREFIX="`${PCREPP_CONFIG} --prefix`" |
147 | PCREPP_EXEC_PREFIX="`${PCREPP_CONFIG} --exec-prefix`" | 147 | PCREPP_EXEC_PREFIX="`${PCREPP_CONFIG} --exec-prefix`" |
148 | PCREPP_VERSION="`${PCREPP_CONFIG} --version`" | 148 | PCREPP_VERSION="`${PCREPP_CONFIG} --version`" |
149 | PCREPP_CFLAGS="`${PCREPP_CONFIG} --cflags` ${PCRE_CFLAGS}" | 149 | PCREPP_CFLAGS="`${PCREPP_CONFIG} --cflags` ${PCRE_CFLAGS}" |
150 | PCREPP_LIBS="`${PCREPP_CONFIG} --libs` ${PCRE_LIBS}" | 150 | PCREPP_LIBS="`${PCREPP_CONFIG} --libs` ${PCRE_LIBS}" |
151 | AC_SUBST([PCREPP_CONFIG]) | 151 | AC_SUBST([PCREPP_CONFIG]) |
152 | AC_SUBST([PCREPP_PREFIX]) | 152 | AC_SUBST([PCREPP_PREFIX]) |
153 | AC_SUBST([PCREPP_EXEC_PREFIX]) | 153 | AC_SUBST([PCREPP_EXEC_PREFIX]) |
154 | AC_SUBST([PCREPP_VERSION]) | 154 | AC_SUBST([PCREPP_VERSION]) |
155 | AC_SUBST([PCREPP_CFLAGS]) | 155 | AC_SUBST([PCREPP_CFLAGS]) |
156 | AC_SUBST([PCREPP_LIBS]) | 156 | AC_SUBST([PCREPP_LIBS]) |
157 | AC_DEFINE([HAVE_PCREPP],,[pcre++ support]) | 157 | AC_DEFINE([HAVE_PCREPP],,[pcre++ support]) |
158 | AC_DEFINE_UNQUOTED([PCREPP_VERSION],["${PCREPP_VERSION}"],[pcre++ version]) | 158 | AC_DEFINE_UNQUOTED([PCREPP_VERSION],["${PCREPP_VERSION}"],[pcre++ version]) |
159 | $1 | 159 | $1 |
160 | fi | 160 | fi |
161 | fi | 161 | fi |
162 | fi | 162 | fi |
163 | fi | 163 | fi |
164 | ]) | 164 | ]) |
165 | 165 | ||
166 | dnl AC_CHECK_SHAREDPTR(NS,HEADER[,ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) | ||
167 | AC_DEFUN([AC_CHECK_SHAREDPTR],[ | ||
168 | AC_LANG_PUSH([C++]) | ||
169 | AC_MSG_CHECKING([for $1::shared_ptr<> in $2]) | ||
170 | AC_COMPILE_IFELSE([ | ||
171 | #include <$2> | ||
172 | int main(int c,char**v) { $1::shared_ptr<int> spi(new int(0)); return *spi; } | ||
173 | ],[ | ||
174 | AC_MSG_RESULT([found]) | ||
175 | $3 | ||
176 | ],[ | ||
177 | AC_MSG_RESULT([not found]) | ||
178 | $4 | ||
179 | ]) | ||
180 | AC_LANG_POP([C++]) | ||
181 | ]) | ||
182 | |||
166 | m4_include([acinclude.d/libcurl.m4]) | 183 | m4_include([acinclude.d/libcurl.m4]) |