Merged revisions 151241 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Mon, 20 Oct 2008 05:00:56 +0000 (05:00 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Mon, 20 Oct 2008 05:00:56 +0000 (05:00 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r151241 | kpfleming | 2008-10-20 07:57:33 +0300 (Mon, 20 Oct 2008) | 2 lines

  rename this macro to properly reflect what it does
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@151243 65c4cc65-6c06-0410-ace0-fbb531ad65f3

autoconf/ast_check_openh323.m4
autoconf/ast_check_pwlib.m4
configure.ac

index 3a313ff..b3dfb92 100644 (file)
@@ -1,88 +1,3 @@
-AC_DEFUN([AST_CHECK_OPENH323_PLATFORM], [
-PWLIB_OSTYPE=
-case "$host_os" in
-  linux*)          PWLIB_OSTYPE=linux ;
-               ;;
-  freebsd* )       PWLIB_OSTYPE=FreeBSD ;
-               ;;
-  openbsd* )       PWLIB_OSTYPE=OpenBSD ;
-                                  ENDLDLIBS="-lossaudio" ;
-               ;;
-  netbsd* )        PWLIB_OSTYPE=NetBSD ;
-                                  ENDLDLIBS="-lossaudio" ;
-               ;;
-  solaris* | sunos* ) PWLIB_OSTYPE=solaris ;
-               ;;
-  darwin* )           PWLIB_OSTYPE=Darwin ;
-               ;;
-  beos*)           PWLIB_OSTYPE=beos ;
-                   STDCCFLAGS="$STDCCFLAGS -D__BEOS__"
-               ;;
-  cygwin*)         PWLIB_OSTYPE=cygwin ;
-               ;;
-  mingw*)             PWLIB_OSTYPE=mingw ;
-                          STDCCFLAGS="$STDCCFLAGS -mms-bitfields" ;
-                          ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32" ;
-               ;;
-  * )                 PWLIB_OSTYPE="$host_os" ;
-                          AC_MSG_WARN("OS $PWLIB_OSTYPE not recognized - proceed with caution!") ;
-               ;;
-esac
-
-PWLIB_MACHTYPE=
-case "$host_cpu" in
-   x86 | i686 | i586 | i486 | i386 ) PWLIB_MACHTYPE=x86
-                   ;;
-
-   x86_64)        PWLIB_MACHTYPE=x86_64 ;
-                  P_64BIT=1 ;
-                   LIB64=1 ;
-                  ;;
-
-   alpha | alphaev56 | alphaev6 | alphaev67 | alphaev7) PWLIB_MACHTYPE=alpha ;
-                  P_64BIT=1 ;
-                  ;;
-
-   sparc )         PWLIB_MACHTYPE=sparc ;
-                  ;;
-
-   powerpc )       PWLIB_MACHTYPE=ppc ;
-                  ;;
-
-   ppc )           PWLIB_MACHTYPE=ppc ;
-                  ;;
-
-   powerpc64 )     PWLIB_MACHTYPE=ppc64 ;
-                  P_64BIT=1 ;
-                   LIB64=1 ;
-                  ;;
-
-   ppc64 )         PWLIB_MACHTYPE=ppc64 ;
-                  P_64BIT=1 ;
-                   LIB64=1 ;
-                  ;;
-
-   ia64)          PWLIB_MACHTYPE=ia64 ;
-                  P_64BIT=1 ;
-                  ;;
-
-   s390x)         PWLIB_MACHTYPE=s390x ;
-                  P_64BIT=1 ;
-                   LIB64=1 ;
-                  ;;
-
-   s390)          PWLIB_MACHTYPE=s390 ;
-                  ;;
-
-   * )            PWLIB_MACHTYPE="$host_cpu";
-                  AC_MSG_WARN("CPU $PWLIB_MACHTYPE not recognized - proceed with caution!") ;;
-esac
-
-PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}"
-
-AC_SUBST([PWLIB_PLATFORM])
-])
-
 AC_DEFUN([AST_CHECK_OPENH323], [
 OPENH323_INCDIR=
 OPENH323_LIBDIR=
index 2bd080c..9d8339a 100644 (file)
@@ -1,3 +1,88 @@
+AC_DEFUN([AST_CHECK_PWLIB_PLATFORM], [
+PWLIB_OSTYPE=
+case "$host_os" in
+  linux*)          PWLIB_OSTYPE=linux ;
+               ;;
+  freebsd* )       PWLIB_OSTYPE=FreeBSD ;
+               ;;
+  openbsd* )       PWLIB_OSTYPE=OpenBSD ;
+                                  ENDLDLIBS="-lossaudio" ;
+               ;;
+  netbsd* )        PWLIB_OSTYPE=NetBSD ;
+                                  ENDLDLIBS="-lossaudio" ;
+               ;;
+  solaris* | sunos* ) PWLIB_OSTYPE=solaris ;
+               ;;
+  darwin* )           PWLIB_OSTYPE=Darwin ;
+               ;;
+  beos*)           PWLIB_OSTYPE=beos ;
+                   STDCCFLAGS="$STDCCFLAGS -D__BEOS__"
+               ;;
+  cygwin*)         PWLIB_OSTYPE=cygwin ;
+               ;;
+  mingw*)             PWLIB_OSTYPE=mingw ;
+                          STDCCFLAGS="$STDCCFLAGS -mms-bitfields" ;
+                          ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32" ;
+               ;;
+  * )                 PWLIB_OSTYPE="$host_os" ;
+                          AC_MSG_WARN("OS $PWLIB_OSTYPE not recognized - proceed with caution!") ;
+               ;;
+esac
+
+PWLIB_MACHTYPE=
+case "$host_cpu" in
+   x86 | i686 | i586 | i486 | i386 ) PWLIB_MACHTYPE=x86
+                   ;;
+
+   x86_64)        PWLIB_MACHTYPE=x86_64 ;
+                  P_64BIT=1 ;
+                   LIB64=1 ;
+                  ;;
+
+   alpha | alphaev56 | alphaev6 | alphaev67 | alphaev7) PWLIB_MACHTYPE=alpha ;
+                  P_64BIT=1 ;
+                  ;;
+
+   sparc )         PWLIB_MACHTYPE=sparc ;
+                  ;;
+
+   powerpc )       PWLIB_MACHTYPE=ppc ;
+                  ;;
+
+   ppc )           PWLIB_MACHTYPE=ppc ;
+                  ;;
+
+   powerpc64 )     PWLIB_MACHTYPE=ppc64 ;
+                  P_64BIT=1 ;
+                   LIB64=1 ;
+                  ;;
+
+   ppc64 )         PWLIB_MACHTYPE=ppc64 ;
+                  P_64BIT=1 ;
+                   LIB64=1 ;
+                  ;;
+
+   ia64)          PWLIB_MACHTYPE=ia64 ;
+                  P_64BIT=1 ;
+                  ;;
+
+   s390x)         PWLIB_MACHTYPE=s390x ;
+                  P_64BIT=1 ;
+                   LIB64=1 ;
+                  ;;
+
+   s390)          PWLIB_MACHTYPE=s390 ;
+                  ;;
+
+   * )            PWLIB_MACHTYPE="$host_cpu";
+                  AC_MSG_WARN("CPU $PWLIB_MACHTYPE not recognized - proceed with caution!") ;;
+esac
+
+PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}"
+
+AC_SUBST([PWLIB_PLATFORM])
+])
+
 AC_DEFUN([AST_CHECK_PWLIB], [
 PWLIB_INCDIR=
 PWLIB_LIBDIR=
index 94554de..1f09738 100644 (file)
@@ -1369,7 +1369,7 @@ if test "${USE_PWLIB}" != "no"; then
        AST_CHECK_PWLIB_VERSION([PWLib], [PWLIB], [ptbuildopts.h], [1], [9], [2])
                
        if test "${HAS_PWLIB:-unset}" != "unset"; then
-               AST_CHECK_OPENH323_PLATFORM()
+               AST_CHECK_PWLIB_PLATFORM()
 
                PLATFORM_PWLIB="pt_${PWLIB_PLATFORM}_r"