Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16586
Modified Files:
Tag: radmind-1-6-0-branch
aclocal.m4 configure
Log Message:
Pass correct configure args to libsnet for ssl and sasl ( bugs 1435999 )
Thanks Matt Selsky
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/radmind/radmind/aclocal.m4,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** aclocal.m4 24 Jan 2006 20:47:52 -0000 1.13
--- aclocal.m4 21 Feb 2006 21:29:59 -0000 1.13.2.1
***************
*** 74,78 ****
CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
LDFLAGS="$LDFLAGS -L$zlibdir/lib";
! ac_configure_extra_args="$ac_configure_extra_args --with-zlib=$dir";
fi
LIBS="$LIBS -lz";
--- 74,78 ----
CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
LDFLAGS="$LDFLAGS -L$zlibdir/lib";
! ac_configure_args="$ac_configure_args --with-zlib=$dir";
fi
LIBS="$LIBS -lz";
***************
*** 83,87 ****
fi
else
! ac_configure_extra_args="$ac_configure_extra_args --with-zlib=no";
AC_MSG_RESULT(no)
fi
--- 83,87 ----
fi
else
! ac_configure_args="$ac_configure_args --with-zlib=no";
AC_MSG_RESULT(no)
fi
***************
*** 113,117 ****
AC_DEFUN([SET_NO_SASL],
[
! ac_configure_args="$ac_configure_extra_args --with-sasl=no";
AC_MSG_RESULT(Disabled SASL)
])
--- 113,117 ----
AC_DEFUN([SET_NO_SASL],
[
! ac_configure_args="$ac_configure_args --with-sasl=no";
AC_MSG_RESULT(Disabled SASL)
])
Index: configure
===================================================================
RCS file: /cvsroot/radmind/radmind/configure,v
retrieving revision 1.45
retrieving revision 1.45.2.1
diff -C2 -d -r1.45 -r1.45.2.1
*** configure 24 Jan 2006 20:47:52 -0000 1.45
--- configure 21 Feb 2006 21:29:59 -0000 1.45.2.1
***************
*** 5044,5048 ****
CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
LDFLAGS="$LDFLAGS -L$zlibdir/lib";
! ac_configure_extra_args="$ac_configure_extra_args --with-zlib=$dir";
fi
LIBS="$LIBS -lz";
--- 5044,5048 ----
CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
LDFLAGS="$LDFLAGS -L$zlibdir/lib";
! ac_configure_args="$ac_configure_args --with-zlib=$dir";
fi
LIBS="$LIBS -lz";
***************
*** 5058,5062 ****
fi
else
! ac_configure_extra_args="$ac_configure_extra_args --with-zlib=no";
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
--- 5058,5062 ----
fi
else
! ac_configure_args="$ac_configure_args --with-zlib=no";
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
***************
*** 5102,5106 ****
! ac_configure_args="$ac_configure_extra_args --with-sasl=no";
echo "$as_me:$LINENO: result: Disabled SASL" >&5
echo "${ECHO_T}Disabled SASL" >&6
--- 5102,5106 ----
! ac_configure_args="$ac_configure_args --with-sasl=no";
echo "$as_me:$LINENO: result: Disabled SASL" >&5
echo "${ECHO_T}Disabled SASL" >&6
|
