Author: cazfi
Date: Fri Mar 13 06:23:10 2015
New Revision: 28507
URL: http://svn.gna.org/viewcvs/freeciv?rev=28507&view=rev
Log:
Added /usr/include/qt to includep patch Qt is searched from automatically, and
/usr/lib/qt to lib paths.
Reported by stelonix
See patch #5919
Modified:
branches/S2_6/m4/qt5.m4
Modified: branches/S2_6/m4/qt5.m4
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/qt5.m4?rev=28507&r1=28506&r2=28507&view=diff
==============================================================================
--- branches/S2_6/m4/qt5.m4 (original)
+++ branches/S2_6/m4/qt5.m4 Fri Mar 13 06:23:10 2015
@@ -10,7 +10,7 @@
AS_HELP_STRING([--with-qt5-includes], [path to Qt5 includes]),
[FC_QT5_COMPILETEST([$withval])
qt5_hdr_check_finish=true],
-[POTENTIAL_PATHS="/usr/include /usr/include/qt5"
+[POTENTIAL_PATHS="/usr/include /usr/include/qt5 /usr/include/qt"
if test "x$qt5_hdr_check_finish" != "xtrue" ; then
# search multiarch paths too (if the multiarch tuple can be found)
@@ -36,7 +36,7 @@
AS_HELP_STRING([--with-qt5-libs], [path to Qt5 libraries]),
[FC_QT5_LINKTEST([$withval])
qt5_lib_check_finish=true],
-[POTENTIAL_PATHS="/usr/lib/qt5"
+[POTENTIAL_PATHS="/usr/lib/qt5 /usr/lib/qt"
if test "x$qt5_lib_check_finish" != "xtrue" ; then
# search multiarch paths too (if the multiarch tuple can be found)
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
