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 185ed30e..10cca440 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.1 2001/10/25 04:15:26 tim Exp $ +# $Id: configure.ac,v 1.2 2001/10/25 17:01:31 tim Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -324,21 +324,21 @@ AC_ARG_WITH(pcre, if test "x$withval" != "xyes"; then if test -d "$withval/lib"; then if test -n "${need_dash_r}"; then - LDFLAGS="${LDFLAGS} -L$withval/lib -R$withval/lib" + LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" else - LDFLAGS="${LDFLAGS} -L$withval/lib" + LDFLAGS="-L${withval}/lib ${LDFLAGS}" fi else if test -n "${need_dash_r}"; then - LDFLAGS="${LDFLAGS} -L$withval -R$withval" + LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" else - LDFLAGS="${LDFLAGS} -L$withval" + LDFLAGS="-L${withval} ${LDFLAGS}" fi fi if test -d "$withval/include"; then - CPPFLAGS="${CPPFLAGS} -I$withval/include" + CPPFLAGS="-I${withval}/include ${CPPFLAGS}" else - CPPFLAGS="${CPPFLAGS} -I$withval" + CPPFLAGS="-I${withval} ${CPPFLAGS}" fi fi @@ -377,21 +377,21 @@ AC_ARG_WITH(zlib, [ if test -d "$withval/lib"; then if test -n "${need_dash_r}"; then - LDFLAGS="${LDFLAGS} -L$withval/lib -R$withval/lib" + LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" else - LDFLAGS="${LDFLAGS} -L$withval/lib" + LDFLAGS="-L${withval}/lib ${LDFLAGS}" fi else if test -n "${need_dash_r}"; then - LDFLAGS="${LDFLAGS} -L$withval -R$withval" + LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" else - LDFLAGS="${LDFLAGS} -L$withval" + LDFLAGS="-L${withval} ${LDFLAGS}" fi fi if test -d "$withval/include"; then - CPPFLAGS="${CPPFLAGS} -I$withval/include" + CPPFLAGS="-I${withval}/include ${CPPFLAGS}" else - CPPFLAGS="${CPPFLAGS} -I$withval" + CPPFLAGS="-I${withval} ${CPPFLAGS}" fi ] ) @@ -524,21 +524,21 @@ AC_ARG_WITH(tcp-wrappers, if test -n "${withval}" -a "${withval}" != "yes"; then if test -d "${withval}/lib"; then if test -n "${need_dash_r}"; then - LDFLAGS="$LDFLAGS -L${withval}/lib -R${withval}/lib" + LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" else - LDFLAGS="$LDFLAGS -L${withval}/lib" + LDFLAGS="-L${withval}/lib ${LDFLAGS}" fi else if test -n "${need_dash_r}"; then - LDFLAGS="$LDFLAGS -L${withval} -R${withval}" + LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" else - LDFLAGS="$LDFLAGS -L${withval}" + LDFLAGS="-L${withval} ${LDFLAGS}" fi fi if test -d "${withval}/include"; then - CPPFLAGS="$CPPFLAGS -I${withval}/include" + CPPFLAGS="-I${withval}/include ${CPPFLAGS}" else - CPPFLAGS="$CPPFLAGS -I${withval}" + CPPFLAGS="-I${withval} ${CPPFLAGS}" fi fi LIBS="-lwrap $LIBS" |