diff mbox series

[v1,1/2] configure: remove dependency of autoconf-archive

Message ID 1498489208-6376-2-git-send-email-odpbot@yandex.ru
State Superseded
Headers show
Series [v1,1/2] configure: remove dependency of autoconf-archive | expand

Commit Message

Github ODP bot June 26, 2017, 3 p.m. UTC 
From: Maxim Uvarov <maxim.uvarov@linaro.org>


autoconf-archive is not available if you build with cross
toolchains. Number of projects simple have local copy
of this file.

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
/** Email created from pull request 59 (muvarov:master_timer_debug)
 ** https://github.com/Linaro/odp/pull/59
 ** Patch: https://github.com/Linaro/odp/pull/59.patch
 ** Base sha: 497c339f94e35d5fadeff539cebfbf44d698dc7e
 ** Merge commit sha: 5c4645202983659c0f43c24fa9d5291d8ec4e1f4
 **/
 .travis.yml                 |  2 +-
 DEPENDENCIES                |  5 ++--
 Makefile.am                 |  2 +-
 m4/ax_check_compile_flag.m4 | 72 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 5 deletions(-)
 create mode 100644 m4/ax_check_compile_flag.m4

Comments

Maxim Uvarov June 26, 2017, 3:19 p.m. UTC | #1 
1/2 patch is not for this serries. Only 2/2.

Maxim.


On 06/26/17 18:00, Github ODP bot wrote:
> From: Maxim Uvarov <maxim.uvarov@linaro.org>

> 

> autoconf-archive is not available if you build with cross

> toolchains. Number of projects simple have local copy

> of this file.

> 

> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

> ---

> /** Email created from pull request 59 (muvarov:master_timer_debug)

>  ** https://github.com/Linaro/odp/pull/59

>  ** Patch: https://github.com/Linaro/odp/pull/59.patch

>  ** Base sha: 497c339f94e35d5fadeff539cebfbf44d698dc7e

>  ** Merge commit sha: 5c4645202983659c0f43c24fa9d5291d8ec4e1f4

>  **/

>  .travis.yml                 |  2 +-

>  DEPENDENCIES                |  5 ++--

>  Makefile.am                 |  2 +-

>  m4/ax_check_compile_flag.m4 | 72 +++++++++++++++++++++++++++++++++++++++++++++

>  4 files changed, 76 insertions(+), 5 deletions(-)

>  create mode 100644 m4/ax_check_compile_flag.m4

> 

> diff --git a/.travis.yml b/.travis.yml

> index 2cc8caf7..bae23600 100644

> --- a/.travis.yml

> +++ b/.travis.yml

> @@ -42,7 +42,7 @@ addons:

>                  packages:

>                          - gcc

>                          - clang-3.8

> -                        - automake autoconf autoconf-archive libtool libssl-dev graphviz mscgen doxygen

> +                        - automake autoconf libtool libssl-dev graphviz mscgen doxygen

>                          - libpcap-dev

>  #        coverity_scan:

>  #                project:

> diff --git a/DEPENDENCIES b/DEPENDENCIES

> index 7bcbd5eb..a194cad1 100644

> --- a/DEPENDENCIES

> +++ b/DEPENDENCIES

> @@ -8,14 +8,13 @@ Prerequisites for building the OpenDataPlane (ODP) API

>  

>     automake

>     autoconf

> -   autoconf-archive

>     libtool

>  

>     On Debian/Ubuntu systems:

> -   $ sudo apt-get install automake autoconf autoconf-archive libtool

> +   $ sudo apt-get install automake autoconf libtool

>  

>     On CentOS/RedHat/Fedora systems:

> -   $ sudo yum install automake autoconf autoconf-archive libtool

> +   $ sudo yum install automake autoconf libtool

>  

>  3. Required libraries

>  

> diff --git a/Makefile.am b/Makefile.am

> index fff1276a..cfcef22a 100644

> --- a/Makefile.am

> +++ b/Makefile.am

> @@ -1,4 +1,4 @@

> -ACLOCAL_AMFLAGS=-I m4

> +ACLOCAL_AMFLAGS=-I m4 -I m4/autoconf-archive

>  AUTOMAKE_OPTIONS = foreign

>  AM_DISTCHECK_CONFIGURE_FLAGS = --enable-test-cpp	\

>  			       --enable-test-example	\

> diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4

> new file mode 100644

> index 00000000..c3a8d695

> --- /dev/null

> +++ b/m4/ax_check_compile_flag.m4

> @@ -0,0 +1,72 @@

> +# ===========================================================================

> +#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html

> +# ===========================================================================

> +#

> +# SYNOPSIS

> +#

> +#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])

> +#

> +# DESCRIPTION

> +#

> +#   Check whether the given FLAG works with the current language's compiler

> +#   or gives an error.  (Warnings, however, are ignored)

> +#

> +#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on

> +#   success/failure.

> +#

> +#   If EXTRA-FLAGS is defined, it is added to the current language's default

> +#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with

> +#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to

> +#   force the compiler to issue an error when a bad flag is given.

> +#

> +#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this

> +#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.

> +#

> +# LICENSE

> +#

> +#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>

> +#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>

> +#

> +#   This program is free software: you can redistribute it and/or modify it

> +#   under the terms of the GNU General Public License as published by the

> +#   Free Software Foundation, either version 3 of the License, or (at your

> +#   option) any later version.

> +#

> +#   This program is distributed in the hope that it will be useful, but

> +#   WITHOUT ANY WARRANTY; without even the implied warranty of

> +#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General

> +#   Public License for more details.

> +#

> +#   You should have received a copy of the GNU General Public License along

> +#   with this program. If not, see <http://www.gnu.org/licenses/>.

> +#

> +#   As a special exception, the respective Autoconf Macro's copyright owner

> +#   gives unlimited permission to copy, distribute and modify the configure

> +#   scripts that are the output of Autoconf when processing the Macro. You

> +#   need not follow the terms of the GNU General Public License when using

> +#   or distributing such scripts, even though portions of the text of the

> +#   Macro appear in them. The GNU General Public License (GPL) does govern

> +#   all other use of the material that constitutes the Autoconf Macro.

> +#

> +#   This special exception to the GPL applies to versions of the Autoconf

> +#   Macro released by the Autoconf Archive. When you make and distribute a

> +#   modified version of the Autoconf Macro, you may extend this special

> +#   exception to the GPL to apply to your modified version as well.

> +

> +#serial 2

> +

> +AC_DEFUN([AX_CHECK_COMPILE_FLAG],

> +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX

> +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl

> +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [

> +  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS

> +  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"

> +  AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],

> +    [AS_VAR_SET(CACHEVAR,[yes])],

> +    [AS_VAR_SET(CACHEVAR,[no])])

> +  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])

> +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],

> +  [m4_default([$2], :)],

> +  [m4_default([$3], :)])

> +AS_VAR_POPDEF([CACHEVAR])dnl

> +])dnl AX_CHECK_COMPILE_FLAGS

>
diff mbox series

Patch

diff --git a/.travis.yml b/.travis.yml
index 2cc8caf7..bae23600 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@  addons:
                 packages:
                         - gcc
                         - clang-3.8
-                        - automake autoconf autoconf-archive libtool libssl-dev graphviz mscgen doxygen
+                        - automake autoconf libtool libssl-dev graphviz mscgen doxygen
                         - libpcap-dev
 #        coverity_scan:
 #                project:
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 7bcbd5eb..a194cad1 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -8,14 +8,13 @@  Prerequisites for building the OpenDataPlane (ODP) API
 
    automake
    autoconf
-   autoconf-archive
    libtool
 
    On Debian/Ubuntu systems:
-   $ sudo apt-get install automake autoconf autoconf-archive libtool
+   $ sudo apt-get install automake autoconf libtool
 
    On CentOS/RedHat/Fedora systems:
-   $ sudo yum install automake autoconf autoconf-archive libtool
+   $ sudo yum install automake autoconf libtool
 
 3. Required libraries
 
diff --git a/Makefile.am b/Makefile.am
index fff1276a..cfcef22a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@ 
-ACLOCAL_AMFLAGS=-I m4
+ACLOCAL_AMFLAGS=-I m4 -I m4/autoconf-archive
 AUTOMAKE_OPTIONS = foreign
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-test-cpp	\
 			       --enable-test-example	\
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
new file mode 100644
index 00000000..c3a8d695
--- /dev/null
+++ b/m4/ax_check_compile_flag.m4
@@ -0,0 +1,72 @@ 
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the current language's compiler
+#   or gives an error.  (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 2
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS