Skip to content

Fix Bug #66592 - relative paths in PHP_NEW_EXTENSION soruces #1903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Fix Bug #66592 - relative paths in PHP_NEW_EXTENSION soruces #1903

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27bc33b
Fix 66592
smoon8 May 10, 2016
8292ae5
changed " -> ' to prevent variable expansion
smoon8 May 10, 2016
a0fa5c0
rectify wrong char caused by hasty modifications.
smoon8 May 10, 2016
d30670a
prevent variable expansion
smoon8 May 10, 2016
b9fa9cf
escape square brackets
smoon8 May 10, 2016
196d368
escape BRE metachar . in sed
May 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions acinclude.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,19 @@ dnl iterate over the sources
for ac_src in $2; do

dnl remove the suffix
IFS=.
set $ac_src
ac_obj=[$]1
IFS=$old_IFS
dnl IFS=.
dnl set $ac_src
dnl ac_obj=[$]1
dnl IFS=$old_IFS

dnl remove the suffix
ac_obj=`echo $ac_src|$SED 's/\.[[^\.]]*$//g'`

dnl modify object filename if source file is not in ac_srcdir
ac_src_path=`echo $ac_srcdir$ac_src|$SED -e 's%/\{2,\}%/%g' -e ':begin' -e 's%[[^/]]*/\.\./%%' -e 'tbegin' -e 's%^\.\./%/%g'`
if test $ac_srcdir != `echo $ac_src_path|cut -c -${#ac_srcdir}`; then
ac_obj=`echo $ac_src|$SED 's%\.\./%_parent_dir.%g'|$SED 's%/%_dir.%g'|$SED 's/\.[^\.]*$//g'`
fi

dnl append to the array which has been dynamically chosen at m4 time
$4="[$]$4 [$]ac_bdir[$]ac_obj.lo"
Expand Down