bincimap

commit 987bac7d30643d5fae930e0e34f72533a1cb6dee
parent 32d10d92a2df41bd7c02d207b0b6a3739e1ec416
Author: andreaha <andreaha@b31fe1f4-c0d1-0310-8000-a34f4ae90293>
Date:   Sat, 21 Feb 2004 10:26:02 +0000

- Added configure.in autocheck for -lsocket


git-svn-id: file:///home/cwright/convert/bincimap/trunk@44 b31fe1f4-c0d1-0310-8000-a34f4ae90293

Diffstat:
M
bincimap.spec.in
 | 
1
+
M
configure.in
 | 
10
++++++++--

2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/bincimap.spec.in b/bincimap.spec.in
@@ -195,6 +195,7 @@ install man/bincimap.conf.5	$MAN/man5
 - Fixes to configure.in allow correct handling of --with-openssl-libs
   option.
 - The magic "." mailbox with IMAPdir is now skipped.
+- Added configure.in autocheck for -lsocket.
 
 * Tue Feb 10 2004 Andreas Aardal Hanssen <andreas-binc@bincimap.org>
 - Replaced command line parser, as a first step towards completely
diff --git a/configure.in b/configure.in
@@ -172,6 +172,12 @@ AC_HELP_STRING([--without-ssl], [Disable SSL support]),
             [ if [[ "x$withval" != "xno" ]]; then WITH_SSL=1; fi ],
             WITH_SSL=1)
 
+AC_MSG_CHECKING(whether -lsocket is available)
+export LDTMP=$LDFLAGS
+export LDFLAGS="-lsocket"
+AC_TRY_LINK([], [], LIBSOCKET="-lsocket"; AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+export LDFLAGS=$LDTMP
+
 AC_MSG_CHECKING(for OpenSSL libraries)
 if [[ "$WITH_SSL" = "1" ]]; then
   AC_LANG_CPLUSPLUS
@@ -180,8 +186,8 @@ if [[ "$WITH_SSL" = "1" ]]; then
 
   export LDTMP=$LDFLAGS
   for k in found $SSLLIBS /usr/lib /usr/local/lib /usr/local/ssl/lib /usr/local/openssl/lib /opt/ssl/lib /opt/openssl/lib; do
-      export LDFLAGS="-L$k $LDTMP -lssl -lcrypto"
-      AC_TRY_LINK([#include <openssl/ssl.h>], [SSL_write(0, 0, 0);], LIBSSL="-L$k -lssl -lcrypto"; AC_MSG_RESULT($k), [])
+      export LDFLAGS="-L$k $LDTMP -lssl -lcrypto $LIBSOCKET"
+      AC_TRY_LINK([#include <openssl/ssl.h>], [SSL_write(0, 0, 0);], LIBSSL="-L$k -lssl -lcrypto $LIBSOCKET"; AC_MSG_RESULT($k), [])
       if [[ "x$LIBSSL" != "x" ]]; then break; fi
   done