-rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 349d3cf..532f978 100644 --- a/acinclude.m4 +++ b/acinclude.m4 | |||
@@ -79,18 +79,18 @@ AC_SUBST([HAVE_DOT]) | |||
79 | AM_CONDITIONAL([HAVE_DOT],[test "${HAVE_DOT}" = "yes"]) | 79 | AM_CONDITIONAL([HAVE_DOT],[test "${HAVE_DOT}" = "yes"]) |
80 | ]) | 80 | ]) |
81 | 81 | ||
82 | dnl AC_WITH_PCRE([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) | 82 | dnl AC_WITH_PCRE([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) |
83 | dnl Outputs: | 83 | dnl Outputs: |
84 | dnl AC_SUBST: PCRE_CONFIG PCRE_PREFIX PCRE_EXEC_PREFIX | 84 | dnl AC_SUBST: PCRE_CONFIG PCRE_PREFIX PCRE_EXEC_PREFIX |
85 | dnl PCRE_VERSION PCRE_CFLAGS PCRE_LIBS | 85 | dnl PCRE_VERSION PCRE_CFLAGS PCRE_LIBS |
86 | dnl PCRE_LIBS_POSIX PCRE_CFLAGS_POSIX | 86 | dnl PCRE_LIBS_POSIX PCRE_CFLAGS_POSIX |
87 | dnl AM_CONDITIONAL: HAVE_PCRE | ||
88 | dnl AC_DEFINE: HAVE_PCRE PCRE_VERSION | 87 | dnl AC_DEFINE: HAVE_PCRE PCRE_VERSION |
88 | dnl env: HAVE_PCRE=yes|no | ||
89 | AC_DEFUN([AC_WITH_PCRE],[ | 89 | AC_DEFUN([AC_WITH_PCRE],[ |
90 | HAVE_PCRE="no" | 90 | HAVE_PCRE="no" |
91 | PCRE_CONFIG="" | 91 | PCRE_CONFIG="" |
92 | PCRE_PREFIX="" | 92 | PCRE_PREFIX="" |
93 | PCRE_EXEC_PREFIX="" | 93 | PCRE_EXEC_PREFIX="" |
94 | PCRE_VERSION="" | 94 | PCRE_VERSION="" |
95 | PCRE_CFLAGS="" | 95 | PCRE_CFLAGS="" |
96 | PCRE_LIBS="" | 96 | PCRE_LIBS="" |
@@ -137,25 +137,24 @@ AC_DEFUN([AC_WITH_PCRE],[ | |||
137 | AC_SUBST([PCRE_CFLAGS_POSIX]) | 137 | AC_SUBST([PCRE_CFLAGS_POSIX]) |
138 | AC_SUBST([PCRE_LIBS_POSIX]) | 138 | AC_SUBST([PCRE_LIBS_POSIX]) |
139 | AC_DEFINE([HAVE_PCRE],,[pcre support]) | 139 | AC_DEFINE([HAVE_PCRE],,[pcre support]) |
140 | AC_DEFINE_UNQUOTED([PCRE_VERSION],["${PCRE_VERSION}"],[pcre version]) | 140 | AC_DEFINE_UNQUOTED([PCRE_VERSION],["${PCRE_VERSION}"],[pcre version]) |
141 | $1 | 141 | $1 |
142 | fi | 142 | fi |
143 | fi | 143 | fi |
144 | fi | 144 | fi |
145 | AM_CONDITIONAL([HAVE_PCRE],[test "${HAVE_PCRE}" = "yes"]) | ||
146 | ]) | 145 | ]) |
147 | 146 | ||
148 | dnl AC_WITH_PCREPP([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) | 147 | dnl AC_WITH_PCREPP([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) |
149 | dnl Outputs: | 148 | dnl Outputs: |
150 | dnl AC_SUBST: PCREPP_CONFIG PCREPP_PREFIX PCREPP_EXEC_PREFIX | 149 | dnl AC_SUBST: PCREPP_CONFIG PCREPP_PREFIX PCREPP_EXEC_PREFIX |
151 | dnl PCREPP_VERSION PCREPP_CFLAGS PCREPP_LIBS | 150 | dnl PCREPP_VERSION PCREPP_CFLAGS PCREPP_LIBS |
152 | dnl AM_CONDITIONAL: HAVE_PCREPP | ||
153 | dnl AC_DEFINE: HAVE_PCREPP PCREPP_VERSION | 151 | dnl AC_DEFINE: HAVE_PCREPP PCREPP_VERSION |
152 | dnl env: HAVE_PCREPP=yes|no | ||
154 | AC_DEFUN([AC_WITH_PCREPP],[ | 153 | AC_DEFUN([AC_WITH_PCREPP],[ |
155 | HAVE_PCREPP="no" | 154 | HAVE_PCREPP="no" |
156 | PCREPP_CONFIG="" | 155 | PCREPP_CONFIG="" |
157 | PCREPP_PREFIX="" | 156 | PCREPP_PREFIX="" |
158 | PCREPP_EXEC_PREFIX="" | 157 | PCREPP_EXEC_PREFIX="" |
159 | PCREPP_VERSION="" | 158 | PCREPP_VERSION="" |
160 | PCREPP_CFLAGS="" | 159 | PCREPP_CFLAGS="" |
161 | PCREPP_LIBS="" | 160 | PCREPP_LIBS="" |
@@ -202,12 +201,11 @@ AC_DEFUN([AC_WITH_PCREPP],[ | |||
202 | AC_SUBST([PCREPP_LIBS]) | 201 | AC_SUBST([PCREPP_LIBS]) |
203 | AC_DEFINE([HAVE_PCREPP],,[pcre++ support]) | 202 | AC_DEFINE([HAVE_PCREPP],,[pcre++ support]) |
204 | AC_DEFINE_UNQUOTED([PCREPP_VERSION],["${PCREPP_VERSION}"],[pcre++ version]) | 203 | AC_DEFINE_UNQUOTED([PCREPP_VERSION],["${PCREPP_VERSION}"],[pcre++ version]) |
205 | $1 | 204 | $1 |
206 | fi | 205 | fi |
207 | fi | 206 | fi |
208 | fi | 207 | fi |
209 | fi | 208 | fi |
210 | AM_CONDITIONAL([HAVE_PCREPP],[test "${HAVE_PCREPP}" = "yes"]) | ||
211 | ]) | 209 | ]) |
212 | 210 | ||
213 | m4_include([acinclude.d/libcurl.m4]) | 211 | m4_include([acinclude.d/libcurl.m4]) |