[117755] trunk/base/configure
cal at macports.org
cal at macports.org
Mon Mar 10 16:50:25 PDT 2014
Revision: 117755
https://trac.macports.org/changeset/117755
Author: cal at macports.org
Date: 2014-03-10 16:50:25 -0700 (Mon, 10 Mar 2014)
Log Message:
-----------
configure: regenerate after r117754
Revision Links:
--------------
https://trac.macports.org/changeset/117754
Modified Paths:
--------------
trunk/base/configure
Modified: trunk/base/configure
===================================================================
--- trunk/base/configure 2014-03-10 23:50:03 UTC (rev 117754)
+++ trunk/base/configure 2014-03-10 23:50:25 UTC (rev 117755)
@@ -2837,29 +2837,59 @@
mp_flags_scan_found=
# Clean CFLAGS CPPFLAGS OBJCFLAGS and LDFLAGS
- for flagname in CFLAGS CPPFLAGS OBJCFLAGS LDFLAGS; do
+ for mp_flags_flagname in CFLAGS CPPFLAGS OBJCFLAGS LDFLAGS; do
mp_flags_scan_flag_cleaned=
- eval "set x \$$flagname"
+ eval "set x \$$mp_flags_flagname"
shift
for mp_flags_scan_val; do
case "$mp_flags_scan_val" in
-I$prefix/* | -L$prefix/*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: Removing \`$mp_flags_scan_val' from \$$flagname because it might cause a self-dependency" >&5
-$as_echo "$as_me: Removing \`$mp_flags_scan_val' from \$$flagname because it might cause a self-dependency" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Removing \`$mp_flags_scan_val' from \$$mp_flags_flagname because it might cause a self-dependency" >&5
+$as_echo "$as_me: Removing \`$mp_flags_scan_val' from \$$mp_flags_flagname because it might cause a self-dependency" >&6;}
mp_flags_scan_found=1
;; #(
*)
- as_fn_append mp_flags_scan_flag_cleaned " $mp_flags_scan_val"
+ if test -z "$mp_flags_scan_flag_cleaned"; then
+ mp_flags_scan_flag_cleaned=$mp_flags_scan_val
+ else
+ as_fn_append mp_flags_scan_flag_cleaned " $mp_flags_scan_val"
+ fi
;;
esac
done
if test -z "$mp_flags_scan_flag_cleaned"; then
- (unset $flagname) >/dev/null 2>&1 && unset $flagname
+ (unset $mp_flags_flagname) >/dev/null 2>&1 && unset $mp_flags_flagname
+ (export -n $mp_flags_flagname) >/dev/null 2>&1 && export -n $mp_flags_flagname
else
- eval "$flagname=\"$mp_flags_scan_flag_cleaned\""
+ eval "$mp_flags_flagname=\"$mp_flags_scan_flag_cleaned\""
+ export $mp_flags_flagname
fi
+ eval "ac_env_${mp_flags_flagname}_set=\${${mp_flags_flagname}+set}"
+ eval "ac_env_${mp_flags_flagname}_value=\${${mp_flags_flagname}}"
+ eval "ac_cv_env_${mp_flags_flagname}_set=\${${mp_flags_flagname}+set}"
+ eval "ac_cv_env_${mp_flags_flagname}_value=\${${mp_flags_flagname}}"
done
+ # Since those are all precious variables they have been saved into config.cache and put into $ac_configure_args
+ # We need to remove them at least from $ac_configure_args, because that's being passed to sub-configures
+ eval "set x $ac_configure_args"
+ shift
+ ac_configure_args=
+ for mp_flags_configure_arg; do
+ case "$mp_flags_configure_arg" in
+ CFLAGS=* | CPPFLAGS=* | OBJCFLAGS=* | LDFLAGS=*)
+ mp_flags_configure_arg_key=$($as_echo "$mp_flags_configure_arg" | sed -E 's/^([^=]+)=.*$/\1/')
+ eval "mp_flags_configure_arg_newval=\$$mp_flags_configure_arg_key"
+ if test -n "$mp_flags_configure_arg_newval"; then
+ as_fn_append ac_configure_args " '$mp_flags_configure_arg_key=$mp_flags_configure_arg_newval'"
+ fi
+ ;;
+ *)
+ as_fn_append ac_configure_args " '$mp_flags_configure_arg'"
+ ;;
+ esac
+ done
+
if ! test -z "$mp_flags_scan_found"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: See https://trac.macports.org/ticket/42756 for rationale on why this script is removing these values" >&5
$as_echo "$as_me: See https://trac.macports.org/ticket/42756 for rationale on why this script is removing these values" >&6;}
@@ -9548,7 +9578,7 @@
for mp_arg in --prefix=${macports_libexec_dir} --enable-threads; do
case $mp_arg in
--*=* | -*=*)
- mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?(^=+)=.*$/\1/')
+ mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/')
case $mp_arg_key in
*\'*)
mp_arg_key=$($as_echo "$mp_arg_key" | sed "s/'/'\\\\\\\\''/g")
@@ -9651,7 +9681,7 @@
# ignore --disable-option-checking
;;
--*=* | -*=*)
- mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?(^=+)=.*$/\1/')
+ mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/')
mp_list_contains_present=
eval "mp_list_contains_list=\"$mp_sub_configure_keys\""
for mp_list_contains_entry in $mp_list_contains_list; do
@@ -9866,7 +9896,7 @@
for mp_arg in --prefix=${macports_libexec_dir}; do
case $mp_arg in
--*=* | -*=*)
- mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?(^=+)=.*$/\1/')
+ mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/')
case $mp_arg_key in
*\'*)
mp_arg_key=$($as_echo "$mp_arg_key" | sed "s/'/'\\\\\\\\''/g")
@@ -9969,7 +9999,7 @@
# ignore --disable-option-checking
;;
--*=* | -*=*)
- mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?(^=+)=.*$/\1/')
+ mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/')
mp_list_contains_present=
eval "mp_list_contains_list=\"$mp_sub_configure_keys\""
for mp_list_contains_entry in $mp_list_contains_list; do
@@ -10181,7 +10211,7 @@
for mp_arg in --prefix=${macports_libexec_dir}; do
case $mp_arg in
--*=* | -*=*)
- mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?(^=+)=.*$/\1/')
+ mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/')
case $mp_arg_key in
*\'*)
mp_arg_key=$($as_echo "$mp_arg_key" | sed "s/'/'\\\\\\\\''/g")
@@ -10284,7 +10314,7 @@
# ignore --disable-option-checking
;;
--*=* | -*=*)
- mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?(^=+)=.*$/\1/')
+ mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/')
mp_list_contains_present=
eval "mp_list_contains_list=\"$mp_sub_configure_keys\""
for mp_list_contains_entry in $mp_list_contains_list; do
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140310/cfba270e/attachment-0001.html>
More information about the macports-changes
mailing list