From 474f1d2d997010dbd1101fc53c4f3dbdc04e27f2 Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@614ede4d-c843-0410-af14-a771ab80d22e>
Date: Tue, 19 Sep 2006 14:04:15 +0000
Subject: [PATCH] restore ability for Makefiles to use 'generic' platform names
 when needed

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43256 614ede4d-c843-0410-af14-a771ab80d22e
---
 configure    | 21 +++++++++++++++++----
 configure.ac | 11 +++++++++++
 makeopts.in  |  2 +-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index cf5665c06..acab82849 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 42982 .
+# From configure.ac Revision: 43245 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60a.
 #
@@ -655,6 +655,7 @@ HOST_PLATFORM
 HOST_CPU
 HOST_VENDOR
 HOST_OS
+OSARCH
 UNAME
 PBX_OSREV
 CC
@@ -2046,6 +2047,17 @@ HOST_OS=${host_os}
 
 
 
+case "${host_os}" in
+     freebsd*)
+     OSARCH=FreeBSD
+     ;;
+     *)
+     OSARCH=${HOST_OS}
+     ;;
+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.
@@ -30356,6 +30368,7 @@ HOST_PLATFORM!$HOST_PLATFORM$ac_delim
 HOST_CPU!$HOST_CPU$ac_delim
 HOST_VENDOR!$HOST_VENDOR$ac_delim
 HOST_OS!$HOST_OS$ac_delim
+OSARCH!$OSARCH$ac_delim
 UNAME!$UNAME$ac_delim
 PBX_OSREV!$PBX_OSREV$ac_delim
 CC!$CC$ac_delim
@@ -30399,7 +30412,6 @@ GNUTLS_INCLUDE!$GNUTLS_INCLUDE$ac_delim
 PBX_GNUTLS!$PBX_GNUTLS$ac_delim
 GSM_LIB!$GSM_LIB$ac_delim
 GSM_INCLUDE!$GSM_INCLUDE$ac_delim
-PBX_GSM!$PBX_GSM$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -30441,6 +30453,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+PBX_GSM!$PBX_GSM$ac_delim
 IKSEMEL_LIB!$IKSEMEL_LIB$ac_delim
 IKSEMEL_INCLUDE!$IKSEMEL_INCLUDE$ac_delim
 PBX_IKSEMEL!$PBX_IKSEMEL$ac_delim
@@ -30537,7 +30550,6 @@ PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
 ALLOCA!$ALLOCA$ac_delim
 EGREP!$EGREP$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
-POW_LIB!$POW_LIB$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -30579,6 +30591,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+POW_LIB!$POW_LIB$ac_delim
 GC_CFLAGS!$GC_CFLAGS$ac_delim
 GC_LDFLAGS!$GC_LDFLAGS$ac_delim
 GSM_INTERNAL!$GSM_INTERNAL$ac_delim
@@ -30601,7 +30614,7 @@ CURL_LIB!$CURL_LIB$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; 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 f6c066802..71ef55486 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,17 @@ AC_SUBST(HOST_CPU)
 AC_SUBST(HOST_VENDOR)
 AC_SUBST(HOST_OS)
 
+case "${host_os}" in
+     freebsd*)
+     OSARCH=FreeBSD
+     ;;
+     *)
+     OSARCH=${HOST_OS}
+     ;;
+esac
+
+AC_SUBST(OSARCH)
+
 #  check for uname
 AC_PATH_TOOL([UNAME], [uname], No)
 if test ! x"${UNAME}" = xNo; then
diff --git a/makeopts.in b/makeopts.in
index 2167696b1..683484aa6 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -30,7 +30,7 @@ HOST_VENDOR=@HOST_VENDOR@
 HOST_OS=@HOST_OS@
 
 PROC=@HOST_CPU@
-OSARCH=@HOST_OS@
+OSARCH=@OSARCH@
 OSREV=@PBX_OSREV@
 
 GC_CFLAGS=@GC_CFLAGS@
-- 
2.11.4.GIT