comparison configure @ 1119:1dc18bddc888

Update acinclude files to look for qt5-qmake as well as qmake-qt5
author Chris Cannam
date Sat, 30 Jan 2016 12:05:14 +0000 (2016-01-30)
parents 94253fa11318
children ccc667cdb8ad
comparison
equal deleted inserted replaced
1081:c977df9da61e 1119:1dc18bddc888
4147 fi 4147 fi
4148 4148
4149 4149
4150 fi 4150 fi
4151 if test x$QMAKE = x ; then 4151 if test x$QMAKE = x ; then
4152 # Extract the first word of "qt5-qmake", so it can be a program name with args.
4153 set dummy qt5-qmake; ac_word=$2
4154 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4155 $as_echo_n "checking for $ac_word... " >&6; }
4156 if ${ac_cv_prog_QMAKE+:} false; then :
4157 $as_echo_n "(cached) " >&6
4158 else
4159 if test -n "$QMAKE"; then
4160 ac_cv_prog_QMAKE="$QMAKE" # Let the user override the test.
4161 else
4162 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4163 for as_dir in $QTDIR/bin/
4164 do
4165 IFS=$as_save_IFS
4166 test -z "$as_dir" && as_dir=.
4167 for ac_exec_ext in '' $ac_executable_extensions; do
4168 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4169 ac_cv_prog_QMAKE="$QTDIR/bin/qt5-qmake"
4170 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4171 break 2
4172 fi
4173 done
4174 done
4175 IFS=$as_save_IFS
4176
4177 fi
4178 fi
4179 QMAKE=$ac_cv_prog_QMAKE
4180 if test -n "$QMAKE"; then
4181 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE" >&5
4182 $as_echo "$QMAKE" >&6; }
4183 else
4184 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4185 $as_echo "no" >&6; }
4186 fi
4187
4188
4189 fi
4190 if test x$QMAKE = x ; then
4152 # Extract the first word of "qmake", so it can be a program name with args. 4191 # Extract the first word of "qmake", so it can be a program name with args.
4153 set dummy qmake; ac_word=$2 4192 set dummy qmake; ac_word=$2
4154 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4193 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4155 $as_echo_n "checking for $ac_word... " >&6; } 4194 $as_echo_n "checking for $ac_word... " >&6; }
4156 if ${ac_cv_prog_QMAKE+:} false; then : 4195 if ${ac_cv_prog_QMAKE+:} false; then :
4243 IFS=$as_save_IFS 4282 IFS=$as_save_IFS
4244 test -z "$as_dir" && as_dir=. 4283 test -z "$as_dir" && as_dir=.
4245 for ac_exec_ext in '' $ac_executable_extensions; do 4284 for ac_exec_ext in '' $ac_executable_extensions; do
4246 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4285 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4247 ac_cv_prog_QMAKE="qmake-qt5" 4286 ac_cv_prog_QMAKE="qmake-qt5"
4287 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4288 break 2
4289 fi
4290 done
4291 done
4292 IFS=$as_save_IFS
4293
4294 fi
4295 fi
4296 QMAKE=$ac_cv_prog_QMAKE
4297 if test -n "$QMAKE"; then
4298 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE" >&5
4299 $as_echo "$QMAKE" >&6; }
4300 else
4301 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4302 $as_echo "no" >&6; }
4303 fi
4304
4305
4306 fi
4307 if test x$QMAKE = x ; then
4308 # Extract the first word of "qt5-qmake", so it can be a program name with args.
4309 set dummy qt5-qmake; ac_word=$2
4310 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4311 $as_echo_n "checking for $ac_word... " >&6; }
4312 if ${ac_cv_prog_QMAKE+:} false; then :
4313 $as_echo_n "(cached) " >&6
4314 else
4315 if test -n "$QMAKE"; then
4316 ac_cv_prog_QMAKE="$QMAKE" # Let the user override the test.
4317 else
4318 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4319 for as_dir in $PATH
4320 do
4321 IFS=$as_save_IFS
4322 test -z "$as_dir" && as_dir=.
4323 for ac_exec_ext in '' $ac_executable_extensions; do
4324 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4325 ac_cv_prog_QMAKE="qt5-qmake"
4248 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4326 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4249 break 2 4327 break 2
4250 fi 4328 fi
4251 done 4329 done
4252 done 4330 done