From 01f8a6959b0097384e41ef637081eafbd145a3c6 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Mon, 17 Dec 2007 17:11:06 +0000 Subject: make the configure script detect that it is running on a Windows platform, and report that information so that menuselect can use it (all information that is used to decide whether to build modules or not must be fed to menuselect so the user knows what will be built and why... don't make module build decisions in the makefiles, please) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93211 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- build_tools/menuselect-deps.in | 1 + channels/Makefile | 5 ----- channels/chan_oss.c | 1 + channels/chan_unistim.c | 4 ++++ configure | 23 ++++++++++++++++++----- configure.ac | 11 +++++++++++ 6 files changed, 35 insertions(+), 10 deletions(-) diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index fbb4b1583..98ec88a06 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -42,3 +42,4 @@ ISDNNET=@PBX_ISDNNET@ MISDN=@PBX_MISDN@ SUPPSERV=@PBX_SUPPSERV@ GNU_LD=@GNU_LD@ +WINARCH=@WINARCH@ diff --git a/channels/Makefile b/channels/Makefile index 3af4da971..c02bbebf9 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -37,11 +37,6 @@ ifeq ($(OSARCH),NetBSD) H323LIB=-lh323_NetBSD_x86_r endif -MODULE_EXCLUDE:= -ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) - MODULE_EXCLUDE+= chan_oss chan_unistim -endif - ifeq ($(wildcard h323/libchanh323.a),) MODULE_EXCLUDE += chan_h323 endif diff --git a/channels/chan_oss.c b/channels/chan_oss.c index ad0410d32..10a333464 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -35,6 +35,7 @@ /*** MODULEINFO ossaudio + winarch ***/ #include "asterisk.h" diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 53dff56ef..8df1ef419 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -32,6 +32,10 @@ * \ingroup channel_drivers */ +/*** MODULEINFO + winarch + ***/ + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") diff --git a/configure b/configure index 833114990..46e066a27 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 92476 . +# From configure.ac Revision: 93184 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.4. # @@ -684,6 +684,7 @@ HOST_CPU HOST_VENDOR HOST_OS OSARCH +WINARCH UNAME PBX_OSREV CXX @@ -4046,6 +4047,8 @@ HOST_OS=${host_os} +WINARCH=0 + case "${host_os}" in freebsd*) OSARCH=FreeBSD @@ -4059,6 +4062,14 @@ case "${host_os}" in solaris*) OSARCH=SunOS ;; + mingw32) + OSARCH=mingw32 + WINARCH=1 + ;; + cygwin) + OSARCH=cygwin + WINARCH=1 + ;; *) OSARCH=${host_os} ;; @@ -4066,6 +4077,7 @@ esac + # check for uname if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}uname", so it can be a program name with args. @@ -48113,6 +48125,7 @@ HOST_CPU!$HOST_CPU$ac_delim HOST_VENDOR!$HOST_VENDOR$ac_delim HOST_OS!$HOST_OS$ac_delim OSARCH!$OSARCH$ac_delim +WINARCH!$WINARCH$ac_delim UNAME!$UNAME$ac_delim PBX_OSREV!$PBX_OSREV$ac_delim CXX!$CXX$ac_delim @@ -48145,7 +48158,6 @@ DOWNLOAD!$DOWNLOAD$ac_delim acx_pthread_config!$acx_pthread_config$ac_delim PTHREAD_CC!$PTHREAD_CC$ac_delim PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim -PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -48187,6 +48199,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim AST_DEVMODE!$AST_DEVMODE$ac_delim ALSA_LIB!$ALSA_LIB$ac_delim ALSA_INCLUDE!$ALSA_INCLUDE$ac_delim @@ -48283,7 +48296,6 @@ PBX_POPT!$PBX_POPT$ac_delim PGSQL_LIB!$PGSQL_LIB$ac_delim PGSQL_INCLUDE!$PGSQL_INCLUDE$ac_delim PGSQL_DIR!$PGSQL_DIR$ac_delim -PBX_PGSQL!$PBX_PGSQL$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -48325,6 +48337,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PBX_PGSQL!$PBX_PGSQL$ac_delim PRI_LIB!$PRI_LIB$ac_delim PRI_INCLUDE!$PRI_INCLUDE$ac_delim PRI_DIR!$PRI_DIR$ac_delim @@ -48421,7 +48434,6 @@ SDL_LIB!$SDL_LIB$ac_delim SDL_INCLUDE!$SDL_INCLUDE$ac_delim SDL_DIR!$SDL_DIR$ac_delim PBX_SDL!$PBX_SDL$ac_delim -SDL_IMAGE_LIB!$SDL_IMAGE_LIB$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -48463,6 +48475,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +SDL_IMAGE_LIB!$SDL_IMAGE_LIB$ac_delim SDL_IMAGE_INCLUDE!$SDL_IMAGE_INCLUDE$ac_delim SDL_IMAGE_DIR!$SDL_IMAGE_DIR$ac_delim PBX_SDL_IMAGE!$PBX_SDL_IMAGE$ac_delim @@ -48509,7 +48522,7 @@ CURL_CONFIG!$CURL_CONFIG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 45; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index fd2956b27..8b41545b4 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,8 @@ AC_SUBST(HOST_CPU) AC_SUBST(HOST_VENDOR) AC_SUBST(HOST_OS) +WINARCH=0 + case "${host_os}" in freebsd*) OSARCH=FreeBSD @@ -81,12 +83,21 @@ case "${host_os}" in solaris*) OSARCH=SunOS ;; + mingw32) + OSARCH=mingw32 + WINARCH=1 + ;; + cygwin) + OSARCH=cygwin + WINARCH=1 + ;; *) OSARCH=${host_os} ;; esac AC_SUBST(OSARCH) +AC_SUBST(WINARCH) # check for uname AC_PATH_TOOL([UNAME], [uname], No) -- cgit v1.2.3