diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.in | 39 |
2 files changed, 36 insertions, 9 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20010216 | ||
2 | - (bal) added '--with-prce' to allow overriding of system regex when | ||
3 | required (tested by David Dulek <ddulek@fastenal.com>) | ||
4 | |||
1 | 20010215 | 5 | 20010215 |
2 | - (djm) Move PAM session setup back to before setuid to user. Fixes | 6 | - (djm) Move PAM session setup back to before setuid to user. Fixes |
3 | problems on Solaris-derived PAMs. | 7 | problems on Solaris-derived PAMs. |
@@ -3970,4 +3974,4 @@ | |||
3970 | - Wrote replacements for strlcpy and mkdtemp | 3974 | - Wrote replacements for strlcpy and mkdtemp |
3971 | - Released 1.0pre1 | 3975 | - Released 1.0pre1 |
3972 | 3976 | ||
3973 | $Id: ChangeLog,v 1.772 2001/02/15 17:27:15 stevesk Exp $ | 3977 | $Id: ChangeLog,v 1.773 2001/02/15 18:16:22 mouring Exp $ |
diff --git a/configure.in b/configure.in index 93806925a..fb580674a 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.238 2001/02/15 03:46:28 mouring Exp $ | 1 | # $Id: configure.in,v 1.239 2001/02/15 18:16:23 mouring Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -295,6 +295,20 @@ AC_ARG_WITH(libs, | |||
295 | ] | 295 | ] |
296 | ) | 296 | ) |
297 | 297 | ||
298 | AC_ARG_WITH(pcre, | ||
299 | [ --with-pcre Override built in regex library with pcre], | ||
300 | [ | ||
301 | |||
302 | AC_CHECK_LIB(pcre, pcre_info, | ||
303 | [ | ||
304 | AC_DEFINE(HAVE_LIBPCRE) | ||
305 | LIBS="$LIBS -lpcreposix -lpcre" | ||
306 | no_comp_check="yes" | ||
307 | ], | ||
308 | [ AC_MSG_ERROR([*** Can not locate pcre libraries.]) ] | ||
309 | ) | ||
310 | ] | ||
311 | ) | ||
298 | 312 | ||
299 | # Checks for libraries. | 313 | # Checks for libraries. |
300 | if test -z "$no_libsocket" ; then | 314 | if test -z "$no_libsocket" ; then |
@@ -308,13 +322,22 @@ AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen") | |||
308 | AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***])) | 322 | AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***])) |
309 | AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil") | 323 | AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil") |
310 | 324 | ||
311 | AC_CHECK_FUNC(regcomp, | 325 | # We don't want to check if we did an pcre override. |
312 | [ AC_DEFINE(HAVE_REGCOMP)], | 326 | if test -z "$no_comp_check" ; then |
313 | [ | 327 | AC_CHECK_FUNC(regcomp, |
314 | AC_CHECK_LIB(pcre, pcre_info, | 328 | [ AC_DEFINE(HAVE_REGCOMP)], |
315 | AC_DEFINE(HAVE_LIBPCRE) LIBS="$LIBS -lpcreposix -lpcre") | 329 | [ |
316 | ] | 330 | AC_CHECK_LIB(pcre, pcre_info, |
317 | ) | 331 | [ |
332 | AC_DEFINE(HAVE_LIBPCRE) | ||
333 | LIBS="$LIBS -lpcreposix -lpcre" | ||
334 | ], | ||
335 | [ | ||
336 | AC_MSG_ERROR([*** No regex library found.]) | ||
337 | ]) | ||
338 | ] | ||
339 | ) | ||
340 | fi | ||
318 | 341 | ||
319 | dnl UnixWare 2.x | 342 | dnl UnixWare 2.x |
320 | AC_CHECK_FUNC(strcasecmp, | 343 | AC_CHECK_FUNC(strcasecmp, |