[Cbe-oss-dev] [PATCH 06/17]MARS/core: Share acinclude

[Yuji Mano]

From: Kazunori Asayama <asayama at sm.sony.co.jp>

Share acinclude.m4 between core and modules (core)

This patch enable to share acinclude.m4 between core and modules for
easy maintenance.

Signed-off-by: Kazunori Asayama <asayama at sm.sony.co.jp>
---
 core/acinclude.m4    |  101 ---------------------------------------------------
 core/bootstrap       |    2 +
 scripts/acinclude.m4 |  101 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 101 deletions(-)

Index: b/core/acinclude.m4
===================================================================
--- a/core/acinclude.m4	2008-11-21 17:59:51.000000000 +0900
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-## acinclude.m4 -- Common autoconf macro definitions
-#
-#  Copyright 2008 Sony Corporation of America
-#
-#
-#  Permission is hereby granted, free of charge, to any person obtaining
-#  a copy of this Library and associated documentation files (the
-#  "Library"), to deal in the Library without restriction, including
-#  without limitation the rights to use, copy, modify, merge, publish,
-#  distribute, sublicense, and/or sell copies of the Library, and to
-#  permit persons to whom the Library is furnished to do so, subject to
-#  the following conditions:
-#
-#   The above copyright notice and this permission notice shall be
-#   included in all copies or substantial portions of the Library.
-#
-#   If you modify the Library, you may copy and distribute your modified
-#   version of the Library in object code or as an executable provided
-#   that you also do one of the following:
-#
-#    Accompany the modified version of the Library with the complete
-#    corresponding machine-readable source code for the modified version
-#    of the Library; or,
-#
-#    Accompany the modified version of the Library with a written offer
-#    for a complete machine-readable copy of the corresponding source
-#    code of the modified version of the Library.
-#
-#
-#  THE LIBRARY IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-#  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-#  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-#  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-#  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-#  LIBRARY OR THE USE OR OTHER DEALINGS IN THE LIBRARY.
-#
-
-AC_DEFUN([AC_CONFIG_MARS_PLATFORM],[
-
-AC_ARG_WITH([mars-platform],
-	[AS_HELP_STRING([--with-mars-platform=TYPE],
-		[specify mars platform TYPE (cell | spursengine)])],
-	[],
-	[AC_MSG_ERROR([missing option --with-mars-platform=])])
-AS_CASE([${with_mars_platform}],
-	[cell],[],
-	[spursengine],[],
-	[AC_MSG_ERROR([invalid option --with-mars-platform=${with_mars_platform}])])
-AM_CONDITIONAL([MARS_PLATFORM_CELL],
-	[test "x${with_mars_platform}" = "xcell"])
-AM_CONDITIONAL([MARS_PLATFORM_SPURSENGINE],
-	[test "x${with_mars_platform}" = "xspursengine"])
-AC_MSG_RESULT([using mars-platform ${with_mars_platform}])
-
-]) # AC_CONFIG_MARS_PLATFORM
-
-
-AC_DEFUN([AC_CONFIG_MARS_DISCRETE_SHARED_MEMORY],[
-AC_ARG_ENABLE(
-	[discrete-shared-memory],
-	[AS_HELP_STRING([--enable-discrete-shared-memory],
-		[assume discrete shared memory between host and MPU
-			even if shared memory is identical to host memory,
-			for debugging purposes])])
-AC_MSG_RESULT([using enable-discrete-shared-memory ${enable_discrete_shared_memory}])
-]) # AC_CONFIG_MARS_DISCRETE_SHARED_MEMORY
-
-
-AC_DEFUN([AC_CONFIG_DEBUG],[
-
-AC_ARG_ENABLE(
-	[debug],
-	[AS_HELP_STRING([--enable-debug], [build debug versions of mars])])
-AM_CONDITIONAL([DEBUG], [test "x${enable_debug}" = "xyes"])
-AC_MSG_RESULT([using enable-debug ${enable_debug}])
-
-]) # AC_CONFIG_DEBUG
-
-
-AC_DEFUN([AC_CONFIG_MARS_POST],[
-case "$with_mars_platform" in
-     spursengine) enable_discrete_shared_memory=yes;;
-esac
-
-if test "x$enable_discrete_shared_memory" = "xyes"; then
-	AC_DEFINE([MARS_ENABLE_DISCRETE_SHARED_MEMORY],[1],
-		[Define to 1 if shared memory between host and MPU is
-			separate from host memory.])
-fi
-])
-
-
-AC_DEFUN([AC_CONFIG_MARS],[
-
-AC_CONFIG_MARS_PLATFORM
-AC_CONFIG_MARS_DISCRETE_SHARED_MEMORY
-AC_CONFIG_DEBUG
-AC_CONFIG_MARS_POST
-
-]) # AC_CONFIG_MARS
Index: b/core/bootstrap
===================================================================
--- a/core/bootstrap	2008-11-21 17:56:33.000000000 +0900
+++ b/core/bootstrap	2008-11-21 17:57:02.000000000 +0900
@@ -81,6 +81,8 @@ set -x
 
 sed -e s, at version@,${version},g configure.ac.in > configure.ac
 
