$OpenBSD: patch-configure,v 1.2 2009/04/03 17:30:40 ajacoutot Exp $
--- configure.orig	Thu Mar 26 14:35:40 2009
+++ configure	Fri Apr  3 19:36:33 2009
@@ -21636,7 +21636,7 @@ else
 fi
 
 if test "$want_release" = "yes"; then
-    CXXFLAGS="$CXXFLAGS -O2 -fno-strict-aliasing"
+    CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
 fi
 
 # Check whether --enable-oss was given.
@@ -22188,9 +22188,9 @@ GSOAP_LIBS="-lz"
 
 # check user given vmime location
 
-# Check whether --with-vime-prefix was given.
-if test "${with_vime_prefix+set}" = set; then
-  withval=$with_vime_prefix; VMIME_PREFIX=${withval}
+# Check whether --with-vmime-prefix was given.
+if test "${with_vmime_prefix+set}" = set; then
+  withval=$with_vmime_prefix; VMIME_PREFIX=${withval}
 else
   VMIME_PREFIX=
 fi
@@ -22471,7 +22471,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
 _ACEOF
 
 		VMIME_CFLAGS=$VMIME_PREFIX
-	VMIME_LIBS="-lvmime"
+	VMIME_LIBS="${ZAFARA_LDFLAGS} -lvmime-zarafa"
 
 else
 
@@ -22755,7 +22755,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
   ICAL_CFLAGS=$ICAL_PREFIX
-    ICAL_LIBS="-lical -licalss -licalvcal"
+    ICAL_LIBS="${ZAFARA_LDFLAGS} -lical-zarafa -licalss-zarafa -licalvcal-zarafa"
 else
   { { echo "$as_me:$LINENO: error: libical headers are not found" >&5
 echo "$as_me: error: libical headers are not found" >&2;}
@@ -23531,13 +23531,13 @@ LIBS=$libs_keep
 libs_keep=$LIBS
 # check lib, but do not set in link list
 
-{ 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
@@ -23597,7 +23597,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
 #define HAVE_LIBPTHREAD 1
 _ACEOF
 
-  LIBS="-lpthread $LIBS"
+  LIBS="-pthread $LIBS"
 
 else
   { { echo "$as_me:$LINENO: error: required library libpthread missing or unusable" >&5
