[BZ #1089]
2005-11-04 Roland McGrath <roland@redhat.com> [BZ #1089] * configure.in: Change order of add-on sysdeps directories, so they are interleaved with main sysdeps directories. * configure: Regenerated.
This commit is contained in:
parent
e7b003c37f
commit
4b69abad2c
|
@ -1,3 +1,10 @@
|
||||||
|
2005-11-04 Roland McGrath <roland@redhat.com>
|
||||||
|
|
||||||
|
[BZ #1089]
|
||||||
|
* configure.in: Change order of add-on sysdeps directories,
|
||||||
|
so they are interleaved with main sysdeps directories.
|
||||||
|
* configure: Regenerated.
|
||||||
|
|
||||||
2005-11-03 Roland McGrath <roland@redhat.com>
|
2005-11-03 Roland McGrath <roland@redhat.com>
|
||||||
|
|
||||||
* NEWS: Synch with 2.3 branch updates.
|
* NEWS: Synch with 2.3 branch updates.
|
||||||
|
|
|
@ -2083,23 +2083,26 @@ done
|
||||||
# Find what sysdep directories exist.
|
# Find what sysdep directories exist.
|
||||||
sysnames=
|
sysnames=
|
||||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
||||||
for d in $add_ons_pfx ''; do
|
for b in $base ''; do
|
||||||
for b in $base ''; do
|
for m0 in $mach ''; do
|
||||||
for m0 in $mach ''; do
|
for v in /$vendor ''; do
|
||||||
for v in /$vendor ''; do
|
test "$v" = / && continue
|
||||||
test "$v" = / && continue
|
for o in /$ostry ''; do
|
||||||
for o in /$ostry ''; do
|
test "$o" = / && continue
|
||||||
test "$o" = / && continue
|
for m in $mach ''; do
|
||||||
for m in $mach ''; do
|
for d in $add_ons_pfx ''; do
|
||||||
for a in $add_ons_sfx ''; do
|
for a in $add_ons_sfx ''; do
|
||||||
if test "$m0$b$v$o$m"; then
|
if test "$m0$m0sub$b$v$o$m$msub"; then
|
||||||
try="${d}sysdeps$m0$b$v$o$m$a"
|
try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a"
|
||||||
test -n "$enable_debug_configure" &&
|
test -n "$enable_debug_configure" &&
|
||||||
echo "$0 DEBUG: try $try" >&2
|
echo "$0 DEBUG: try $try" >&2
|
||||||
if test -d $srcdir/$try; then
|
if test -d $srcdir/$try; then
|
||||||
sysnames="$sysnames $try"
|
sysnames="$sysnames $try"
|
||||||
{ test -n "$o" || test -n "$b"; } && os_used=t
|
{ test -n "$o" || test -n "$b"; } && os_used=t
|
||||||
{ test -n "$m" || test -n "$m0"; } && machine_used=t
|
{ test -n "$m" || test -n "$m0"; } && machine_used=t
|
||||||
|
case x${m0:-$m} in
|
||||||
|
x*/$submachine) submachine_used=t ;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -2108,14 +2111,18 @@ for d in $add_ons_pfx ''; do
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
if test -n "$d"; then
|
done
|
||||||
try="${d}sysdeps/generic"
|
for d in $add_ons_pfx ''; do
|
||||||
test -n "$enable_debug_configure" &&
|
for a in $add_ons_sfx ''; do
|
||||||
echo "$0 DEBUG: try $try" >&2
|
if test -n "$d" && test "$d" != "$a"; then
|
||||||
if test -d $srcdir/$try; then
|
try="${d}sysdeps/generic${a}"
|
||||||
sysnames="$sysnames $try"
|
test -n "$enable_debug_configure" &&
|
||||||
|
echo "$0 DEBUG: try $try" >&2
|
||||||
|
if test -d $srcdir/$try; then
|
||||||
|
sysnames="$sysnames $try"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
done
|
||||||
done
|
done
|
||||||
IFS="$ac_save_ifs"
|
IFS="$ac_save_ifs"
|
||||||
|
|
||||||
|
|
41
configure.in
41
configure.in
|
@ -575,23 +575,26 @@ changequote([,])dnl
|
||||||
# Find what sysdep directories exist.
|
# Find what sysdep directories exist.
|
||||||
sysnames=
|
sysnames=
|
||||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
||||||
for d in $add_ons_pfx ''; do
|
for b in $base ''; do
|
||||||
for b in $base ''; do
|
for m0 in $mach ''; do
|
||||||
for m0 in $mach ''; do
|
for v in /$vendor ''; do
|
||||||
for v in /$vendor ''; do
|
test "$v" = / && continue
|
||||||
test "$v" = / && continue
|
for o in /$ostry ''; do
|
||||||
for o in /$ostry ''; do
|
test "$o" = / && continue
|
||||||
test "$o" = / && continue
|
for m in $mach ''; do
|
||||||
for m in $mach ''; do
|
for d in $add_ons_pfx ''; do
|
||||||
for a in $add_ons_sfx ''; do
|
for a in $add_ons_sfx ''; do
|
||||||
if test "$m0$b$v$o$m"; then
|
if test "$m0$m0sub$b$v$o$m$msub"; then
|
||||||
try="${d}sysdeps$m0$b$v$o$m$a"
|
try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a"
|
||||||
test -n "$enable_debug_configure" &&
|
test -n "$enable_debug_configure" &&
|
||||||
echo "$0 [DEBUG]: try $try" >&2
|
echo "$0 [DEBUG]: try $try" >&2
|
||||||
if test -d $srcdir/$try; then
|
if test -d $srcdir/$try; then
|
||||||
sysnames="$sysnames $try"
|
sysnames="$sysnames $try"
|
||||||
{ test -n "$o" || test -n "$b"; } && os_used=t
|
{ test -n "$o" || test -n "$b"; } && os_used=t
|
||||||
{ test -n "$m" || test -n "$m0"; } && machine_used=t
|
{ test -n "$m" || test -n "$m0"; } && machine_used=t
|
||||||
|
case x${m0:-$m} in
|
||||||
|
x*/$submachine) submachine_used=t ;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -600,14 +603,18 @@ for d in $add_ons_pfx ''; do
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
if test -n "$d"; then
|
done
|
||||||
try="${d}sysdeps/generic"
|
for d in $add_ons_pfx ''; do
|
||||||
test -n "$enable_debug_configure" &&
|
for a in $add_ons_sfx ''; do
|
||||||
echo "$0 DEBUG: try $try" >&2
|
if test -n "$d" && test "$d" != "$a"; then
|
||||||
if test -d $srcdir/$try; then
|
try="${d}sysdeps/generic${a}"
|
||||||
sysnames="$sysnames $try"
|
test -n "$enable_debug_configure" &&
|
||||||
|
echo "$0 DEBUG: try $try" >&2
|
||||||
|
if test -d $srcdir/$try; then
|
||||||
|
sysnames="$sysnames $try"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
done
|
||||||
done
|
done
|
||||||
IFS="$ac_save_ifs"
|
IFS="$ac_save_ifs"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue