--- configure.orig	2011-01-25 00:37:33.000000000 +0100
+++ configure	2011-01-25 00:39:33.000000000 +0100
@@ -621,7 +621,6 @@
 ac_default_prefix=/usr/local
 ac_default_prefix=/usr/local
 ac_default_prefix=/usr/local
-ac_default_prefix=/usr
 ac_header_list=
 ac_subst_vars='SHELL
 PATH_SEPARATOR
@@ -4279,9 +4278,9 @@
 astheaderdir='${includedir}/asterisk'
 astlibdir='${libdir}/asterisk'
 astmandir='${mandir}'
-astvarlibdir='${localstatedir}/lib/asterisk'
+astvarlibdir='${prefix}/share/asterisk'
 astdatadir='${astvarlibdir}'
-astdbdir='${astvarlibdir}'
+astdbdir='${localstatedir}/db/asterisk'
 astkeydir='${astvarlibdir}'
 astspooldir='${localstatedir}/spool/asterisk'
 astlogdir='${localstatedir}/log/asterisk'
@@ -4303,9 +4302,6 @@
 
 case "${host_os}" in
      freebsd*)
-
-     CPPFLAGS=-I/usr/local/include
-     LDFLAGS=-L/usr/local/lib
      ;;
      openbsd*)
 
@@ -27494,6 +27490,8 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <ifaddrs.h>
 int
 main ()
@@ -45012,7 +45010,7 @@
 
 	fi
 
-	PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"
+	PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}"
 
 	if test "${HAS_OPENH323:-unset}" != "unset"; then
 	   { echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5
