$OpenBSD: patch-configure,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
--- configure.orig	Thu Jun  9 22:21:21 2011
+++ configure	Fri Jun 10 13:34:10 2011
@@ -21920,13 +21920,13 @@ fi
 
 # Everything uses pthread
 # check lib, but do not set in link list, but use -pthread instead (gnu c/c++ only?)
-{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; }
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
+LIBS="-pthread  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22045,7 +22045,7 @@ else
   with_distro=rhel
 fi
 
-if test "$with_distro" != "rhel" -a "$with_distro" != "suse" -a "$with_distro" != "sles" -a "$with_distro" != "cbs4"; then
+if test "$with_distro" != "rhel" -a "$with_distro" != "suse" -a "$with_distro" != "sles" -a "$with_distro" != "cbs4" -a "$with_distro" != "openbsd"; then
    { echo "$as_me:$LINENO: result: unknown distro, using rhel instead" >&5
 echo "${ECHO_T}unknown distro, using rhel instead" >&6; }
    with_distro=rhel
@@ -24445,7 +24445,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl  $LIBS"
+LIBS="-lintl -liconv $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24505,7 +24505,7 @@ if test $ac_cv_lib_intl_strftime = yes; then
 #define HAVE_STRFTIME 1
 _ACEOF
 
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
 fi
 
 fi
@@ -26019,7 +26019,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
 _ACEOF
 
 		VMIME_CFLAGS=-I$VMIME_PREFIX
-	VMIME_LIBS="$VMIME_LIBS -lvmime"
+	VMIME_LIBS="$VMIME_LIBS -lvmime-zarafa"
 
 else
 
@@ -27536,13 +27536,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	 { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 
-{ echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for crypt in -lcrypto" >&5
+echo $ECHO_N "checking for crypt in -lcrypto... $ECHO_C" >&6; }
 if test "${ac_cv_lib_crypt_crypt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypt  $LIBS"
+LIBS="-lcrypto  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27602,7 +27602,7 @@ if test $ac_cv_lib_crypt_crypt = yes; then
 #define HAVE_LIBCRYPT 1
 _ACEOF
 
-  LIBS="-lcrypt $LIBS"
+  LIBS="-lcrypto $LIBS"
 
 else
   { { echo "$as_me:$LINENO: error: required library libcrypt missing or unusable" >&5
@@ -27696,7 +27696,7 @@ if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl  $LIBS"
+LIBS="-lssl -lcrypto $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28803,7 +28803,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl  $LIBS"
+LIBS="-lintl -liconv $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28859,7 +28859,7 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_lib_intl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6; }
 if test $ac_cv_lib_intl_gettext = yes; then
-  INTL_LIBS="-lintl"
+  INTL_LIBS="-lintl -liconv"
 else
       { { echo "$as_me:$LINENO: error: required library libintl missing or unusable" >&5
 echo "$as_me: error: required library libintl missing or unusable" >&2;}
