[configure.in] Clean up library testing.

Add optional PATH to --with-pcre, --with-zlib, --with-tcp-wrappers
based on patch by albert chin ([email protected])

Re-arange AC_CHECK_HEADERS and AC_CHECK_FUNCS for eaiser reading
of patches to configure.in

Replace obsolete AC_STRUCT_ST_BLKSIZE with AC_CHECK_MEMBERS

Add test for broken dirname() on Solaris 2.5.1 by
Dan Astoorian <[email protected]>

[acconfig.h aclocal.m4 defines.h configure.in]
Better socklen_t patch by albert chin ([email protected])

[scp.c]
Replace obsolete HAVE_ST_BLKSIZE with HAVE_STRUCT_STAT_ST_BLKSIZE

[Makefile.in] When running make in top level, always do make in openbsd-compat
patch by Dave Dykstra <[email protected]>

ChangeLog

@@ -1,3 +1,18 @@
+20011021
+ - (tim) [configure.in] Clean up library testing. Add optional PATH to
+	 --with-pcre, --with-zlib, and --with-tcp-wrappers. Based on
+	 patch by albert chin ([email protected])
+	 Re-arange AC_CHECK_HEADERS and AC_CHECK_FUNCS for eaiser reading
+	 of patches to configure.in. Replace obsolete AC_STRUCT_ST_BLKSIZE
+	 with AC_CHECK_MEMBERS. Add test for broken dirname() on
+	 Solaris 2.5.1 by Dan Astoorian <[email protected]>
+	 [acconfig.h aclocal.m4 defines.h configure.in] Better socklen_t test.
+	 patch by albert chin ([email protected])
+	 [scp.c] Replace obsolete HAVE_ST_BLKSIZE with
+	 HAVE_STRUCT_STAT_ST_BLKSIZE.
+	 [Makefile.in] When running make in top level, always do make
+	 in openbsd-compat. patch by Dave Dykstra <[email protected]>
+
 20011019
  - (bal) Fixed up init.d symlink issue and piddir stuff.  Patches by
    Zoran Milojevic <[email protected]> and [email protected] 
@@ -6725,4 +6740,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1609 2001/10/19 20:36:23 mouring Exp $
+$Id: ChangeLog,v 1.1610 2001/10/22 00:53:58 tim Exp $

Makefile.in

@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.188 2001/10/12 09:15:28 djm Exp $
+# $Id: Makefile.in,v 1.189 2001/10/22 00:53:59 tim Exp $
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -86,8 +86,9 @@ $(SSHDOBJS): config.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
 
 LIBCOMPAT=openbsd-compat/libopenbsd-compat.a
-$(LIBCOMPAT): config.h
+$(LIBCOMPAT): always
 	(cd openbsd-compat; $(MAKE))
+always:
 
 libssh.a: $(LIBSSH_OBJS)
 	$(AR) rv $@ $(LIBSSH_OBJS)

acconfig.h

@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.117 2001/09/20 19:43:41 stevesk Exp $ */
+/* $Id: acconfig.h,v 1.118 2001/10/22 00:53:59 tim Exp $ */
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -251,7 +251,6 @@
 #undef HAVE_INT64_T
 #undef HAVE_U_INT64_T
 #undef HAVE_U_CHAR
-#undef HAVE_SOCKLEN_T
 #undef HAVE_SIZE_T
 #undef HAVE_SSIZE_T
 #undef HAVE_CLOCK_T

aclocal.m4

@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.4 2000/06/26 00:20:19 djm Exp $
+dnl $Id: aclocal.m4,v 1.5 2001/10/22 00:53:59 tim Exp $
 dnl
 dnl OpenSSH-specific autoconf macros
 dnl
@@ -43,3 +43,44 @@ AC_DEFUN(OSSH_PATH_ENTROPY_PROG, [
 	AC_SUBST($1)
 ])
 
+dnl Check for socklen_t: historically on BSD it is an int, and in
+dnl POSIX 1g it is a type of its own, but some platforms use different
+dnl types for the argument to getsockopt, getpeername, etc.  So we
+dnl have to test to find something that will work.
+AC_DEFUN([TYPE_SOCKLEN_T],
+[
+   AC_CHECK_TYPE([socklen_t], ,[
+      AC_MSG_CHECKING([for socklen_t equivalent])
+      AC_CACHE_VAL([curl_cv_socklen_t_equiv],
+      [
+	 # Systems have either "struct sockaddr *" or
+	 # "void *" as the second argument to getpeername
+	 curl_cv_socklen_t_equiv=
+	 for arg2 in "struct sockaddr" void; do
+	    for t in int size_t unsigned long "unsigned long"; do
+	       AC_TRY_COMPILE([
+		  #include <sys/types.h>
+		  #include <sys/socket.h>
+
+		  int getpeername (int, $arg2 *, $t *);
+	       ],[
+		  $t len;
+		  getpeername(0,0,&len);
+	       ],[
+		  curl_cv_socklen_t_equiv="$t"
+		  break
+	       ])
+	    done
+	 done
+
+	 if test "x$curl_cv_socklen_t_equiv" = x; then
+	    AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+	 fi
+      ])
+      AC_MSG_RESULT($curl_cv_socklen_t_equiv)
+      AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
+			[type to use in place of socklen_t if not defined])],
+      [#include <sys/types.h>
+#include <sys/socket.h>])
+])
+