[Xenomai-core] [PATCH] build system: Fix shared libs generation

[Xenomai-core] [PATCH] build system: Fix shared libs generation

[Jan Kiszka]

This fixes a regression of dbbd33f50d: There must be no
AC_DISABLE_SHARED without AS_ENABLE_SHARED for the cases where it shall
remain enabled. Autotools are great, aren't they?

Signed-off-by: Jan Kiszka <jan.kiszka@domain.hid>
---
 configure.in |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 71bad26..50f390e 100644
--- a/configure.in
+++ b/configure.in
@@ -110,7 +110,6 @@ case "$build_for" in
 	XENO_TARGET_ARCH=nios2
         XENO_LINUX_ARCH=nios2
 	XENO_LINUX_INSTALL_TARGET=install
-	AC_DISABLE_SHARED
         ;;
  *) echo ""
    echo "*******************************************"
@@ -121,9 +120,18 @@ case "$build_for" in
 esac
 
 AC_MSG_RESULT([$XENO_TARGET_ARCH])
-AC_PROG_LIBTOOL
 AM_CONDITIONAL(XENO_LINUX_ARCH_I386,[test $XENO_LINUX_ARCH = i386])
 
+case "$XENO_TARGET_ARCH" in
+ nios2)
+	AC_DISABLE_SHARED
+	;;
+ *)
+	AC_ENABLE_SHARED
+	;;
+esac
+AC_PROG_LIBTOOL
+
 dnl
 dnl Parse options
 dnl
-- 
1.6.0.2

[Xenomai-core] [PATCH v2] build system: Fix shared libs generation

[Jan Kiszka]

This fixes a regression of dbbd33f50d: There must be no
AC_DISABLE_SHARED without AS_ENABLE_SHARED for the cases where it shall
remain enabled.

Signed-off-by: Jan Kiszka <jan.kiszka@domain.hid>
---
 configure.in |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

v2: properly rebased against head

diff --git a/configure.in b/configure.in
index 40683fe..9cce885 100644
--- a/configure.in
+++ b/configure.in
@@ -117,7 +117,6 @@ case "$build_for" in
         XENO_LINUX_ARCH=nios2
 	XENO_LINUX_INSTALL_TARGET=install
 	CONFIG_XENO_DEFAULT_PERIOD=10000000
-	AC_DISABLE_SHARED
         ;;
  *) echo ""
    echo "*******************************************"
@@ -128,9 +127,18 @@ case "$build_for" in
 esac
 
 AC_MSG_RESULT([$XENO_TARGET_ARCH])
-AC_PROG_LIBTOOL
 AM_CONDITIONAL(XENO_LINUX_ARCH_I386,[test $XENO_LINUX_ARCH = i386])
 
+case "$XENO_TARGET_ARCH" in
+ nios2)
+	AC_DISABLE_SHARED
+	;;
+ *)
+	AC_ENABLE_SHARED
+	;;
+esac
+AC_PROG_LIBTOOL
+
 dnl
 dnl Parse options
 dnl
-- 
1.6.0.2

Re: [Xenomai-core] [PATCH v2] build system: Fix shared libs generation

[Philippe Gerum]

On Thu, 2009-10-29 at 12:33 +0100, Jan Kiszka wrote:
> This fixes a regression of dbbd33f50d: There must be no
> AC_DISABLE_SHARED without AS_ENABLE_SHARED for the cases where it shall
> remain enabled.
> 

Makes sense. Will you queue this in your tree?

> Signed-off-by: Jan Kiszka <jan.kiszka@domain.hid>
> ---
>  configure.in |   12 ++++++++++--
>  1 files changed, 10 insertions(+), 2 deletions(-)
> 
> v2: properly rebased against head
> 
> diff --git a/configure.in b/configure.in
> index 40683fe..9cce885 100644
> --- a/configure.in
> +++ b/configure.in
> @@ -117,7 +117,6 @@ case "$build_for" in
>          XENO_LINUX_ARCH=nios2
>  	XENO_LINUX_INSTALL_TARGET=install
>  	CONFIG_XENO_DEFAULT_PERIOD=10000000
> -	AC_DISABLE_SHARED
>          ;;
>   *) echo ""
>     echo "*******************************************"
> @@ -128,9 +127,18 @@ case "$build_for" in
>  esac
>  
>  AC_MSG_RESULT([$XENO_TARGET_ARCH])
> -AC_PROG_LIBTOOL
>  AM_CONDITIONAL(XENO_LINUX_ARCH_I386,[test $XENO_LINUX_ARCH = i386])
>  
> +case "$XENO_TARGET_ARCH" in
> + nios2)
> +	AC_DISABLE_SHARED
> +	;;
> + *)
> +	AC_ENABLE_SHARED
> +	;;
> +esac
> +AC_PROG_LIBTOOL
> +
>  dnl
>  dnl Parse options
>  dnl


-- 
Philippe.

Re: [Xenomai-core] [PATCH v2] build system: Fix shared libs generation

[Jan Kiszka]

Philippe Gerum wrote:
> On Thu, 2009-10-29 at 12:33 +0100, Jan Kiszka wrote:
>> This fixes a regression of dbbd33f50d: There must be no
>> AC_DISABLE_SHARED without AS_ENABLE_SHARED for the cases where it shall
>> remain enabled.
>>
> 
> Makes sense. Will you queue this in your tree?

Done, it's ready to be pulled.

Jan

> 
>> Signed-off-by: Jan Kiszka <jan.kiszka@domain.hid>
>> ---
>>  configure.in |   12 ++++++++++--
>>  1 files changed, 10 insertions(+), 2 deletions(-)
>>
>> v2: properly rebased against head
>>
>> diff --git a/configure.in b/configure.in
>> index 40683fe..9cce885 100644
>> --- a/configure.in
>> +++ b/configure.in
>> @@ -117,7 +117,6 @@ case "$build_for" in
>>          XENO_LINUX_ARCH=nios2
>>  	XENO_LINUX_INSTALL_TARGET=install
>>  	CONFIG_XENO_DEFAULT_PERIOD=10000000
>> -	AC_DISABLE_SHARED
>>          ;;
>>   *) echo ""
>>     echo "*******************************************"
>> @@ -128,9 +127,18 @@ case "$build_for" in
>>  esac
>>  
>>  AC_MSG_RESULT([$XENO_TARGET_ARCH])
>> -AC_PROG_LIBTOOL
>>  AM_CONDITIONAL(XENO_LINUX_ARCH_I386,[test $XENO_LINUX_ARCH = i386])
>>  
>> +case "$XENO_TARGET_ARCH" in
>> + nios2)
>> +	AC_DISABLE_SHARED
>> +	;;
>> + *)
>> +	AC_ENABLE_SHARED
>> +	;;
>> +esac
>> +AC_PROG_LIBTOOL
>> +
>>  dnl
>>  dnl Parse options
>>  dnl
> 
> 

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux