diff mbox

[v2] bootstrap: add include m4 directory in bootstrap

Message ID 1408874690-10006-1-git-send-email-giladb@ezchip.com
State Accepted
Commit d62136bc1600dc0180b9460676f8ae68fcda8e68
Headers show

Commit Message

Gilad Ben-Yossef Aug. 24, 2014, 10:04 a.m. UTC 
From: Gilad Ben-Yossef <gilad@benyossef.com>

First time configure was failing due to missing Doxygen includes from
m4/ directory.

Include m4/ directory during bootstrap generation to get autoconf
to create a correct configure script.

As per Anders Roxell, the dependency on autoconf-archive was meant
to resolve this, but it seems this patch is simpler.

Signed-off-by: Gilad Ben-Yossef <giladb@ezchip.com>
CC: Barry Spinney <spinney@tilera.com>
Tested-by: Anders Roxell <anders.roxell@linaro.org>
---
 DEPENDENCIES |    7 +++----
 bootstrap    |    2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

Comments

Maxim Uvarov Aug. 26, 2014, 10:26 a.m. UTC | #1 
On 08/24/2014 02:04 PM, Gilad Ben-Yossef wrote:
> From: Gilad Ben-Yossef <gilad@benyossef.com>
>
> First time configure was failing due to missing Doxygen includes from
> m4/ directory.
>
> Include m4/ directory during bootstrap generation to get autoconf
> to create a correct configure script.
>
> As per Anders Roxell, the dependency on autoconf-archive was meant
> to resolve this, but it seems this patch is simpler.
>
> Signed-off-by: Gilad Ben-Yossef <giladb@ezchip.com>
> CC: Barry Spinney <spinney@tilera.com>
> Tested-by: Anders Roxell <anders.roxell@linaro.org>
> ---
>   DEPENDENCIES |    7 +++----
>   bootstrap    |    2 +-
>   2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/DEPENDENCIES b/DEPENDENCIES
> index 53233ff..b4c04c9 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 libtoolize
> +   $ sudo yum install automake autoconf libtool libtoolize
>   
>   3. required libraries
>   
> @@ -75,4 +74,4 @@ Prerequisites for building the OpenDataPlane (ODP) API
>      # Or build 64 bit version of ODP
>      $ ./configure --host=aarch64-linux-gnu \
>        --with-openssl-path=/home/user/src/install-openssl-aarch64
> -   $ make
> \ No newline at end of file
> +   $ make

Please remove this chunk from patch.
> diff --git a/bootstrap b/bootstrap
> index 12f9388..cd759b0 100755
> --- a/bootstrap
> +++ b/bootstrap
> @@ -1,6 +1,6 @@
>   #! /bin/sh
>   set -x
> -aclocal -I config
> +aclocal -I config -I m4
>   libtoolize --copy
>   autoheader
>   automake --add-missing --copy
Maxim Uvarov Sept. 1, 2014, 11:53 a.m. UTC | #2 
Anders, ping.

Maxim.

On 08/24/2014 02:04 PM, Gilad Ben-Yossef wrote:
> From: Gilad Ben-Yossef <gilad@benyossef.com>
>
> First time configure was failing due to missing Doxygen includes from
> m4/ directory.
>
> Include m4/ directory during bootstrap generation to get autoconf
> to create a correct configure script.
>
> As per Anders Roxell, the dependency on autoconf-archive was meant
> to resolve this, but it seems this patch is simpler.
>
> Signed-off-by: Gilad Ben-Yossef <giladb@ezchip.com>
> CC: Barry Spinney <spinney@tilera.com>
> Tested-by: Anders Roxell <anders.roxell@linaro.org>
> ---
>   DEPENDENCIES |    7 +++----
>   bootstrap    |    2 +-
>   2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/DEPENDENCIES b/DEPENDENCIES
> index 53233ff..b4c04c9 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 libtoolize
> +   $ sudo yum install automake autoconf libtool libtoolize
>   
>   3. required libraries
>   
> @@ -75,4 +74,4 @@ Prerequisites for building the OpenDataPlane (ODP) API
>      # Or build 64 bit version of ODP
>      $ ./configure --host=aarch64-linux-gnu \
>        --with-openssl-path=/home/user/src/install-openssl-aarch64
> -   $ make
> \ No newline at end of file
> +   $ make
> diff --git a/bootstrap b/bootstrap
> index 12f9388..cd759b0 100755
> --- a/bootstrap
> +++ b/bootstrap
> @@ -1,6 +1,6 @@
>   #! /bin/sh
>   set -x
> -aclocal -I config
> +aclocal -I config -I m4
>   libtoolize --copy
>   autoheader
>   automake --add-missing --copy
Anders Roxell Sept. 1, 2014, 1:19 p.m. UTC | #3 
On 2014-08-24 13:04, Gilad Ben-Yossef wrote:
> From: Gilad Ben-Yossef <gilad@benyossef.com>
> 
> First time configure was failing due to missing Doxygen includes from
> m4/ directory.
> 
> Include m4/ directory during bootstrap generation to get autoconf
> to create a correct configure script.
> 
> As per Anders Roxell, the dependency on autoconf-archive was meant
> to resolve this, but it seems this patch is simpler.
> 
> Signed-off-by: Gilad Ben-Yossef <giladb@ezchip.com>
> CC: Barry Spinney <spinney@tilera.com>

