[gq-commit] gq acinclude.m4,1.4,1.5 configure.in,1.50,1.51

[<bi...@us...>]

Update of /cvsroot/gqclient/gq
In directory sc8-pr-cvs1:/tmp/cvs-serv30519

Modified Files:
	acinclude.m4 configure.in 
Log Message:
if "sasl.h" not found, try to use "sasl/sasl.h". This fixes SF bug #777687
fix potential small bug in autoconf feature reporting


Index: acinclude.m4
===================================================================
RCS file: /cvsroot/gqclient/gq/acinclude.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** acinclude.m4	28 Sep 2003 23:31:03 -0000	1.4
--- acinclude.m4	11 Oct 2003 20:06:30 -0000	1.5
***************
*** 27,31 ****
  
  AC_DEFUN(ARG_YESNO, [
! if test -z "$1"; then
      echo "no"
  else
--- 27,31 ----
  
  AC_DEFUN(ARG_YESNO, [
! if test -z "$1" -o "x$1" = "xno"; then
      echo "no"
  else

Index: configure.in
===================================================================
RCS file: /cvsroot/gqclient/gq/configure.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** configure.in	11 Oct 2003 06:42:59 -0000	1.50
--- configure.in	11 Oct 2003 20:06:30 -0000	1.51
***************
*** 326,330 ****
  )
  
! AC_CHECK_HEADERS([sasl.h], [AC_DEFINE(HAVE_SASL,1,[Define if you have SASL])])
  
  GC_TIMEZONE()
--- 326,337 ----
  )
  
! AC_CHECK_HEADERS([sasl.h],
!     [AC_DEFINE(HAVE_SASL,1,[Define if you have SASL])],
!     [AC_CHECK_HEADERS([sasl/sasl.h], [AC_DEFINE(HAVE_SASL,1,[Define if you have SASL])])]
! )
! 
! if test "x$ac_cv_header_sasl_h" = "xyes" -o "x$ac_cv_header_sasl_sasl_h" = "xyes"; then
!     SASL=1
! fi
  
  GC_TIMEZONE()
***************
*** 691,695 ****
  echo -n "Encrypted passwords............ " ARG_YESNO($ac_cv_lib_crypto_OpenSSL_add_all_digests)
  echo -n "Gdk-pixbuf support............. " ARG_YESNO($HAVE_PIXBUF)
! echo -n "SASL binds..................... " ARG_YESNO($ac_cv_header_sasl_h)
  echo -n "Kerberos binds................. " ARG_YESNO($HAVE_KERBEROS)
  echo -n "Browser Drag and drop.......... " ARG_YESNO($enable_browser_dnd)
--- 698,702 ----
  echo -n "Encrypted passwords............ " ARG_YESNO($ac_cv_lib_crypto_OpenSSL_add_all_digests)
  echo -n "Gdk-pixbuf support............. " ARG_YESNO($HAVE_PIXBUF)
! echo -n "SASL binds..................... " ARG_YESNO($SASL)
  echo -n "Kerberos binds................. " ARG_YESNO($HAVE_KERBEROS)
  echo -n "Browser Drag and drop.......... " ARG_YESNO($enable_browser_dnd)