From: Wolfgang Bangerth Date: Mon, 20 Dec 2010 23:30:10 +0000 (+0000) Subject: First step towards a functioning Qt detection. X-Git-Tag: v8.0.0~4621 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef35e0c65a8d46fde6a4e444aaa482b0a95ee30b;p=dealii.git First step towards a functioning Qt detection. git-svn-id: https://svn.dealii.org/trunk@23038 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index abea443107..07fad1316b 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -43,6 +43,7 @@ F77LIBS = @F77LIBS@ LIBS = @LIBS@ LIBDIR = $D/lib PERL = @PERL@ +QMAKE = @QMAKE@ enable-threads = @enablethreads@ enable-shared = @enableshared@ enable-parser = @enableparser@ diff --git a/deal.II/configure b/deal.II/configure index 838b9d0b90..74a3dc6ae5 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -602,6 +602,7 @@ ac_subst_vars='LTLIBOBJS LIBOBJS LDFLAGSPIC subdirs +QMAKE PERL DEAL_II_HAVE_DOT DOXYGEN_OPTIONS @@ -12917,6 +12918,86 @@ fi +# Extract the first word of "qmake", so it can be a program name with args. +set dummy qmake; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_QMAKE+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$QMAKE"; then + ac_cv_prog_QMAKE="$QMAKE" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_QMAKE="qmake" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +QMAKE=$ac_cv_prog_QMAKE +if test -n "$QMAKE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE" >&5 +$as_echo "$QMAKE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test -n "$QMAKE" ; then + # Extract the first word of "$QMAKE", so it can be a program name with args. +set dummy $QMAKE; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_QMAKE+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $QMAKE in + [\\/]* | ?:[\\/]*) + ac_cv_path_QMAKE="$QMAKE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_QMAKE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +QMAKE=$ac_cv_path_QMAKE +if test -n "$QMAKE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE" >&5 +$as_echo "$QMAKE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi + diff --git a/deal.II/configure.in b/deal.II/configure.in index 6fab2c43b4..9263fdb021 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -667,6 +667,15 @@ AC_PATH_PROG(PERL, perl) AC_SUBST(PERL) +dnl Check for the Qt library and associated programs. We need those for +dnl the parameter GUI program in contrib/parameter_gui +AC_CHECK_PROG(QMAKE,qmake,qmake) +if test -n "$QMAKE" ; then + AC_PATH_PROG(QMAKE,$QMAKE) + + dnl Verify that Qt version is at least 4.3 +fi +AC_SUBST(QMAKE) dnl -------------------------------------------------------------