diff options
author | Tim Rice <tim@multitalents.net> | 2001-10-25 10:01:30 -0700 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2001-10-25 10:01:30 -0700 |
commit | 02cebcd93be1fc789f260202ccbfb600b1ba7e0f (patch) | |
tree | c46f5c89381e2610cdc9fdbf03a43eb053144d16 /configure.ac | |
parent | a0bd44cc49a4b24869c952233b916961f67ac9a2 (diff) |
Give path given in --with-xxx= for pcre,zlib, and
tcp-wrappers precedence over system libraries and includes.
Report from Dave Dykstra <dwd@bell-labs.com>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 185ed30ef..10cca440c 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.1 2001/10/25 04:15:26 tim Exp $ | 1 | # $Id: configure.ac,v 1.2 2001/10/25 17:01:31 tim Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -324,21 +324,21 @@ AC_ARG_WITH(pcre, | |||
324 | if test "x$withval" != "xyes"; then | 324 | if test "x$withval" != "xyes"; then |
325 | if test -d "$withval/lib"; then | 325 | if test -d "$withval/lib"; then |
326 | if test -n "${need_dash_r}"; then | 326 | if test -n "${need_dash_r}"; then |
327 | LDFLAGS="${LDFLAGS} -L$withval/lib -R$withval/lib" | 327 | LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" |
328 | else | 328 | else |
329 | LDFLAGS="${LDFLAGS} -L$withval/lib" | 329 | LDFLAGS="-L${withval}/lib ${LDFLAGS}" |
330 | fi | 330 | fi |
331 | else | 331 | else |
332 | if test -n "${need_dash_r}"; then | 332 | if test -n "${need_dash_r}"; then |
333 | LDFLAGS="${LDFLAGS} -L$withval -R$withval" | 333 | LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" |
334 | else | 334 | else |
335 | LDFLAGS="${LDFLAGS} -L$withval" | 335 | LDFLAGS="-L${withval} ${LDFLAGS}" |
336 | fi | 336 | fi |
337 | fi | 337 | fi |
338 | if test -d "$withval/include"; then | 338 | if test -d "$withval/include"; then |
339 | CPPFLAGS="${CPPFLAGS} -I$withval/include" | 339 | CPPFLAGS="-I${withval}/include ${CPPFLAGS}" |
340 | else | 340 | else |
341 | CPPFLAGS="${CPPFLAGS} -I$withval" | 341 | CPPFLAGS="-I${withval} ${CPPFLAGS}" |
342 | fi | 342 | fi |
343 | fi | 343 | fi |
344 | 344 | ||
@@ -377,21 +377,21 @@ AC_ARG_WITH(zlib, | |||
377 | [ | 377 | [ |
378 | if test -d "$withval/lib"; then | 378 | if test -d "$withval/lib"; then |
379 | if test -n "${need_dash_r}"; then | 379 | if test -n "${need_dash_r}"; then |
380 | LDFLAGS="${LDFLAGS} -L$withval/lib -R$withval/lib" | 380 | LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" |
381 | else | 381 | else |
382 | LDFLAGS="${LDFLAGS} -L$withval/lib" | 382 | LDFLAGS="-L${withval}/lib ${LDFLAGS}" |
383 | fi | 383 | fi |
384 | else | 384 | else |
385 | if test -n "${need_dash_r}"; then | 385 | if test -n "${need_dash_r}"; then |
386 | LDFLAGS="${LDFLAGS} -L$withval -R$withval" | 386 | LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" |
387 | else | 387 | else |
388 | LDFLAGS="${LDFLAGS} -L$withval" | 388 | LDFLAGS="-L${withval} ${LDFLAGS}" |
389 | fi | 389 | fi |
390 | fi | 390 | fi |
391 | if test -d "$withval/include"; then | 391 | if test -d "$withval/include"; then |
392 | CPPFLAGS="${CPPFLAGS} -I$withval/include" | 392 | CPPFLAGS="-I${withval}/include ${CPPFLAGS}" |
393 | else | 393 | else |
394 | CPPFLAGS="${CPPFLAGS} -I$withval" | 394 | CPPFLAGS="-I${withval} ${CPPFLAGS}" |
395 | fi | 395 | fi |
396 | ] | 396 | ] |
397 | ) | 397 | ) |
@@ -524,21 +524,21 @@ AC_ARG_WITH(tcp-wrappers, | |||
524 | if test -n "${withval}" -a "${withval}" != "yes"; then | 524 | if test -n "${withval}" -a "${withval}" != "yes"; then |
525 | if test -d "${withval}/lib"; then | 525 | if test -d "${withval}/lib"; then |
526 | if test -n "${need_dash_r}"; then | 526 | if test -n "${need_dash_r}"; then |
527 | LDFLAGS="$LDFLAGS -L${withval}/lib -R${withval}/lib" | 527 | LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" |
528 | else | 528 | else |
529 | LDFLAGS="$LDFLAGS -L${withval}/lib" | 529 | LDFLAGS="-L${withval}/lib ${LDFLAGS}" |
530 | fi | 530 | fi |
531 | else | 531 | else |
532 | if test -n "${need_dash_r}"; then | 532 | if test -n "${need_dash_r}"; then |
533 | LDFLAGS="$LDFLAGS -L${withval} -R${withval}" | 533 | LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" |
534 | else | 534 | else |
535 | LDFLAGS="$LDFLAGS -L${withval}" | 535 | LDFLAGS="-L${withval} ${LDFLAGS}" |
536 | fi | 536 | fi |
537 | fi | 537 | fi |
538 | if test -d "${withval}/include"; then | 538 | if test -d "${withval}/include"; then |
539 | CPPFLAGS="$CPPFLAGS -I${withval}/include" | 539 | CPPFLAGS="-I${withval}/include ${CPPFLAGS}" |
540 | else | 540 | else |
541 | CPPFLAGS="$CPPFLAGS -I${withval}" | 541 | CPPFLAGS="-I${withval} ${CPPFLAGS}" |
542 | fi | 542 | fi |
543 | fi | 543 | fi |
544 | LIBS="-lwrap $LIBS" | 544 | LIBS="-lwrap $LIBS" |