[silo-llnl] 66/96: switch back to qt4. Add QtCore directory to inc path

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit 456c904893b3546c2d68a62cbb1582f085b13466
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Mar 6 06:52:20 2014 +0000

    switch back to qt4. Add QtCore directory to inc path
---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 2c33dd9..77db258 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ override_dh_autoreconf:
 	dh_autoreconf --as-needed
 
 override_dh_auto_configure:
-	LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib  --with-qt-include=/usr/include/qt5 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I/usr/include/qt5 -I/usr/include/qt5/QtWidgets -I$(MPI_INC) $(CPPFLAGS)"  CC=$(CC)  CFLAGS="$(CFLAGS)"
+	LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib  --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I/usr/include/qt4 -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtCore -I$(MPI_INC) $(CPPFLAGS)"  CC=$(CC)  CFLAGS="$(CFLAGS)"
 
 override_dh_auto_build:
 	dh_auto_build
@@ -34,7 +34,7 @@ override_dh_auto_build:
 		 LDFLAGS=" -Wl,--as-needed $(LDFLAGS)" dh_auto_configure -- \
 			--enable-pythonmodule --enable-silex \
 			--with-qt=/usr --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib \
-			--with-qt-include=/usr/include/qt5 \
+			--with-qt-include=/usr/include/qt4 \
 			 --with-hdf5=/usr/include,/usr/lib PYTHON=$$p CPPFLAGS=" -I$(MPI_INC) $(CPPFLAGS)" CC=$(CC)  CFLAGS="$(CFLAGS)" ; \
 		$(MAKE) -C tools/browser CXX=$(CC) ; \
 		$(MAKE) -C tools/python ; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git