[asterisk-commits] pcadach: branch pcadach/chan_h323-live r43209 - in /team/pcadach/chan_h323-li...

[asterisk-commits at lists.digium.com]

Author: pcadach
Date: Mon Sep 18 14:37:50 2006
New Revision: 43209

URL: http://svn.digium.com/view/asterisk?rev=43209&view=rev
Log:
Merged revisions 43205,43207-43208 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r43205 | qwell | 2006-09-19 01:08:40 +0600 (Втр, 19 Сен 2006) | 2 lines

escape some quotes

........
r43207 | kpfleming | 2006-09-19 01:20:24 +0600 (Втр, 19 Сен 2006) | 2 lines

it appears that current Mac OS/X does not need the poll compatibility module at all, and platforms that do need it also need -DPOLLCOMPAT (or they wouldn't have compiled at all)

........
r43208 | kpfleming | 2006-09-19 01:30:10 +0600 (Втр, 19 Сен 2006) | 2 lines

handle config.guess name for FreeBSD properly

........

Modified:
    team/pcadach/chan_h323-live/   (props changed)
    team/pcadach/chan_h323-live/build_tools/prep_moduledeps
    team/pcadach/chan_h323-live/configure
    team/pcadach/chan_h323-live/configure.ac
    team/pcadach/chan_h323-live/main/Makefile

Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 18 14:37:50 2006
@@ -1,1 +1,1 @@
-/trunk:1-43201
+/trunk:1-43208

Modified: team/pcadach/chan_h323-live/build_tools/prep_moduledeps
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/build_tools/prep_moduledeps?rev=43209&r1=43208&r2=43209&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/build_tools/prep_moduledeps (original)
+++ team/pcadach/chan_h323-live/build_tools/prep_moduledeps Mon Sep 18 14:37:50 2006
@@ -28,7 +28,7 @@
 	echo -e "\t</category>"
 }
 
-echo "<?xml version="1.0"?>"
+echo "<?xml version=\"1.0\"?>"
 echo
 echo "<menu name=\"Asterisk Module Selection\">"
 rm -f .makeoptstmp

Modified: team/pcadach/chan_h323-live/configure
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure?rev=43209&r1=43208&r2=43209&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure (original)
+++ team/pcadach/chan_h323-live/configure Mon Sep 18 14:37:50 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 43038 .
+# From configure.ac Revision: 43198 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60.
 #
@@ -2021,7 +2021,7 @@
 
 
 case "${host_os}" in
-     freebsd)
+     freebsd*)
      ac_default_prefix=/usr/local
      ;;
      *)

Modified: team/pcadach/chan_h323-live/configure.ac
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure.ac?rev=43209&r1=43208&r2=43209&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure.ac (original)
+++ team/pcadach/chan_h323-live/configure.ac Mon Sep 18 14:37:50 2006
@@ -22,7 +22,7 @@
 AC_REVISION($Revision$)
 
 case "${host_os}" in
-     freebsd)
+     freebsd*)
      ac_default_prefix=/usr/local
      ;;
      *)

Modified: team/pcadach/chan_h323-live/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/main/Makefile?rev=43209&r1=43208&r2=43209&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/main/Makefile (original)
+++ team/pcadach/chan_h323-live/main/Makefile Mon Sep 18 14:37:50 2006
@@ -39,6 +39,7 @@
 
 ifeq ($(wildcard /usr/include/sys/poll.h),)
   OBJS+=poll.o
+  ASTCFLAGS+=-DPOLLCOMPAT
 endif
 
 ifeq ($(wildcard /usr/include/dlfcn.h),)
@@ -58,11 +59,6 @@
   AST_LIBS+=-lresolv
   ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
     ASTLINK=-Wl,-dynamic
-  endif
-  # Mac on Intel CoreDuo does not need poll compatibility layer
-  ifneq ($(PROC),i386)
-    OBJS+=poll.o
-    ASTCFLAGS+=-DPOLLCOMPAT
   endif
 else
 # These are used for all but Darwin