[asterisk-commits] kpfleming: branch 1.4 r151241 - in /branches/1.4: ./ autoconf/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sun Oct 19 23:57:33 CDT 2008
Author: kpfleming
Date: Sun Oct 19 23:57:33 2008
New Revision: 151241
URL: http://svn.digium.com/view/asterisk?view=rev&rev=151241
Log:
rename this macro to properly reflect what it does
Modified:
branches/1.4/autoconf/ast_check_openh323.m4
branches/1.4/autoconf/ast_check_pwlib.m4
branches/1.4/configure.ac
Modified: branches/1.4/autoconf/ast_check_openh323.m4
URL: http://svn.digium.com/view/asterisk/branches/1.4/autoconf/ast_check_openh323.m4?view=diff&rev=151241&r1=151240&r2=151241
==============================================================================
--- branches/1.4/autoconf/ast_check_openh323.m4 (original)
+++ branches/1.4/autoconf/ast_check_openh323.m4 Sun Oct 19 23:57:33 2008
@@ -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=
Modified: branches/1.4/autoconf/ast_check_pwlib.m4
URL: http://svn.digium.com/view/asterisk/branches/1.4/autoconf/ast_check_pwlib.m4?view=diff&rev=151241&r1=151240&r2=151241
==============================================================================
--- branches/1.4/autoconf/ast_check_pwlib.m4 (original)
+++ branches/1.4/autoconf/ast_check_pwlib.m4 Sun Oct 19 23:57:33 2008
@@ -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=
Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=151241&r1=151240&r2=151241
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Sun Oct 19 23:57:33 2008
@@ -1257,7 +1257,7 @@
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"
More information about the asterisk-commits
mailing list