summaryrefslogtreecommitdiffabout
path: root/acinclude.m4
Unidiff
Diffstat (limited to 'acinclude.m4') (more/less context) (show whitespace changes)
-rw-r--r--acinclude.m46
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
@@ -75,26 +75,26 @@ AC_DEFUN([AC_WITH_DOT],[
75 AC_SUBST([DOT]) 75 AC_SUBST([DOT])
76 $1 76 $1
77 fi 77 fi
78AC_SUBST([HAVE_DOT]) 78AC_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
82dnl AC_WITH_PCRE([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) 82dnl AC_WITH_PCRE([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]])
83dnl Outputs: 83dnl Outputs:
84dnl AC_SUBST: PCRE_CONFIG PCRE_PREFIX PCRE_EXEC_PREFIX 84dnl AC_SUBST: PCRE_CONFIG PCRE_PREFIX PCRE_EXEC_PREFIX
85dnl PCRE_VERSION PCRE_CFLAGS PCRE_LIBS 85dnl PCRE_VERSION PCRE_CFLAGS PCRE_LIBS
86dnl PCRE_LIBS_POSIX PCRE_CFLAGS_POSIX 86dnl PCRE_LIBS_POSIX PCRE_CFLAGS_POSIX
87dnl AM_CONDITIONAL: HAVE_PCRE
88dnl AC_DEFINE: HAVE_PCRE PCRE_VERSION 87dnl AC_DEFINE: HAVE_PCRE PCRE_VERSION
88dnl env: HAVE_PCRE=yes|no
89AC_DEFUN([AC_WITH_PCRE],[ 89AC_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=""
97 PCRE_LOCATIONS="${PATH}:/usr/local/bin:/usr/bin" 97 PCRE_LOCATIONS="${PATH}:/usr/local/bin:/usr/bin"
98 test -z "$WANT_PCRE" && WANT_PCRE="" 98 test -z "$WANT_PCRE" && WANT_PCRE=""
99 AC_ARG_WITH([pcre], 99 AC_ARG_WITH([pcre],
100 AC_HELP_STRING([--with-pcre=location],[Look for pcre in specified locations]), 100 AC_HELP_STRING([--with-pcre=location],[Look for pcre in specified locations]),
@@ -133,33 +133,32 @@ AC_DEFUN([AC_WITH_PCRE],[
133 AC_SUBST([PCRE_EXEC_PREFIX]) 133 AC_SUBST([PCRE_EXEC_PREFIX])
134 AC_SUBST([PCRE_VERSION]) 134 AC_SUBST([PCRE_VERSION])
135 AC_SUBST([PCRE_CFLAGS]) 135 AC_SUBST([PCRE_CFLAGS])
136 AC_SUBST([PCRE_LIBS]) 136 AC_SUBST([PCRE_LIBS])
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
148dnl AC_WITH_PCREPP([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) 147dnl AC_WITH_PCREPP([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]])
149dnl Outputs: 148dnl Outputs:
150dnl AC_SUBST: PCREPP_CONFIG PCREPP_PREFIX PCREPP_EXEC_PREFIX 149dnl AC_SUBST: PCREPP_CONFIG PCREPP_PREFIX PCREPP_EXEC_PREFIX
151dnl PCREPP_VERSION PCREPP_CFLAGS PCREPP_LIBS 150dnl PCREPP_VERSION PCREPP_CFLAGS PCREPP_LIBS
152dnl AM_CONDITIONAL: HAVE_PCREPP
153dnl AC_DEFINE: HAVE_PCREPP PCREPP_VERSION 151dnl AC_DEFINE: HAVE_PCREPP PCREPP_VERSION
152dnl env: HAVE_PCREPP=yes|no
154AC_DEFUN([AC_WITH_PCREPP],[ 153AC_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=""
162 PCREPP_LOCATIONS="${PATH}:/usr/local/bin:/usr/bin" 161 PCREPP_LOCATIONS="${PATH}:/usr/local/bin:/usr/bin"
163 test -z "$WANT_PCREPP" && WANT_PCREPP="" 162 test -z "$WANT_PCREPP" && WANT_PCREPP=""
164 AC_ARG_WITH([pcrepp], 163 AC_ARG_WITH([pcrepp],
165 AC_HELP_STRING([--with-pcrepp=location],[Look for pcre++ in specified locations]), 164 AC_HELP_STRING([--with-pcrepp=location],[Look for pcre++ in specified locations]),
@@ -198,16 +197,15 @@ AC_DEFUN([AC_WITH_PCREPP],[
198 AC_SUBST([PCREPP_PREFIX]) 197 AC_SUBST([PCREPP_PREFIX])
199 AC_SUBST([PCREPP_EXEC_PREFIX]) 198 AC_SUBST([PCREPP_EXEC_PREFIX])
200 AC_SUBST([PCREPP_VERSION]) 199 AC_SUBST([PCREPP_VERSION])
201 AC_SUBST([PCREPP_CFLAGS]) 200 AC_SUBST([PCREPP_CFLAGS])
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
213m4_include([acinclude.d/libcurl.m4]) 211m4_include([acinclude.d/libcurl.m4])