summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2012-01-16 22:45:16 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2012-01-16 22:45:16 (GMT)
commit301cadf45dd629d4390fa83b1e52e7cc2fa5062f (patch)
tree92f3719b54dfc06a836c3116afa2f1cd090ae873
parent887eefec342c052f108973176b414b761e06d0af (diff)
configure: fix kconfig option names
In the process of converting to autoconf, the kconfig option were not properly translated. Fix that. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-rw-r--r--configure.ac4
-rw-r--r--scripts/functions4
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 7f49c0d..1285f81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,8 +52,8 @@ AC_DEFUN(
[ACX_SET_KCONFIG_OPTION],
[AS_IF(
[test -n "$$1"],
- [kconfig_options="$kconfig_options $1=y"],
- [kconfig_options="$kconfig_options $1"])
+ [kconfig_options="$kconfig_options has_$1=y"],
+ [kconfig_options="$kconfig_options has_$1"])
])
#--------------------------------------------------------------------
diff --git a/scripts/functions b/scripts/functions
index 1ec0080..95b7415 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -400,11 +400,11 @@ CT_SetLibPath() {
# Build up the list of allowed tarball extensions
# Add them in the prefered order; most preferred comes first
CT_DoListTarballExt() {
- if [ "${CT_CONFIGURE_has_xzutils}" = "y" ]; then
+ if [ "${CT_CONFIGURE_has_xz}" = "y" ]; then
printf ".tar.xz\n"
fi
if [ "${CT_CONFIGURE_has_lzma}" = "y" \
- -o "${CT_CONFIGURE_has_xzutils}" = "y" ]; then
+ -o "${CT_CONFIGURE_has_xz}" = "y" ]; then
printf ".tar.lzma\n"
fi
printf ".tar.bz2\n"