Author: jfarrell
Date: Fri Jul 27 16:01:33 2012
New Revision: 1366428
URL: http://svn.apache.org/viewvc?rev=1366428&view=rev
Log:
Thrift-1661:Add --with-qt4 configure option
Client: cpp
Patch: Blair Zajac
Adds ability to enable/disable qt4 support.
Modified:
thrift/trunk/configure.ac
Modified: thrift/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/thrift/trunk/configure.ac?rev=1366428&r1=1366427&r2=1366428&view=diff
==============================================================================
--- thrift/trunk/configure.ac (original)
+++ thrift/trunk/configure.ac Fri Jul 27 16:01:33 2012
@@ -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
