aboutsummaryrefslogtreecommitdiffstats
path: root/net/asterisk16
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2007-08-11 00:30:40 +0800
committersobomax <sobomax@FreeBSD.org>2007-08-11 00:30:40 +0800
commit01b10bf3fb3a8f4acce817e2085615227c9da76a (patch)
treecb93c544863c322ee4be1a1b853569cd6555a2b9 /net/asterisk16
parentc48ca2cc06c0d6eb37ee879db9ca8a1d296ec5a9 (diff)
downloadfreebsd-ports-gnome-01b10bf3fb3a8f4acce817e2085615227c9da76a.tar.gz
freebsd-ports-gnome-01b10bf3fb3a8f4acce817e2085615227c9da76a.tar.zst
freebsd-ports-gnome-01b10bf3fb3a8f4acce817e2085615227c9da76a.zip
Update to 1.4.10.
Sponsored by: Sippy Software, Inc. ( http://www.sippysoft.com/ )
Diffstat (limited to 'net/asterisk16')
-rw-r--r--net/asterisk16/Makefile13
-rw-r--r--net/asterisk16/distinfo9
-rw-r--r--net/asterisk16/files/codecnego-patch-Makefile223
-rw-r--r--net/asterisk16/files/nocodecnego-patch-Makefile (renamed from net/asterisk16/files/patch-Makefile)2
-rw-r--r--net/asterisk16/files/patch-configure50
5 files changed, 258 insertions, 39 deletions
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 85a923df1604..f878654c71c1 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= asterisk
-PORTVERSION= 1.4.9
-PORTREVISION= 1
+PORTVERSION= 1.4.10
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
@@ -48,6 +47,7 @@ OPTIONS= OGGVORBIS "Enable Ogg Vorbis support" on \
FREETDS "Enable FreeTDS support" on \
JABBER "Enable Jabber and Gtalk support" on \
SQLITE "Enable SQLITE support" on
+# CODEC_PATCH "Apply codec nego patch" off
.include <bsd.port.pre.mk>
@@ -155,6 +155,15 @@ CONFIGURE_ARGS+= --with-sqlite
LIB_DEPENDS+= sqlite:${PORTSDIR}/databases/sqlite2
.endif
+.if defined(WITH_CODEC_PATCH)
+PATCHFILES= asterisk-1.4.10-codec-negotiation-20070810.diff.gz
+PATCH_SITES= http://www.sippysoft.com/~bamby/
+EXTRA_PATCHES= ${PATCHDIR}/codecnego-patch-Makefile
+.else
+EXTRA_PATCHES= ${PATCHDIR}/nocodecnego-patch-Makefile
+.endif
+
+
post-patch:
${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo
index a5eef5ec94ab..7db434144b8f 100644
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@@ -1,3 +1,6 @@
-MD5 (asterisk-1.4.9.tar.gz) = e47f5b3cb5323318dc8c6fb7311b767e
-SHA256 (asterisk-1.4.9.tar.gz) = c1b41503a0c29fd1f5172c834a60a3c5aacf472fd60a1272f743672af36602a6
-SIZE (asterisk-1.4.9.tar.gz) = 11182148
+MD5 (asterisk-1.4.10.tar.gz) = 69057e2916287f6e2a1e36dba6d6800d
+SHA256 (asterisk-1.4.10.tar.gz) = 72bbb19e35ec304df06dca717b7ac2cae0d3409fe47c17c2dcf75850f61ddbe1
+SIZE (asterisk-1.4.10.tar.gz) = 11208127
+MD5 (asterisk-1.4.10-codec-negotiation-20070810.diff.gz) = a96c9e44458dc40bb113200f69d3d18e
+SHA256 (asterisk-1.4.10-codec-negotiation-20070810.diff.gz) = 347d6ca9bcccf2aa7f3140d5ce08aa3c2f7751dbf076256be63e6532f2919e96
+SIZE (asterisk-1.4.10-codec-negotiation-20070810.diff.gz) = 37650
diff --git a/net/asterisk16/files/codecnego-patch-Makefile b/net/asterisk16/files/codecnego-patch-Makefile
new file mode 100644
index 000000000000..390191fe01a7
--- /dev/null
+++ b/net/asterisk16/files/codecnego-patch-Makefile
@@ -0,0 +1,223 @@
+--- Makefile.orig Fri Aug 10 17:08:31 2007
++++ Makefile Fri Aug 10 17:18:00 2007
+@@ -210,7 +210,7 @@
+
+ ifeq ($(OSARCH),FreeBSD)
+ # -V is understood by BSD Make, not by GNU make.
+- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
++ BSDVERSION=$(OSVERSION)
+ ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+ AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
+ endif
+@@ -375,15 +375,15 @@
+ # Should static HTTP be installed during make samples or even with its own target ala
+ # webvoicemail? There are portions here that *could* be customized but might also be
+ # improved a lot. I'll put it here for now.
+- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http
+ for x in static-http/*; do \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
+ done
+- mkdir -p $(DESTDIR)$(ASTDATADIR)/images
++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/images
+ for x in images/*.jpg; do \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \
+ done
+- mkdir -p $(DESTDIR)$(AGI_DIR)
++ $(MKDIR) $(DESTDIR)$(AGI_DIR)
+ $(MAKE) -C sounds install
+
+ update:
+@@ -404,45 +404,45 @@
+ OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
+
+ bininstall: _all
+- mkdir -p $(DESTDIR)$(MODULES_DIR)
+- mkdir -p $(DESTDIR)$(ASTSBINDIR)
+- mkdir -p $(DESTDIR)$(ASTETCDIR)
+- mkdir -p $(DESTDIR)$(ASTBINDIR)
+- mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
+- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
++ $(MKDIR) $(DESTDIR)$(MODULES_DIR)
++ $(MKDIR) $(DESTDIR)$(ASTSBINDIR)
++ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
++ $(MKDIR) $(DESTDIR)$(ASTBINDIR)
++ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
++ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/
+ $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
+- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
++ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
++ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
+ if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
+ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
+ chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
+ fi
+- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
+- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
+- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
++ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
++ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir)
++ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
+ if [ -n "$(OLDHEADERS)" ]; then \
+ rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
+ fi
+- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
+- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
+- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
+- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
+- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
+- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
+- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
+- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
+- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
+- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
++ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
++ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
++ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
++ $(BSD_INSTALL_DATA) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
++ $(BSD_INSTALL_DATA) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
++ $(BSD_INSTALL_DATA) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
++ $(BSD_INSTALL_DATA) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
+- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
++ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
+ fi
+
+ $(SUBDIRS_INSTALL):
+@@ -469,7 +469,7 @@
+ echo " WARNING WARNING WARNING" ;\
+ fi
+
+-install: datafiles bininstall $(SUBDIRS_INSTALL)
++install: datafiles bininstall $(SUBDIRS_INSTALL) samples
+ @if [ -x /usr/sbin/asterisk-post-install ]; then \
+ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+ fi
+@@ -499,31 +499,23 @@
+ upgrade: bininstall
+
+ adsi:
+- mkdir -p $(DESTDIR)$(ASTETCDIR)
++ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
+ for x in configs/*.adsi; do \
+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
+ fi ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
+ done
+
+ samples: adsi
+- mkdir -p $(DESTDIR)$(ASTETCDIR)
++ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
+ for x in configs/*.sample; do \
+- if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
+- if [ "$(OVERWRITE)" = "y" ]; then \
+- if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \
+- echo "Config file $$x is unchanged"; \
+- continue; \
+- fi ; \
+- mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \
+- else \
+- echo "Skipping config file $$x"; \
+- continue; \
+- fi ;\
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\
++ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\
+ fi ; \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\
+ done
+- if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
++ if true; then \
+ ( \
+ echo "[directories]" ; \
+ echo "astetcdir => $(ASTETCDIR)" ; \
+@@ -585,20 +577,23 @@
+ echo "; Default: strict"; \
+ echo ";"; \
+ echo ";translation_algorithm = strict"; \
+- ) > $(DESTDIR)$(ASTCONFPATH) ; \
++ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
++ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
++ cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
++ fi; \
+ else \
+ echo "Skipping asterisk.conf creation"; \
+ fi
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
+ build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
+
+ webvmail:
+ @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
+ @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
+ $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
+- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
++ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
+ for x in images/*.gif; do \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
+ done
+ @echo " +--------- Asterisk Web Voicemail ----------+"
+ @echo " + +"
+@@ -625,10 +620,10 @@
+
+ __rpm: include/asterisk/version.h include/asterisk/buildopts.h spec
+ rm -rf /tmp/asterisk ; \
+- mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
++ $(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \
+ $(MAKE) DESTDIR=/tmp/asterisk install ; \
+ $(MAKE) DESTDIR=/tmp/asterisk samples ; \
+- mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
++ $(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \
+ cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \
+ rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
+
+@@ -639,19 +634,19 @@
+ config:
+ @if [ "${OSARCH}" = "linux-gnu" ]; then \
+ if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
+- $(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
++ $(BSD_INSTALL_SCRIPT) contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
+ /sbin/chkconfig --add asterisk; \
+ elif [ -f /etc/debian_version ]; then \
+- $(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk /etc/init.d/asterisk; \
++ $(BSD_INSTALL_SCRIPT) contrib/init.d/rc.debian.asterisk /etc/init.d/asterisk; \
+ /usr/sbin/update-rc.d asterisk start 10 2 3 4 5 . stop 91 2 3 4 5 .; \
+ elif [ -f /etc/gentoo-release ]; then \
+- $(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk /etc/init.d/asterisk; \
++ $(BSD_INSTALL_SCRIPT) contrib/init.d/rc.gentoo.asterisk /etc/init.d/asterisk; \
+ /sbin/rc-update add asterisk default; \
+ elif [ -f /etc/mandrake-release ]; then \
+- $(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk /etc/rc.d/init.d/asterisk; \
++ $(BSD_INSTALL_SCRIPT) contrib/init.d/rc.mandrake.asterisk /etc/rc.d/init.d/asterisk; \
+ /sbin/chkconfig --add asterisk; \
+ elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
+- $(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk /etc/init.d/asterisk; \
++ $(BSD_INSTALL_SCRIPT) contrib/init.d/rc.suse.asterisk /etc/init.d/asterisk; \
+ /sbin/chkconfig --add asterisk; \
+ elif [ -f /etc/slackware-version ]; then \
+ echo "Slackware is not currently supported, although an init script does exist for it." \
diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/nocodecnego-patch-Makefile
index 0a6c7bc4b3a8..c9f11183d938 100644
--- a/net/asterisk16/files/patch-Makefile
+++ b/net/asterisk16/files/nocodecnego-patch-Makefile
@@ -1,5 +1,5 @@
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/net/asterisk16/files/Attic/nocodecnego-patch-Makefile,v 1.1 2007-08-10 16:30:40 sobomax Exp $
--- Makefile.orig
+++ Makefile
diff --git a/net/asterisk16/files/patch-configure b/net/asterisk16/files/patch-configure
index 21df7182f365..adb7268b02b2 100644
--- a/net/asterisk16/files/patch-configure
+++ b/net/asterisk16/files/patch-configure
@@ -12,23 +12,7 @@ $FreeBSD$
;;
*)
ac_default_prefix=/usr
-@@ -26066,6 +26064,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <ptlib.h>
- #include <${OPENH323DIR}/include/h323.h>
- _ACEOF
- rm -f conftest.$ac_objext
-@@ -26106,6 +26105,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <ptlib.h>
- #include <${OPENH323DIR}/include/h323.h>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
-@@ -26202,6 +26202,7 @@
+@@ -26228,6 +26226,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -36,7 +20,7 @@ $FreeBSD$
#include <${HOME}/openh323/include/h323.h>
_ACEOF
rm -f conftest.$ac_objext
-@@ -26242,6 +26243,7 @@
+@@ -26268,6 +26267,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44,7 +28,7 @@ $FreeBSD$
#include <${HOME}/openh323/include/h323.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
-@@ -26336,6 +26338,7 @@
+@@ -26365,6 +26365,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -52,7 +36,7 @@ $FreeBSD$
#include </usr/local/include/openh323/h323.h>
_ACEOF
rm -f conftest.$ac_objext
-@@ -26376,6 +26379,7 @@
+@@ -26405,6 +26406,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -60,28 +44,28 @@ $FreeBSD$
#include </usr/local/include/openh323/h323.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
-@@ -26475,6 +26479,7 @@
+@@ -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 </usr/include/openh323/h323.h>
+ #include <h323.h>
_ACEOF
rm -f conftest.$ac_objext
-@@ -26515,6 +26520,7 @@
+@@ -31840,6 +31843,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <ptlib.h>
- #include </usr/include/openh323/h323.h>
+ #include <h323.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
-@@ -26700,7 +26706,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