Cleanups to the "--with-ssl" configuration option, and changes to add
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 22 May 2001 06:33:06 +0000 (06:33 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 22 May 2001 06:33:06 +0000 (06:33 +0000)
compiler flags on Solaris with GCC to cope with X11 header file
inadequacies.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3433 f5534014-38df-0310-8fa8-9805f1628bb7

AUTHORS
acinclude.m4
configure.in
doc/ethereal.pod.template

diff --git a/AUTHORS b/AUTHORS
index 69b7ca0b051ef30e0a429feb1dc0226335f4a5a8..5ec0ed34b1edb53e464e070499f0c764db3e028d 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -635,6 +635,13 @@ Eran Mann <emann@opticalaccess.com> {
        Fix to LDP prefix FEC dissection for IPv4
 }
 
+Andy Hood <ahood@westpac.com.au> {
+       "--with-ssl" configuration option, to use if UCD SNMP is
+          compiled with crypto support and needs -lcrypto
+       On Solaris, with GCC, add flags to reduce warnings from
+          inadequacies of function declarations in X11 headers
+}
+
 Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
 
index d6ea5b82a7fb55d4c5e54a7b0e18f78bffa3a977..b106ab8bc697f19a7003a5a42d5e8d6955cebb3e 100644 (file)
@@ -2,7 +2,7 @@ dnl Macros that test for specific features.
 dnl This file is part of the Autoconf packaging for Ethereal.
 dnl Copyright (C) 1998-2000 by Gerald Combs.
 dnl
-dnl $Id: acinclude.m4,v 1.23 2001/05/11 01:09:59 guy Exp $
+dnl $Id: acinclude.m4,v 1.24 2001/05/22 06:33:04 guy Exp $
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -363,31 +363,20 @@ AC_DEFUN(AC_ETHEREAL_SSL_CHECK,
 
        if test $want_ssl = yes
        then
-               ssldir=""
 
-               for d in $ssl_user_dir $prefix
-               do
-                       if test x$d != xNONE 
-                       then
-                               AC_MSG_CHECKING($d for ssl)
-
-                               if test x$d != x/usr/local && test -f $d/lib/libcrypto.a
-                               then
+               AC_CHECK_LIB(crypto, EVP_md5,
+                 [
+                   SSL_LIBS=-lcrypto
+                   AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${ssl_user_dir}/lib)
                                        AC_MSG_RESULT(found)
-                                       ssldir=$d
-                                       break
-                               else
+                 ],[
                                        AC_MSG_RESULT(not found)
-                               fi
-                       fi
-               done
+                 ],
+                 -L${ssl_user_dir}/lib -lcrypto
+               )
 
-               if test x$ssldir != x
-               then
-                       SSL_LIBS=-lcrypto
-                       CFLAGS="$CFLAGS -I${ssldir}/include"
-                       CPPFLAGS="$CPPFLAGS -I${ssldir}/include"
-                       AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${ssldir}/lib)
-               fi
+       else
+               AC_MSG_RESULT(not required)
        fi
+
 ])
index 1e41be1bfc3a7da9efd96b0a8018877e9e106af2..a789763a1fef73a0986ea695623c90d4014d6efd 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.125 2001/05/16 21:32:04 ashokn Exp $
+# $Id: configure.in,v 1.126 2001/05/22 06:33:04 guy Exp $
 dnl
 dnl Process this file with autoconf 2.13 or later to produce a
 dnl configure script; 2.12 doesn't generate a "configure" script that
@@ -117,7 +117,16 @@ then
                ;;
        esac
 else
+       case "$host_os" in
+       solaris*)
+               # the X11 headers don't automatically include prototype info
+               # and a lot don't include the return type
+               CFLAGS="$CFLAGS -Wno-return-type -DFUNCPROTO=15"
+               ;;
+       *)
        AC_MSG_RESULT(none needed)
+               ;;
+       esac
 fi
 
 #
index f79dd6c6971cdd2849cdd1ba2705f39f6c34ed6d..ec21afbe51c708980646d2941c6b7bb46ba7be59 100644 (file)
@@ -1105,7 +1105,7 @@ B<http://www.ethereal.com>.
   Jean-Christian Pennetier <jeanchristian.pennetier@rd.francetelecom.fr>
   Jian Yu                  <bgp4news@yahoo.com>
   Eran Mann                <emann@opticalaccess.com>
-
+  Andy Hood                <ahood@westpac.com.au>
 
 Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.