$OpenBSD: patch-configure,v 1.11 2010/08/28 09:20:13 sthen Exp $
--- configure.orig	Tue Mar  9 18:39:59 2010
+++ configure	Fri May 28 09:53:05 2010
@@ -1044,7 +1044,7 @@ do
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
+    sysconfdir=$ac_optarg/nagios ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
     ac_prev=target_alias ;;
@@ -5651,20 +5651,20 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_lib_cma_pthread_create" >&5
 echo "${ECHO_T}$ac_cv_lib_cma_pthread_create" >&6; }
 if test $ac_cv_lib_cma_pthread_create = yes; then
-  THREADLIBS="$THREADLIBS -lpthread"
+  THREADLIBS="$THREADLIBS -pthread"
 fi
 
 if test $ac_cv_lib_cma_pthread_create = yes; then
 	have_pthreads="yes"
 fi
 
-{ 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
@@ -5720,19 +5720,19 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
 echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
 if test $ac_cv_lib_pthread_pthread_create = yes; then
-  THREADLIBS="$THREADLIBS -lpthread"
+  THREADLIBS="$THREADLIBS -pthread"
 fi
 
 if test $ac_cv_lib_pthread_pthread_create = yes; then
 	have_pthreads="yes"
 else
-		{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; }
+		{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -pthread" >&5
+echo $ECHO_N "checking for pthread_mutex_init in -pthread... $ECHO_C" >&6; }
 if test "${ac_cv_lib_pthread_pthread_mutex_init+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
@@ -5788,7 +5788,7 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
 echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6; }
 if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
-  THREADLIBS="$THREADLIBS -lpthread"
+  THREADLIBS="$THREADLIBS -pthread"
 fi
 
 	if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
@@ -6127,7 +6127,7 @@ cat >>confdefs.h <<_ACEOF
 #define DEFAULT_NAGIOS_GROUP "$nagios_grp"
 _ACEOF
 
-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
+INSTALL_OPTS=""
 
 
 
@@ -6506,7 +6506,7 @@ echo $ECHO_N "checking for gdImagePng in -lgd (order 1
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_save_LIBS="$LIBS"
-	LIBS="-lgd -lttf -lpng -ljpeg -lz -lm $LIBS"
+	LIBS="-lgd -lfontconfig -lfreetype -lpng -ljpeg -lz -lm $LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6562,7 +6562,7 @@ fi
 echo "${ECHO_T}yes" >&6; }
 
 			GDLIBFOUND=yep
-			GDLIBS="-lgd -lttf -lpng -ljpeg -lz -lm"
+			GDLIBS="-lgd -lfontconfig -lfreetype -lpng -ljpeg -lz -lm"
 
 	else
 	  { echo "$as_me:$LINENO: result: no" >&5
@@ -7527,9 +7527,9 @@ echo $ECHO_N "checking for linker flags for loadable m
 			MOD_LDFLAGS="-shared"
 			MOD_CFLAGS="-fPIC"
 		;;
-		freebsd*)
+		freebsd* | openbsd*)
 			MOD_LDFLAGS="-shared"
-			MOD_CFLAGS="-fPIC"
+			MOD_CFLAGS="-fPIC -DPIC"
 		;;
 		*)
 			# assume GNU linker and ELF
