Module: xenomai-2.4
Branch: master
Commit: c83016c1752fd8f400527487ab31c6ae40cbad63
URL:    
http://git.xenomai.org/?p=xenomai-2.4.git;a=commit;h=c83016c1752fd8f400527487ab31c6ae40cbad63

Author: Philippe Gerum <r...@xenomai.org>
Date:   Thu May 28 18:43:30 2009 +0200

Fix --enable-build support

---

 configure    |   14 ++++++++------
 configure.in |   14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index 7f4f247..cc932bf 100755
--- a/configure
+++ b/configure
@@ -12297,7 +12297,7 @@ fi
 { echo "$as_me:$LINENO: checking for target architecture" >&5
 echo $ECHO_N "checking for target architecture... $ECHO_C" >&6; }
 
-case "$host" in
+case "$host_alias" in
  i*86*-*)
        XENO_TARGET_ARCH=x86
         XENO_LINUX_ARCH=i386
@@ -12336,7 +12336,7 @@ case "$host" in
         ;;
  *) echo ""
    echo "*******************************************"
-   echo "Still unsupported target: $host -- Sorry."
+   echo "Still unsupported target: $host_alias -- Sorry."
    echo "*******************************************"
    echo ""
    exit 1;;
@@ -12626,9 +12626,10 @@ echo "$as_me: error: Unknown Linux version 
$linux_full_version" >&2;}
 
   fi
 
+  unset ADEOS_PATCH
+  if test \! -e $XENO_LINUX_SRCDIR/kernel/ipipe; then
   { echo "$as_me:$LINENO: checking for Adeos patch" >&5
 echo $ECHO_N "checking for Adeos patch... $ECHO_C" >&6; }
-  unset ADEOS_PATCH
 
 # Check whether --with-adeos-patch was given.
 if test "${with_adeos_patch+set}" = set; then
@@ -12651,6 +12652,7 @@ echo "${ECHO_T}$ADEOS_PATCH" >&6; }
        *-powerpc-*) XENO_LINUX_ARCH=powerpc;;
        *-x86-*) XENO_LINUX_ARCH=x86;;
   esac
+  fi
 
 
   unset LNDIR
@@ -16371,7 +16373,7 @@ _LT_EOF
      if test -e linux/.xenomai-prepared ; then
         . linux/.xenomai-prepared
         if test x"$XENO_LINUX_VERSION" != x"$PREPARED_LINUX_VERSION" ||
-           test x"`basename $ADEOS_PATCH`" != x"$PREPARED_ADEOS_PATCH" ; then
+           test x`basename "$ADEOS_PATCH"` != x"$PREPARED_ADEOS_PATCH" ; then
            echo "*** Warning: built version of linux and requested versions 
are "
            echo "*** different. If you want to build the requested version of "
            echo "*** linux, remove the file: linux/.xenomai-prepared."
@@ -16420,12 +16422,12 @@ _LT_EOF
               test -e .xenomai.config && mv .xenomai.config .config
            fi
            cd ..
-           $srcdir/scripts/prepare-kernel.sh \
+           $srcdir/scripts/prepare-kernel.sh --verbose \
              --adeos="$ADEOS_PATCH" --linux=linux --arch=$XENO_LINUX_ARCH
            test -e .xenomai.config && mv .xenomai.config linux/.config || :
            cat > linux/.xenomai-prepared.tmp <<EOF
 PREPARED_LINUX_VERSION=$XENO_LINUX_VERSION
-PREPARED_ADEOS_PATCH=`basename $ADEOS_PATCH`
+PREPARED_ADEOS_PATCH=`basename "$ADEOS_PATCH"`
 EOF
            mv linux/.xenomai-prepared.tmp linux/.xenomai-prepared
      fi
diff --git a/configure.in b/configure.in
index df26ff2..2e0d124 100644
--- a/configure.in
+++ b/configure.in
@@ -59,7 +59,7 @@ AM_PROG_LEX
 
 AC_MSG_CHECKING([for target architecture])
 
-case "$host" in
+case "$host_alias" in
  i*86*-*)
        XENO_TARGET_ARCH=x86
         XENO_LINUX_ARCH=i386
@@ -98,7 +98,7 @@ case "$host" in
         ;;
  *) echo ""
    echo "*******************************************"
-   echo "Still unsupported target: $host -- Sorry."
+   echo "Still unsupported target: $host_alias -- Sorry."
    echo "*******************************************"
    echo ""
    exit 1;;
@@ -337,8 +337,9 @@ else
      AC_SUBST(XENO_LINUX_IMAGE)
   fi
 
-  AC_MSG_CHECKING(for Adeos patch)
   unset ADEOS_PATCH
+  if test \! -e $XENO_LINUX_SRCDIR/kernel/ipipe; then
+  AC_MSG_CHECKING(for Adeos patch)
   AC_ARG_WITH(adeos-patch,
         AS_HELP_STRING([--with-adeos-patch],[specify the path to the Adeos
 patch. Default is to infer the patch name from Linux kernel version.]),
@@ -356,6 +357,7 @@ patch. Default is to infer the patch name from Linux kernel 
version.]),
        *-powerpc-*) XENO_LINUX_ARCH=powerpc;;
        *-x86-*) XENO_LINUX_ARCH=x86;;
   esac
+  fi
   AC_SUBST(ADEOS_PATCH)
 
   unset LNDIR
@@ -379,7 +381,7 @@ patch. Default is to infer the patch name from Linux kernel 
version.]),
      if test -e linux/.xenomai-prepared ; then
         . linux/.xenomai-prepared
         if test x"$XENO_LINUX_VERSION" != x"$PREPARED_LINUX_VERSION" ||
-           test x"`basename $ADEOS_PATCH`" != x"$PREPARED_ADEOS_PATCH" ; then
+           test x`basename "$ADEOS_PATCH"` != x"$PREPARED_ADEOS_PATCH" ; then
            echo "*** Warning: built version of linux and requested versions 
are "
            echo "*** different. If you want to build the requested version of "
            echo "*** linux, remove the file: linux/.xenomai-prepared."
@@ -428,12 +430,12 @@ patch. Default is to infer the patch name from Linux 
kernel version.]),
               test -e .xenomai.config && mv .xenomai.config .config
            fi
            cd ..
-           $srcdir/scripts/prepare-kernel.sh \
+           $srcdir/scripts/prepare-kernel.sh --verbose \
              --adeos="$ADEOS_PATCH" --linux=linux --arch=$XENO_LINUX_ARCH      
            test -e .xenomai.config && mv .xenomai.config linux/.config || :
            cat > linux/.xenomai-prepared.tmp <<EOF
 PREPARED_LINUX_VERSION=$XENO_LINUX_VERSION
-PREPARED_ADEOS_PATCH=`basename $ADEOS_PATCH`
+PREPARED_ADEOS_PATCH=`basename "$ADEOS_PATCH"`
 EOF
            mv linux/.xenomai-prepared.tmp linux/.xenomai-prepared
      fi


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git

Reply via email to