summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2015-10-15 08:39:42 -0400
committerJarkko Hietaniemi <jhi@iki.fi>2015-10-16 16:44:59 -0400
commitb44694539e922b1078113e05f80651c9eedd5d37 (patch)
treec9873a45004ca6351e0940601b837ba242629c3f /Configure
parent762501079f1a2a77e1a165eecfbb06511a4b2734 (diff)
downloadperl-b44694539e922b1078113e05f80651c9eedd5d37.tar.gz
rt.perl.org 126152 compile error after re-running Configure since AmigaOS merge
Configure /proc issues, honor d_procselfexe and procselfexe hints.
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure26
1 files changed, 14 insertions, 12 deletions
diff --git a/Configure b/Configure
index 0d7796c4e8..6f2d4ff91c 100755
--- a/Configure
+++ b/Configure
@@ -17105,16 +17105,21 @@ EOM
set readlink d_readlink
eval $inlibc
-: Check if exe is symlink to abs path of executing program
+: Check if there is a /proc symlink to the abs path of
+: the executing program. We will honor hints of d_procselfexe=$undef
+: or procselfexe being non-empty, otherwise will try to determine both
+: if we have readlink.
+: AmigaOS will attempt to mount proc: aka /proc, if /proc/... is
+: referenced, and AmigaOS does not have a proc filesystem anyway.
echo " "
-procselfexe=''
val="$undef"
-case "$d_procselfexe" in
-'')
-case "$d_readlink" in
- "$define")
- : NetBSD first as /proc/self is a symlink to /proc/curproc, and it feels
- : more tidy to avoid an extra level of symlink
+if $test "X$d_procselfexe" = Xundef; then
+ procselfexe=''
+elif $test "X$procselfexe" != X -a "X$procselfexe" != 'X '; then
+ val="$define"
+elif $test "X$d_readlink" = Xdefine; then
+ : NetBSD first as /proc/self is a symlink to /proc/curproc,
+ : and it feels more tidy to avoid an extra level of symlink
set NetBSD /proc/curproc/exe Linux /proc/self/exe FreeBSD /proc/curproc/file Solaris /proc/self/path/a.out
while test $# -gt 0; do
type=$1; try=$2
@@ -17130,13 +17135,10 @@ case "$d_readlink" in
fi
fi
done
- ;;
-esac
+fi
$rm -f reflect
set d_procselfexe
eval $setvar
-;;
-esac
: backward compatibility for d_hvfork
if test X$d_hvfork != X; then