aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2009-09-15 14:14:42 -0700
committerRoland McGrath <roland@redhat.com>2009-09-15 14:14:42 -0700
commit7967983fd42380b090a63b53fe57a05e1d1c0b4f (patch)
tree8a0f7e2aa9f450115c862c1ccc0c036c05046cfc /configure
parent02bf610ca82f4b5660dadcfff04124e73f8ef2ff (diff)
downloadglibc-7967983fd42380b090a63b53fe57a05e1d1c0b4f.tar
glibc-7967983fd42380b090a63b53fe57a05e1d1c0b4f.tar.gz
glibc-7967983fd42380b090a63b53fe57a05e1d1c0b4f.tar.bz2
glibc-7967983fd42380b090a63b53fe57a05e1d1c0b4f.zip
configure tweaks, support $libc_add_on_config_subdirs
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure31
1 files changed, 27 insertions, 4 deletions
diff --git a/configure b/configure
index 9eda79e4e6..40121ced34 100755
--- a/configure
+++ b/configure
@@ -727,7 +727,6 @@ submachine
base_machine
add_on_subdirs
add_ons
-subdirs
libc_cv_nss_crypt
experimental_malloc
multi_arch
@@ -758,6 +757,7 @@ build_os
build_vendor
build_cpu
build
+subdirs
target_alias
host_alias
build_alias
@@ -843,7 +843,8 @@ CPP
CXX
CXXFLAGS
CCC'
-ac_subdirs_all=''
+ac_subdirs_all='
+'
# Initialize some variables set by options.
ac_init_help=
@@ -2013,6 +2014,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
+
+subdirs="$subdirs "
+
+
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
{ { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
@@ -4007,8 +4013,6 @@ fi
# An add-on can set this when it wants to disable the sanity check below.
libc_config_ok=no
-
-
subdirs="$subdirs "
@@ -4088,6 +4092,7 @@ $as_echo "$as_me: error: add-on directory \"$libc_add_on\" does not exist" >&2;}
libc_add_on_frag=$libc_add_on_srcdir/configure
libc_add_on_canonical=
+ libc_add_on_config_subdirs=
if test -r "$libc_add_on_frag"; then
{ $as_echo "$as_me:$LINENO: running configure fragment for add-on $libc_add_on" >&5
$as_echo "$as_me: running configure fragment for add-on $libc_add_on" >&6;}
@@ -4122,6 +4127,24 @@ $as_echo "$as_me: error: fragment must set \$libc_add_on_canonical" >&2;}
test "$subdir_srcdir" = "\$(..)$d" || config_vars="$config_vars
$d-srcdir = $subdir_srcdir"
done
+ for d in $libc_add_on_config_subdirs; do
+ case "$d" in
+ /*) { { $as_echo "$as_me:$LINENO: error: fragment uses absolute path in \$libc_add_on_config_subdirs" >&5
+$as_echo "$as_me: error: fragment uses absolute path in \$libc_add_on_config_subdirs" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ if test ! -d "$libc_add_on_srcdir/$d"; then
+ { { $as_echo "$as_me:$LINENO: error: fragment wants to configure missing directory $d" >&5
+$as_echo "$as_me: error: fragment wants to configure missing directory $d" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ case "$libc_add_on" in
+ /*) { { $as_echo "$as_me:$LINENO: error: relative path required for add-on using \$libc_add_on_config_subdirs" >&5
+$as_echo "$as_me: error: relative path required for add-on using \$libc_add_on_config_subdirs" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ subdirs="$subdirs $libc_add_on/$d"
+ done
}
fi
if test -n "$libc_add_on"; then