Module: xenomai-3 Branch: next Commit: dc1f7755d5156432e146f41c2c1d17a81b56dd97 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=dc1f7755d5156432e146f41c2c1d17a81b56dd97
Author: Philippe Gerum <r...@xenomai.org> Date: Tue Mar 3 20:52:57 2015 +0100 build: make $prefix value available to configure script --- configure | 73 +++++++++++++++++++++++++++++++--------------------------- configure.ac | 15 ++++++++---- 2 files changed, 49 insertions(+), 39 deletions(-) diff --git a/configure b/configure index 4722de5..00c0535 100755 --- a/configure +++ b/configure @@ -2363,6 +2363,45 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_config_headers="$ac_config_headers include/xeno_config.h" + +ac_aux_dir= +for ac_dir in config "$srcdir"/config; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + + + + +# We want $prefix to be set for the configure script +if test x$prefix = xNONE; then + prefix=$ac_default_prefix +fi + version_code=`cat $srcdir/config/version-code` CONFIG_XENO_VERSION_MAJOR=`expr $version_code : '\([0-9]*\)'` CONFIG_XENO_VERSION_MINOR=`expr $version_code : '[0-9]*\.\([0-9]*\)'` @@ -2429,40 +2468,6 @@ if eval test $includedir = /usr/include; then as_fn_error $? "Using /usr/include as includedir is not supported. Please change your --prefix or specify another --includedir" "$LINENO" 5 fi -ac_config_headers="$ac_config_headers include/xeno_config.h" - -ac_aux_dir= -for ac_dir in config "$srcdir"/config; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - - - - # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 diff --git a/configure.ac b/configure.ac index af2e73d..e04894f 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,16 @@ AC_PREREQ(2.62) # defined for each architecture in the asm/features.h file. AC_INIT([Xenomai],m4_normalize(m4_include([config/version-label])),xeno...@xenomai.org) +AC_CONFIG_HEADERS(include/xeno_config.h) +AC_CONFIG_AUX_DIR(config) +AC_CONFIG_MACRO_DIR([config]) +AC_CONFIG_SRCDIR(lib/cobalt/thread.c) +AC_PREFIX_DEFAULT(/usr/xenomai) +# We want $prefix to be set for the configure script +if test x$prefix = xNONE; then + prefix=$ac_default_prefix +fi + version_code=`cat $srcdir/config/version-code` CONFIG_XENO_VERSION_MAJOR=`expr $version_code : '\([[0-9]]*\)'` CONFIG_XENO_VERSION_MINOR=`expr $version_code : '[[0-9]]*\.\([[0-9]]*\)'` @@ -54,11 +64,6 @@ if eval test $includedir = /usr/include; then AC_MSG_ERROR([Using /usr/include as includedir is not supported. Please change your --prefix or specify another --includedir]) fi -AC_CONFIG_HEADERS(include/xeno_config.h) -AC_CONFIG_AUX_DIR(config) -AC_CONFIG_MACRO_DIR([config]) -AC_CONFIG_SRCDIR(lib/cobalt/thread.c) -AC_PREFIX_DEFAULT(/usr/xenomai) AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_PROG_INSTALL _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git
