From e0927e9c47032e4f2742811fd482bd0cbb04800c Mon Sep 17 00:00:00 2001
From: Alex Montgomery <apmontgo@users.sourceforge.net>
Date: Sat, 14 May 2011 20:20:49 +0100
Subject: [PATCH] fixed QT dependencies and configure target

---
 configure    | 58 ++++++++++++++++++++++++++++++----------------------------
 configure.ac | 50 ++++++++++++++++++++++++++------------------------
 2 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/configure b/configure
index b0a2c7a..f4aafab 100755
--- a/configure
+++ b/configure
@@ -3907,6 +3907,7 @@ ac_libs="$ac_libs $REQUIREDPKGS_LIBS"
 ac_pkgs="alsa jack"
 
 # Check for proper Qt version.
+if test "x$ac_build_qjackmmc" = "xyes"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT_UP_TO_DATE" >&5
@@ -3916,12 +3917,12 @@ if test -n "$QT_UP_TO_DATE_CFLAGS"; then
     pkg_cv_QT_UP_TO_DATE_CFLAGS="$QT_UP_TO_DATE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "QtCore >= 4.2") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "QtCore >= 4.4") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_QT_UP_TO_DATE_CFLAGS=`$PKG_CONFIG --cflags "QtCore >= 4.2" 2>/dev/null`
+  pkg_cv_QT_UP_TO_DATE_CFLAGS=`$PKG_CONFIG --cflags "QtCore >= 4.4" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -3932,12 +3933,12 @@ if test -n "$QT_UP_TO_DATE_LIBS"; then
     pkg_cv_QT_UP_TO_DATE_LIBS="$QT_UP_TO_DATE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "QtCore >= 4.2") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "QtCore >= 4.4") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_QT_UP_TO_DATE_LIBS=`$PKG_CONFIG --libs "QtCore >= 4.2" 2>/dev/null`
+  pkg_cv_QT_UP_TO_DATE_LIBS=`$PKG_CONFIG --libs "QtCore >= 4.4" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -3957,9 +3958,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        QT_UP_TO_DATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "QtCore >= 4.2" 2>&1`
+	        QT_UP_TO_DATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "QtCore >= 4.4" 2>&1`
         else
-	        QT_UP_TO_DATE_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtCore >= 4.2" 2>&1`
+	        QT_UP_TO_DATE_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtCore >= 4.4" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$QT_UP_TO_DATE_PKG_ERRORS" >&5
@@ -3977,11 +3978,11 @@ $as_echo "yes" >&6; }
 
 fi
 
-# A common error message:
-ac_errmsg="not found in current PATH. Maybe QT development environment isn't available (qt-devel). QJackMMC cannot be built."
+   # A common error message:
+   ac_errmsg="not found in current PATH. Maybe QT development environment isn't available (qt-devel). QJackMMC cannot be built."
 
-# Check for Qt qmake utility.
-# Extract the first word of "qmake", so it can be a program name with args.
+   # Check for Qt qmake utility.
+   # 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; }
@@ -4022,15 +4023,15 @@ $as_echo "no" >&6; }
 fi
 
 
-if test "x$ac_qmake" = "xno"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** qmake $ac_errmsg" >&5
+   if test "x$ac_qmake" = "xno"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** qmake $ac_errmsg" >&5
 $as_echo "$as_me: WARNING: *** qmake $ac_errmsg" >&2;}
-   ac_build_qjackmmc="no"
-fi
+      ac_build_qjackmmc="no"
+   fi
 
 
-# Check for Qt moc utility.
-# Extract the first word of "moc", so it can be a program name with args.
+   # Check for Qt moc utility.
+   # Extract the first word of "moc", so it can be a program name with args.
 set dummy moc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -4071,15 +4072,15 @@ $as_echo "no" >&6; }
 fi
 
 
-if test "x$ac_moc" = "xno"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** moc $ac_errmsg" >&5
+   if test "x$ac_moc" = "xno"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** moc $ac_errmsg" >&5
 $as_echo "$as_me: WARNING: *** moc $ac_errmsg" >&2;}
