--- configure.orig	2008-12-15 19:43:59.000000000 +0200
+++ configure	2009-01-26 22:19:11.000000000 +0200
@@ -3957,8 +3957,6 @@
 case "${host_os}" in
      freebsd*)
      ac_default_prefix=/usr/local
-     CPPFLAGS=-I/usr/local/include
-     LDFLAGS=-L/usr/local/lib
      ;;
      *)
      ac_default_prefix=/usr
@@ -26022,6 +26020,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+#include <ptlib.h>
 #include <${HOME}/openh323/include/h323.h>
 _ACEOF
 rm -f conftest.$ac_objext
@@ -26062,6 +26061,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <ptlib.h>
 #include <${HOME}/openh323/include/h323.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
@@ -26164,6 +26164,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+#include <ptlib.h>
 #include </usr/local/include/openh323/h323.h>
 _ACEOF
 rm -f conftest.$ac_objext
@@ -26204,6 +26205,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <ptlib.h>
 #include </usr/local/include/openh323/h323.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
@@ -26456,7 +26458,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
@@ -30834,6 +30836,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+#include <ptlib.h>
 #include <h323.h>
 _ACEOF
 rm -f conftest.$ac_objext
@@ -30874,6 +30877,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <ptlib.h>
 #include <h323.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"