Module: xenomai-head Branch: master Commit: be96a6c276c0334c07780314b1a513ec926b5ccc URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=be96a6c276c0334c07780314b1a513ec926b5ccc
Author: Philippe Gerum <r...@xenomai.org> Date: Thu May 28 18:43:52 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 da70e89..4a80298 100755 --- a/configure +++ b/configure @@ -12303,7 +12303,7 @@ fi echo $ECHO_N "checking for target architecture... $ECHO_C" >&6; } CONFIG_XENO_FASTSYNCH= -case "$host" in +case "$host_alias" in i*86*-*) XENO_TARGET_ARCH=x86 XENO_LINUX_ARCH=i386 @@ -12343,7 +12343,7 @@ case "$host" in ;; *) echo "" echo "*******************************************" - echo "Still unsupported target: $host -- Sorry." + echo "Still unsupported target: $host_alias -- Sorry." echo "*******************************************" echo "" exit 1;; @@ -12649,9 +12649,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 @@ -12674,6 +12675,7 @@ echo "${ECHO_T}$ADEOS_PATCH" >&6; } *-powerpc-*) XENO_LINUX_ARCH=powerpc;; *-x86-*) XENO_LINUX_ARCH=x86;; esac + fi unset LNDIR @@ -16472,7 +16474,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." @@ -16526,12 +16528,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 23361a4..c333489 100644 --- a/configure.in +++ b/configure.in @@ -60,7 +60,7 @@ AM_PROG_LEX AC_MSG_CHECKING([for target architecture]) CONFIG_XENO_FASTSYNCH= -case "$host" in +case "$host_alias" in i*86*-*) XENO_TARGET_ARCH=x86 XENO_LINUX_ARCH=i386 @@ -100,7 +100,7 @@ case "$host" in ;; *) echo "" echo "*******************************************" - echo "Still unsupported target: $host -- Sorry." + echo "Still unsupported target: $host_alias -- Sorry." echo "*******************************************" echo "" exit 1;; @@ -353,8 +353,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.]), @@ -372,6 +373,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 @@ -395,7 +397,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." @@ -449,12 +451,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