-   ac_build_qjackmmc="no"
-fi
+      ac_build_qjackmmc="no"
+   fi
 
 
-# Check for Qt uic utility.
-# Extract the first word of "uic", so it can be a program name with args.
+   # Check for Qt uic utility.
+   # Extract the first word of "uic", so it can be a program name with args.
 set dummy uic; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -4120,12 +4121,13 @@ $as_echo "no" >&6; }
 fi
 
 
-if test "x$ac_uic" = "xno"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** uic $ac_errmsg" >&5
+   if test "x$ac_uic" = "xno"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** uic $ac_errmsg" >&5
 $as_echo "$as_me: WARNING: *** uic $ac_errmsg" >&2;}
-   ac_build_qjackmmc="no"
-fi
+      ac_build_qjackmmc="no"
+   fi
 
+fi # ac_build_qjackmmc
 
 if test "x$ac_build_qjackmmc" = "xyes"; then
 
diff --git a/configure.ac b/configure.ac
index d6b37be..af7fe16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,34 +118,36 @@ ac_libs="$ac_libs $REQUIREDPKGS_LIBS"
 ac_pkgs="alsa jack"
 
 # Check for proper Qt version.
-PKG_CHECK_MODULES(QT_UP_TO_DATE, [QtCore >= 4.2], [], [ac_build_qjackmmc="no"])
+if test "x$ac_build_qjackmmc" = "xyes"; then
+   PKG_CHECK_MODULES(QT_UP_TO_DATE, [QtCore >= 4.4], [], [ac_build_qjackmmc="no"])
 
-# A common error message:
-ac_errmsg="not found in current PATH. Maybe QT development environment isn't available (qt-devel). QJackMMC cannot be built."
+   # A common error message:
+   ac_errmsg="not found in current PATH. Maybe QT development environment isn't available (qt-devel). QJackMMC cannot be built."
 
-# Check for Qt qmake utility.
-AC_PATH_PROG(ac_qmake, qmake, [no], $ac_path)
-if test "x$ac_qmake" = "xno"; then
-   AC_MSG_WARN([*** qmake $ac_errmsg])
-   ac_build_qjackmmc="no"
-fi
-AC_SUBST(ac_qmake)
+   # Check for Qt qmake utility.
+   AC_PATH_PROG(ac_qmake, qmake, [no], $ac_path)
+   if test "x$ac_qmake" = "xno"; then
+      AC_MSG_WARN([*** qmake $ac_errmsg])
+      ac_build_qjackmmc="no"
+   fi
+   AC_SUBST(ac_qmake)
 
-# Check for Qt moc utility.
-AC_PATH_PROG(ac_moc, moc, [no], $ac_path)
-if test "x$ac_moc" = "xno"; then
-   AC_MSG_WARN([*** moc $ac_errmsg])
-   ac_build_qjackmmc="no"
-fi
-AC_SUBST(ac_moc)
+   # Check for Qt moc utility.
+   AC_PATH_PROG(ac_moc, moc, [no], $ac_path)
+   if test "x$ac_moc" = "xno"; then
+      AC_MSG_WARN([*** moc $ac_errmsg])
+      ac_build_qjackmmc="no"
+   fi
+   AC_SUBST(ac_moc)
 
-# Check for Qt uic utility.
-AC_PATH_PROG(ac_uic, uic, [no], $ac_path)
-if test "x$ac_uic" = "xno"; then
-   AC_MSG_WARN([*** uic $ac_errmsg])
-   ac_build_qjackmmc="no"
-fi
-AC_SUBST(ac_uic)
+   # Check for Qt uic utility.
+   AC_PATH_PROG(ac_uic, uic, [no], $ac_path)
+   if test "x$ac_uic" = "xno"; then
+      AC_MSG_WARN([*** uic $ac_errmsg])
+      ac_build_qjackmmc="no"
+   fi
+   AC_SUBST(ac_uic)
+fi # ac_build_qjackmmc
 
 if test "x$ac_build_qjackmmc" = "xyes"; then
    AC_DEFINE(ENABLE_QJACKMMC, 1, [Define if QJackMMC can be built.])
-- 
2.11.4.GIT