+ln -sf ../scripts/acinclude.m4 .
+
 aclocal
 automake --foreign --add-missing --copy
 autoconf
Index: b/scripts/acinclude.m4
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ b/scripts/acinclude.m4	2008-11-21 17:57:02.000000000 +0900
@@ -0,0 +1,101 @@
+## acinclude.m4 -- Common autoconf macro definitions
+#
+#  Copyright 2008 Sony Corporation of America
+#
+#
+#  Permission is hereby granted, free of charge, to any person obtaining
+#  a copy of this Library and associated documentation files (the
+#  "Library"), to deal in the Library without restriction, including
+#  without limitation the rights to use, copy, modify, merge, publish,
+#  distribute, sublicense, and/or sell copies of the Library, and to
+#  permit persons to whom the Library is furnished to do so, subject to
+#  the following conditions:
+#
+#   The above copyright notice and this permission notice shall be
+#   included in all copies or substantial portions of the Library.
+#
+#   If you modify the Library, you may copy and distribute your modified
+#   version of the Library in object code or as an executable provided
+#   that you also do one of the following:
+#
+#    Accompany the modified version of the Library with the complete
+#    corresponding machine-readable source code for the modified version
+#    of the Library; or,
+#
+#    Accompany the modified version of the Library with a written offer
+#    for a complete machine-readable copy of the corresponding source
+#    code of the modified version of the Library.
+#
+#
+#  THE LIBRARY IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+#  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+#  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+#  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+#  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+#  LIBRARY OR THE USE OR OTHER DEALINGS IN THE LIBRARY.
+#
+
+AC_DEFUN([AC_CONFIG_MARS_PLATFORM],[
+
+AC_ARG_WITH([mars-platform],
+	[AS_HELP_STRING([--with-mars-platform=TYPE],
+		[specify mars platform TYPE (cell | spursengine)])],
+	[],
+	[AC_MSG_ERROR([missing option --with-mars-platform=])])
+AS_CASE([${with_mars_platform}],
+	[cell],[],
+	[spursengine],[],
+	[AC_MSG_ERROR([invalid option --with-mars-platform=${with_mars_platform}])])
+AM_CONDITIONAL([MARS_PLATFORM_CELL],
+	[test "x${with_mars_platform}" = "xcell"])
+AM_CONDITIONAL([MARS_PLATFORM_SPURSENGINE],
+	[test "x${with_mars_platform}" = "xspursengine"])
+AC_MSG_RESULT([using mars-platform ${with_mars_platform}])
+
+]) # AC_CONFIG_MARS_PLATFORM
+
+
+AC_DEFUN([AC_CONFIG_MARS_DISCRETE_SHARED_MEMORY],[
+AC_ARG_ENABLE(
+	[discrete-shared-memory],
+	[AS_HELP_STRING([--enable-discrete-shared-memory],
+		[assume discrete shared memory between host and MPU
+			even if shared memory is identical to host memory,
+			for debugging purposes])])
+AC_MSG_RESULT([using enable-discrete-shared-memory ${enable_discrete_shared_memory}])
+]) # AC_CONFIG_MARS_DISCRETE_SHARED_MEMORY
+
+
+AC_DEFUN([AC_CONFIG_DEBUG],[
+
+AC_ARG_ENABLE(
+	[debug],
+	[AS_HELP_STRING([--enable-debug], [build debug versions of mars])])
+AM_CONDITIONAL([DEBUG], [test "x${enable_debug}" = "xyes"])
+AC_MSG_RESULT([using enable-debug ${enable_debug}])
+
+]) # AC_CONFIG_DEBUG
+
+
+AC_DEFUN([AC_CONFIG_MARS_POST],[
+case "$with_mars_platform" in
+     spursengine) enable_discrete_shared_memory=yes;;
+esac
+
+if test "x$enable_discrete_shared_memory" = "xyes"; then
+	AC_DEFINE([MARS_ENABLE_DISCRETE_SHARED_MEMORY],[1],
+		[Define to 1 if shared memory between host and MPU is
+			separate from host memory.])
+fi
+])
+
+
+AC_DEFUN([AC_CONFIG_MARS],[
+
+AC_CONFIG_MARS_PLATFORM
+AC_CONFIG_MARS_DISCRETE_SHARED_MEMORY
+AC_CONFIG_DEBUG
+AC_CONFIG_MARS_POST
+
+]) # AC_CONFIG_MARS