comparison configure @ 793:cefc9763dc0c qt5

Regenerate configure
author Chris Cannam
date Fri, 26 Apr 2013 16:37:55 +0100
parents f5aeda36d5bd
children dc20458f6f85
comparison
equal deleted inserted replaced
792:a98af74f8e2f 793:cefc9763dc0c
3963 3963
3964 3964
3965 3965
3966 3966
3967 if test x$QMAKE = x ; then 3967 if test x$QMAKE = x ; then
3968 # Extract the first word of "qmake-qt4", so it can be a program name with args. 3968 # Extract the first word of "qmake-qt5", so it can be a program name with args.
3969 set dummy qmake-qt4; ac_word=$2 3969 set dummy qmake-qt5; ac_word=$2
3970 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3970 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3971 $as_echo_n "checking for $ac_word... " >&6; } 3971 $as_echo_n "checking for $ac_word... " >&6; }
3972 if ${ac_cv_prog_QMAKE+:} false; then : 3972 if ${ac_cv_prog_QMAKE+:} false; then :
3973 $as_echo_n "(cached) " >&6 3973 $as_echo_n "(cached) " >&6
3974 else 3974 else
3980 do 3980 do
3981 IFS=$as_save_IFS 3981 IFS=$as_save_IFS
3982 test -z "$as_dir" && as_dir=. 3982 test -z "$as_dir" && as_dir=.
3983 for ac_exec_ext in '' $ac_executable_extensions; do 3983 for ac_exec_ext in '' $ac_executable_extensions; do
3984 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3984 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3985 ac_cv_prog_QMAKE="$QTDIR/bin/qmake-qt4" 3985 ac_cv_prog_QMAKE="$QTDIR/bin/qmake-qt5"
3986 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3986 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3987 break 2 3987 break 2
3988 fi 3988 fi
3989 done 3989 done
3990 done 3990 done
4080 fi 4080 fi
4081 4081
4082 4082
4083 fi 4083 fi
4084 if test x$QMAKE = x ; then 4084 if test x$QMAKE = x ; then
4085 # Extract the first word of "qmake-qt4", so it can be a program name with args. 4085 # Extract the first word of "qmake-qt5", so it can be a program name with args.
4086 set dummy qmake-qt4; ac_word=$2 4086 set dummy qmake-qt5; ac_word=$2
4087 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4087 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4088 $as_echo_n "checking for $ac_word... " >&6; } 4088 $as_echo_n "checking for $ac_word... " >&6; }
4089 if ${ac_cv_prog_QMAKE+:} false; then : 4089 if ${ac_cv_prog_QMAKE+:} false; then :
4090 $as_echo_n "(cached) " >&6 4090 $as_echo_n "(cached) " >&6
4091 else 4091 else
4097 do 4097 do
4098 IFS=$as_save_IFS 4098 IFS=$as_save_IFS
4099 test -z "$as_dir" && as_dir=. 4099 test -z "$as_dir" && as_dir=.
4100 for ac_exec_ext in '' $ac_executable_extensions; do 4100 for ac_exec_ext in '' $ac_executable_extensions; do
4101 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4101 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4102 ac_cv_prog_QMAKE="qmake-qt4" 4102 ac_cv_prog_QMAKE="qmake-qt5"
4103 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4103 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4104 break 2 4104 break 2
4105 fi 4105 fi
4106 done 4106 done
4107 done 4107 done
4159 4159
4160 4160
4161 fi 4161 fi
4162 if test x$QMAKE = x ; then 4162 if test x$QMAKE = x ; then
4163 as_fn_error $? " 4163 as_fn_error $? "
4164 Failed to find the required qmake-qt4 or qmake program. Please 4164 Failed to find the required qmake-qt5 or qmake program. Please
4165 ensure you have the necessary Qt4 development files installed, and 4165 ensure you have the necessary Qt5 development files installed, and
4166 if necessary set QTDIR to the location of your Qt4 installation. 4166 if necessary set QTDIR to the location of your Qt5 installation.
4167 " "$LINENO" 5 4167 " "$LINENO" 5
4168 fi 4168 fi
4169 4169
4170 # Suitable versions of qmake should print out something like: 4170 # Suitable versions of qmake should print out something like:
4171 # 4171 #
4175 # This may be translated, so we check only for the numbers (2.x and 4.x 4175 # This may be translated, so we check only for the numbers (2.x and 4.x
4176 # in that order). 4176 # in that order).
4177 # 4177 #
4178 QMAKE_VERSION_OUTPUT=`$QMAKE -v` 4178 QMAKE_VERSION_OUTPUT=`$QMAKE -v`
4179 case "$QMAKE_VERSION_OUTPUT" in 4179 case "$QMAKE_VERSION_OUTPUT" in
4180 *2.*4.*) ;; 4180 *5.*) ;;
4181 *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 4181 *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
4182 *** The version of qmake found in \"$QMAKE\" looks like it might be 4182 *** The version of qmake found in \"$QMAKE\" looks like it might be
4183 from the wrong version of Qt (Qt4 is required). Please check 4183 from the wrong version of Qt (Qt5 is required). Please check
4184 that this is the correct version of qmake for Qt4 builds. 4184 that this is the correct version of qmake for Qt5 builds.
4185 " >&5 4185 " >&5
4186 $as_echo "$as_me: WARNING: 4186 $as_echo "$as_me: WARNING:
4187 *** The version of qmake found in \"$QMAKE\" looks like it might be 4187 *** The version of qmake found in \"$QMAKE\" looks like it might be
4188 from the wrong version of Qt (Qt4 is required). Please check 4188 from the wrong version of Qt (Qt5 is required). Please check
4189 that this is the correct version of qmake for Qt4 builds. 4189 that this is the correct version of qmake for Qt5 builds.
4190 " >&2;} 4190 " >&2;}
4191 esac 4191 esac
4192 4192
4193 case "`uname`" in 4193 case "`uname`" in
4194 *Darwin*) QMAKE="$QMAKE -spec macx-g++";; 4194 *Darwin*) QMAKE="$QMAKE -spec macx-g++";;