comparison configure @ 1042:cd9e76e755bf 3.0-integration

Merge from the default branch
author Chris Cannam
date Thu, 04 Feb 2016 11:17:31 +0000
parents 9fc23e778bfa
children 3691af49291c
comparison
equal deleted inserted replaced
1041:fcedcc7f0d87 1042:cd9e76e755bf
4135 fi 4135 fi
4136 4136
4137 4137
4138 fi 4138 fi
4139 if test x$QMAKE = x ; then 4139 if test x$QMAKE = x ; then
4140 # Extract the first word of "qt5-qmake", so it can be a program name with args.
4141 set dummy qt5-qmake; ac_word=$2
4142 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4143 $as_echo_n "checking for $ac_word... " >&6; }
4144 if ${ac_cv_prog_QMAKE+:} false; then :
4145 $as_echo_n "(cached) " >&6
4146 else
4147 if test -n "$QMAKE"; then
4148 ac_cv_prog_QMAKE="$QMAKE" # Let the user override the test.
4149 else
4150 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4151 for as_dir in $QTDIR/bin/
4152 do
4153 IFS=$as_save_IFS
4154 test -z "$as_dir" && as_dir=.
4155 for ac_exec_ext in '' $ac_executable_extensions; do
4156 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4157 ac_cv_prog_QMAKE="$QTDIR/bin/qt5-qmake"
4158 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4159 break 2
4160 fi
4161 done
4162 done
4163 IFS=$as_save_IFS
4164
4165 fi
4166 fi
4167 QMAKE=$ac_cv_prog_QMAKE
4168 if test -n "$QMAKE"; then
4169 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE" >&5
4170 $as_echo "$QMAKE" >&6; }
4171 else
4172 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4173 $as_echo "no" >&6; }
4174 fi
4175
4176
4177 fi
4178 if test x$QMAKE = x ; then
4140 # Extract the first word of "qmake", so it can be a program name with args. 4179 # Extract the first word of "qmake", so it can be a program name with args.
4141 set dummy qmake; ac_word=$2 4180 set dummy qmake; ac_word=$2
4142 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4181 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4143 $as_echo_n "checking for $ac_word... " >&6; } 4182 $as_echo_n "checking for $ac_word... " >&6; }
4144 if ${ac_cv_prog_QMAKE+:} false; then : 4183 if ${ac_cv_prog_QMAKE+:} false; then :
4231 IFS=$as_save_IFS 4270 IFS=$as_save_IFS
4232 test -z "$as_dir" && as_dir=. 4271 test -z "$as_dir" && as_dir=.
4233 for ac_exec_ext in '' $ac_executable_extensions; do 4272 for ac_exec_ext in '' $ac_executable_extensions; do
4234 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4273 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4235 ac_cv_prog_QMAKE="qmake-qt5" 4274 ac_cv_prog_QMAKE="qmake-qt5"
4275 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4276 break 2
4277 fi
4278 done
4279 done
4280 IFS=$as_save_IFS
4281
4282 fi
4283 fi
4284 QMAKE=$ac_cv_prog_QMAKE
4285 if test -n "$QMAKE"; then
4286 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE" >&5
4287 $as_echo "$QMAKE" >&6; }
4288 else
4289 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4290 $as_echo "no" >&6; }
4291 fi
4292
4293
4294 fi
4295 if test x$QMAKE = x ; then
4296 # Extract the first word of "qt5-qmake", so it can be a program name with args.
4297 set dummy qt5-qmake; ac_word=$2
4298 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4299 $as_echo_n "checking for $ac_word... " >&6; }
4300 if ${ac_cv_prog_QMAKE+:} false; then :
4301 $as_echo_n "(cached) " >&6
4302 else
4303 if test -n "$QMAKE"; then
4304 ac_cv_prog_QMAKE="$QMAKE" # Let the user override the test.
4305 else
4306 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4307 for as_dir in $PATH
4308 do
4309 IFS=$as_save_IFS
4310 test -z "$as_dir" && as_dir=.
4311 for ac_exec_ext in '' $ac_executable_extensions; do
4312 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4313 ac_cv_prog_QMAKE="qt5-qmake"
4236 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4314 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4237 break 2 4315 break 2
4238 fi 4316 fi
4239 done 4317 done
4240 done 4318 done