From: Jake Farrell Date: Fri, 27 Jul 2012 16:01:33 +0000 (+0000) Subject: Thrift-1661:Add --with-qt4 configure option X-Git-Tag: 0.9.1~324 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=d6d3e371034a05f8bc65b97ef8e7ee9035cd5a64;p=common%2Fthrift.git Thrift-1661:Add --with-qt4 configure option Client: cpp Patch: Blair Zajac Adds ability to enable/disable qt4 support. git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1366428 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/configure.ac b/configure.ac index 208bc78a..43904ef7 100755 --- a/configure.ac +++ b/configure.ac @@ -126,7 +126,11 @@ if test "$with_cpp" = "yes"; then AX_LIB_ZLIB([1.2.3]) have_zlib=$success - PKG_CHECK_MODULES([QT], [QtCore >= 4.3, QtNetwork >= 4.3], have_qt=yes, have_qt=no) + AX_THRIFT_LIB(qt4, [Qt], yes) + have_qt=no + if test "$with_qt4" = "yes"; then + PKG_CHECK_MODULES([QT], [QtCore >= 4.3, QtNetwork >= 4.3], have_qt=yes, have_qt=no) + fi if test "$have_qt" = "yes"; then AC_PATH_PROGS([QT_MOC], [moc-qt4 moc]) have_qt=$success