Changeset 117755 for trunk/base
- Timestamp:
- Mar 10, 2014, 11:50:25 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/base/configure
r117731 r117755 2838 2838 2839 2839 # Clean CFLAGS CPPFLAGS OBJCFLAGS and LDFLAGS 2840 for flagname in CFLAGS CPPFLAGS OBJCFLAGS LDFLAGS; do2840 for mp_flags_flagname in CFLAGS CPPFLAGS OBJCFLAGS LDFLAGS; do 2841 2841 mp_flags_scan_flag_cleaned= 2842 eval "set x \$$ flagname"2842 eval "set x \$$mp_flags_flagname" 2843 2843 shift 2844 2844 for mp_flags_scan_val; do 2845 2845 case "$mp_flags_scan_val" in 2846 2846 -I$prefix/* | -L$prefix/*) 2847 { $as_echo "$as_me:${as_lineno-$LINENO}: Removing \`$mp_flags_scan_val' from \$$ flagname because it might cause a self-dependency" >&52848 $as_echo "$as_me: Removing \`$mp_flags_scan_val' from \$$ flagname because it might cause a self-dependency" >&6;}2847 { $as_echo "$as_me:${as_lineno-$LINENO}: Removing \`$mp_flags_scan_val' from \$$mp_flags_flagname because it might cause a self-dependency" >&5 2848 $as_echo "$as_me: Removing \`$mp_flags_scan_val' from \$$mp_flags_flagname because it might cause a self-dependency" >&6;} 2849 2849 mp_flags_scan_found=1 2850 2850 ;; #( 2851 2851 *) 2852 as_fn_append mp_flags_scan_flag_cleaned " $mp_flags_scan_val" 2852 if test -z "$mp_flags_scan_flag_cleaned"; then 2853 mp_flags_scan_flag_cleaned=$mp_flags_scan_val 2854 else 2855 as_fn_append mp_flags_scan_flag_cleaned " $mp_flags_scan_val" 2856 fi 2853 2857 ;; 2854 2858 esac 2855 2859 done 2856 2860 if test -z "$mp_flags_scan_flag_cleaned"; then 2857 (unset $flagname) >/dev/null 2>&1 && unset $flagname 2861 (unset $mp_flags_flagname) >/dev/null 2>&1 && unset $mp_flags_flagname 2862 (export -n $mp_flags_flagname) >/dev/null 2>&1 && export -n $mp_flags_flagname 2858 2863 else 2859 eval "$flagname=\"$mp_flags_scan_flag_cleaned\"" 2864 eval "$mp_flags_flagname=\"$mp_flags_scan_flag_cleaned\"" 2865 export $mp_flags_flagname 2860 2866 fi 2867 eval "ac_env_${mp_flags_flagname}_set=\${${mp_flags_flagname}+set}" 2868 eval "ac_env_${mp_flags_flagname}_value=\${${mp_flags_flagname}}" 2869 eval "ac_cv_env_${mp_flags_flagname}_set=\${${mp_flags_flagname}+set}" 2870 eval "ac_cv_env_${mp_flags_flagname}_value=\${${mp_flags_flagname}}" 2871 done 2872 2873 # Since those are all precious variables they have been saved into config.cache and put into $ac_configure_args 2874 # We need to remove them at least from $ac_configure_args, because that's being passed to sub-configures 2875 eval "set x $ac_configure_args" 2876 shift 2877 ac_configure_args= 2878 for mp_flags_configure_arg; do 2879 case "$mp_flags_configure_arg" in 2880 CFLAGS=* | CPPFLAGS=* | OBJCFLAGS=* | LDFLAGS=*) 2881 mp_flags_configure_arg_key=$($as_echo "$mp_flags_configure_arg" | sed -E 's/^([^=]+)=.*$/\1/') 2882 eval "mp_flags_configure_arg_newval=\$$mp_flags_configure_arg_key" 2883 if test -n "$mp_flags_configure_arg_newval"; then 2884 as_fn_append ac_configure_args " '$mp_flags_configure_arg_key=$mp_flags_configure_arg_newval'" 2885 fi 2886 ;; 2887 *) 2888 as_fn_append ac_configure_args " '$mp_flags_configure_arg'" 2889 ;; 2890 esac 2861 2891 done 2862 2892 … … 9549 9579 case $mp_arg in 9550 9580 --*=* | -*=*) 9551 mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?( ^=+)=.*$/\1/')9581 mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/') 9552 9582 case $mp_arg_key in 9553 9583 *\'*) … … 9652 9682 ;; 9653 9683 --*=* | -*=*) 9654 mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?( ^=+)=.*$/\1/')9684 mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/') 9655 9685 mp_list_contains_present= 9656 9686 eval "mp_list_contains_list=\"$mp_sub_configure_keys\"" … … 9867 9897 case $mp_arg in 9868 9898 --*=* | -*=*) 9869 mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?( ^=+)=.*$/\1/')9899 mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/') 9870 9900 case $mp_arg_key in 9871 9901 *\'*) … … 9970 10000 ;; 9971 10001 --*=* | -*=*) 9972 mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?( ^=+)=.*$/\1/')10002 mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/') 9973 10003 mp_list_contains_present= 9974 10004 eval "mp_list_contains_list=\"$mp_sub_configure_keys\"" … … 10182 10212 case $mp_arg in 10183 10213 --*=* | -*=*) 10184 mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?( ^=+)=.*$/\1/')10214 mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/') 10185 10215 case $mp_arg_key in 10186 10216 *\'*) … … 10285 10315 ;; 10286 10316 --*=* | -*=*) 10287 mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?( ^=+)=.*$/\1/')10317 mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/') 10288 10318 mp_list_contains_present= 10289 10319 eval "mp_list_contains_list=\"$mp_sub_configure_keys\""
Note: See TracChangeset
for help on using the changeset viewer.