diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-20 05:00:56 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-20 05:00:56 +0000 |
commit | 6a331b071212dc78f40a404a9c385fa6cfe49a19 (patch) | |
tree | 17031e5aeb56d44b30dca24c5ca0f8029290625b /autoconf | |
parent | 4258dc4d3632051f0045230eaa715c411803f475 (diff) |
Merged revisions 151241 via svnmerge from
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: http://svn.digium.com/svn/asterisk/trunk@151243 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'autoconf')
-rw-r--r-- | autoconf/ast_check_openh323.m4 | 85 | ||||
-rw-r--r-- | autoconf/ast_check_pwlib.m4 | 85 |
2 files changed, 85 insertions, 85 deletions
diff --git a/autoconf/ast_check_openh323.m4 b/autoconf/ast_check_openh323.m4 index 3a313ffe6..b3dfb925f 100644 --- a/autoconf/ast_check_openh323.m4 +++ b/autoconf/ast_check_openh323.m4 @@ -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= diff --git a/autoconf/ast_check_pwlib.m4 b/autoconf/ast_check_pwlib.m4 index 2bd080c5c..9d8339a18 100644 --- a/autoconf/ast_check_pwlib.m4 +++ b/autoconf/ast_check_pwlib.m4 @@ -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= |