[Nmh-commits] CVS: nmh .cvsignore,1.3,1.4 configure.in,1.63,1.64

[Ken Hornstein <address@hidden>]

Update of /cvsroot/nmh/nmh
In directory subversions:/tmp/cvs-serv2428

Modified Files:
        .cvsignore configure.in 
Log Message:
Merge in changes from the 1.1 branch.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/nmh/nmh/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** .cvsignore  8 Jul 2002 19:29:24 -0000       1.3
--- .cvsignore  5 Sep 2003 21:07:49 -0000       1.4
***************
*** 1,2 ****
--- 1,3 ----
+ autom4te.cache
  configure
  config.h.in

Index: configure.in
===================================================================
RCS file: /cvsroot/nmh/nmh/configure.in,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** configure.in        22 Jun 2003 23:58:07 -0000      1.63
--- configure.in        5 Sep 2003 21:07:49 -0000       1.64
***************
*** 639,644 ****
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $SASL_LIBS"
!   AC_CHECK_LIB(sasl, sasl_client_new,
!     [SASL_LIBS="$SASL_LIBS -lsasl"],
      [AC_MSG_ERROR(Cyrus SASL library not found)])
    LDFLAGS="$save_LDFLAGS"
--- 639,644 ----
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $SASL_LIBS"
!   AC_CHECK_LIB(sasl2, sasl_client_new,
!     [SASL_LIBS="$SASL_LIBS -lsasl2"],
      [AC_MSG_ERROR(Cyrus SASL library not found)])
    LDFLAGS="$save_LDFLAGS"