Reviewed-and-Tested-by: Anders Roxell <anders.roxell@linaro.org>

> ---
>  DEPENDENCIES |    7 +++----
>  bootstrap    |    2 +-
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/DEPENDENCIES b/DEPENDENCIES
> index 53233ff..b4c04c9 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 libtoolize
> +   $ sudo yum install automake autoconf libtool libtoolize
>  
>  3. required libraries
>  
> @@ -75,4 +74,4 @@ Prerequisites for building the OpenDataPlane (ODP) API
>     # Or build 64 bit version of ODP
>     $ ./configure --host=aarch64-linux-gnu \
>       --with-openssl-path=/home/user/src/install-openssl-aarch64
> -   $ make
> \ No newline at end of file
> +   $ make
> diff --git a/bootstrap b/bootstrap
> index 12f9388..cd759b0 100755
> --- a/bootstrap
> +++ b/bootstrap
> @@ -1,6 +1,6 @@
>  #! /bin/sh
>  set -x
> -aclocal -I config
> +aclocal -I config -I m4
>  libtoolize --copy
>  autoheader
>  automake --add-missing --copy
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/lng-odp
Maxim Uvarov Sept. 1, 2014, 3:24 p.m. UTC | #4 
Merged, thanks!
Maxim.

On 09/01/2014 05:19 PM, Anders Roxell wrote:
> On 2014-08-24 13:04, Gilad Ben-Yossef wrote:
>> From: Gilad Ben-Yossef <gilad@benyossef.com>
>>
>> First time configure was failing due to missing Doxygen includes from
>> m4/ directory.
>>
>> Include m4/ directory during bootstrap generation to get autoconf
>> to create a correct configure script.
>>
>> As per Anders Roxell, the dependency on autoconf-archive was meant
>> to resolve this, but it seems this patch is simpler.
>>
>> Signed-off-by: Gilad Ben-Yossef <giladb@ezchip.com>
>> CC: Barry Spinney <spinney@tilera.com>
> Reviewed-and-Tested-by: Anders Roxell <anders.roxell@linaro.org>
>
>> ---
>>   DEPENDENCIES |    7 +++----
>>   bootstrap    |    2 +-
>>   2 files changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/DEPENDENCIES b/DEPENDENCIES
>> index 53233ff..b4c04c9 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 libtoolize
>> +   $ sudo yum install automake autoconf libtool libtoolize
>>   
>>   3. required libraries
>>   
>> @@ -75,4 +74,4 @@ Prerequisites for building the OpenDataPlane (ODP) API
>>      # Or build 64 bit version of ODP
>>      $ ./configure --host=aarch64-linux-gnu \
>>        --with-openssl-path=/home/user/src/install-openssl-aarch64
>> -   $ make
>> \ No newline at end of file
>> +   $ make
>> diff --git a/bootstrap b/bootstrap
>> index 12f9388..cd759b0 100755
>> --- a/bootstrap
>> +++ b/bootstrap
>> @@ -1,6 +1,6 @@
>>   #! /bin/sh
>>   set -x
>> -aclocal -I config
>> +aclocal -I config -I m4
>>   libtoolize --copy
>>   autoheader
>>   automake --add-missing --copy
>> -- 
>> 1.7.1
>>
>>
>> _______________________________________________
>> lng-odp mailing list
>> lng-odp@lists.linaro.org
>> http://lists.linaro.org/mailman/listinfo/lng-odp
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/lng-odp
diff mbox

Patch

diff --git a/DEPENDENCIES b/DEPENDENCIES
index 53233ff..b4c04c9 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 libtoolize
+   $ sudo yum install automake autoconf libtool libtoolize
 
 3. required libraries
 
@@ -75,4 +74,4 @@  Prerequisites for building the OpenDataPlane (ODP) API
    # Or build 64 bit version of ODP
    $ ./configure --host=aarch64-linux-gnu \
      --with-openssl-path=/home/user/src/install-openssl-aarch64
-   $ make
\ No newline at end of file
+   $ make
diff --git a/bootstrap b/bootstrap
index 12f9388..cd759b0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@ 
 #! /bin/sh
 set -x
-aclocal -I config
+aclocal -I config -I m4
 libtoolize --copy
 autoheader
 automake --add-missing --copy