[Benson-commit] CVS: benson3 config.h,1.1,1.2 configure,1.5,1.6 configure.in,1.5,1.6

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson3
In directory usw-pr-cvs1:/tmp/cvs-serv5215

Modified Files:
	config.h configure configure.in 
Log Message:
Many changes to the configure stuff to make it go on solaris, and others

Index: config.h
===================================================================
RCS file: /cvsroot/benson/benson3/config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** config.h	2001/08/13 02:26:45	1.1
--- config.h	2001/08/16 20:04:27	1.2
***************
*** 24,37 ****
  
  /* Define if you have the `nsl' library (-lnsl). */
! /* #undef HAVE_LIBNSL */
  
  /* Define if you have the `socket' library (-lsocket). */
! /* #undef HAVE_LIBSOCKET */
  
  /* Define if you have the `ssl' library (-lssl). */
! #define HAVE_LIBSSL 1
  
  /* Define if you have the `w' library (-lw). */
! /* #undef HAVE_LIBW */
  
  /* Define if you have the <openssl/ssl.h> header file. */
--- 24,37 ----
  
  /* Define if you have the `nsl' library (-lnsl). */
! #define HAVE_LIBNSL 1
  
  /* Define if you have the `socket' library (-lsocket). */
! #define HAVE_LIBSOCKET 1
  
  /* Define if you have the `ssl' library (-lssl). */
! /* #undef HAVE_LIBSSL */
  
  /* Define if you have the `w' library (-lw). */
! #define HAVE_LIBW 1
  
  /* Define if you have the <openssl/ssl.h> header file. */

Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** configure	2001/08/16 17:25:29	1.5
--- configure	2001/08/16 20:04:27	1.6
***************
*** 7488,7498 ****
  fi;
  
! CPPFLAGS="$CPPFLAGS -I$ssl_dir/include"
! LDFLAGS="$LDFLAGS -L$ssl_dir/lib"
  
  for ac_header in openssl/ssl.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! echo "$as_me:7496: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
[...1361 lines suppressed...]
     { (exit 1); exit 1; }; }
--- 9140,9144 ----
           else
             # /dev/null tree
!            { { echo "$as_me:9142: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
***************
*** 9254,9258 ****
    if test x"$ac_file" != x-; then
      if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
!       { echo "$as_me:9256: $ac_file is unchanged" >&5
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
--- 9257,9261 ----
    if test x"$ac_file" != x-; then
      if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
!       { echo "$as_me:9259: $ac_file is unchanged" >&5
  echo "$as_me: $ac_file is unchanged" >&6;}
      else

Index: configure.in
===================================================================
RCS file: /cvsroot/benson/benson3/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** configure.in	2001/08/16 17:25:29	1.5
--- configure.in	2001/08/16 20:04:27	1.6
***************
*** 42,47 ****
  AC_ARG_ENABLE(profile,   [  --enable-profiling      Compile using -pg], use_profile=$enableval, use_profile=no)
  
! CPPFLAGS="$CPPFLAGS -I$ssl_dir/include"
! LDFLAGS="$LDFLAGS -L$ssl_dir/lib"
  
  AC_CHECK_HEADERS(openssl/ssl.h)
--- 42,50 ----
  AC_ARG_ENABLE(profile,   [  --enable-profiling      Compile using -pg], use_profile=$enableval, use_profile=no)
  
! if test X"$with_ssl" != Xno; then
! 	CPPFLAGS="$CPPFLAGS -I$ssl_dir/include"
! 	LDFLAGS="$LDFLAGS -R$ssl_dir/lib -L$ssl_dir/lib"
! 	LIBS="$LIBS -lssl -lcrypto"
! fi
  
  AC_CHECK_HEADERS(openssl/ssl.h)
***************
*** 56,60 ****
  AC_CHECK_LIB(ld, open)
  AC_CHECK_LIB(w, open)
! AC_CHECK_LIB(ssl, open)
  AC_PATH_PROG(sedpath, sed)
  AC_PATH_PROG(trpath, tr)
--- 59,63 ----
  AC_CHECK_LIB(ld, open)
  AC_CHECK_LIB(w, open)
! AC_CHECK_LIB(ssl, SSL_library_init)
  AC_PATH_PROG(sedpath, sed)
  AC_PATH_PROG(trpath, tr)