$FreeBSD$

--- configure.orig
+++ configure
@@ -3926,8 +3926,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
@@ -26228,6 +26226,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
@@ -26268,6 +26267,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"
@@ -26365,6 +26365,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
@@ -26405,6 +26406,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"
@@ -26652,7 +26654,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
@@ -31800,6 +31802,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+#include <ptlib.h>
 #include <h323.h>
 _ACEOF
 rm -f conftest.$ac_objext
@@ -31840,6 +31843,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"