DELTA 28507 0 1308
SVN  §&¨L‚7€‚7 XK ˆ=ži# Detect Qt5 headers and libraries and set flag variables

AC_ARG_VAR([MOCCMD], [QT 5 moc command (autodetected it if not set)])

AC_DEFUN([FC_QT5],
[
  if test "x$fc_qt5_usable" = "x" ; then
    case $host_os in 
    darwin*) FC_QT5_DARWIN;;
    *) FC_QT5_GENERIC;;
    esac
  fi
])
 

AC_DEFUN([FC_QT5_GENERICENDREP
DELTA 27213 0 473
SVN  ™;h7 ƒI Š qƒI¢ …ŽO‹ …d“W bootstrap =	autogen.sh 			\
		configure.ac	5-darwin.m4ENDREP
DELTA
SVN   ”Y”Y€”Y# Detect Qt5 headers and libraries and set flag variables for Mac OS X 10.10+

AC_DEFUN([FC_QT5_DARWIN],
[

  AC_MSG_CHECKING([Qt5 framework])

  AC_ARG_WITH([qt5_framework_bin],
    AS_HELP_STRING([--with-qt5-framework-bin], [path to binares of Qt5 framework (MacOS X, autodetected if wasn't specified)]))
  
  if test "x$qt5_framework_bin" = "x" ; then
    qt5_framework_bin="$(qtpaths --binaries-dir)"
  fi
  qt5_path="$(qtpaths --install-prefix)"

  if test "x$qt5_path" != "x" ; then
    AC_LANG_PUSH([C++])
    FC_QT5_DARWIN_COMPILETEST([$qt5_path])
    if test "x$qt5_headers" = "xyes" ; then
      FC_QT5_DARWIN_LINKTEST([$qt5_path])
    else
      fc_qt5_usable=false
    fi
    AC_LANG_POP([C++])

    if test "x$qt5_libs" = "xyes" ; then
      MOCCMD="$qt5_framework_bin/moc"
      AS_IF([test -x $MOCCMD], [fc_qt5_usable=true], [fc_qt5_usable=false])
    else
      fc_qt5_usable=false
    fi
  fi
  
  if test "x$fc_qt5_usable" = "xtrue" ; then
    AC_MSG_RESULT([found])
  else
    AC_MSG_RESULT([not found])
  fi
  
])

dnl Test if Qt headers are found from given path
AC_DEFUN([FC_QT5_DARWIN_COMPILETEST],
[
  CPPFADD=" -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I$1/lib/QtWidgets.framework/Versions/5/Headers -I$1/lib/QtGui.framework/Versions/5/Headers -I$1/lib/QtCore.framework/Versions/5/Headers -I. -I$1/mkspecs/macx-clang -F$1/lib "

  CPPFLAGS_SAVE="$CPPFLAGS"
  CPPFLAGS="${CPPFLAGS}${CPPFADD}"
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <QApplication>]],
[[int a; QApplication app(a, 0);]])],
    [qt5_headers=yes
     FC_QT5_CPPFLAGS="${FC_QT5_CPPFLAGS}${CPPFADD}"],
    [CXXFLAGS_SAVE="${CXXFLAGS}"
     CXXFLAGS="${CXXFLAGS} -fPIC"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <QApplication>]],
[[int a; QApplication app(a, 0);]])],
      [qt5_headers=yes
       FC_QT5_CPPFLAGS="${FC_QT5_CPPFLAGS}${CPPFADD}"
       FC_QT5_CXXFLAGS="${FC_QT5_CXXFLAGS} -fPIC"])
     CXXFLAGS="${CXXFLAGS_SAVE}"])

  CPPFLAGS="$CPPFLAGS_SAVE"
])

dnl Test Qt application linking with current flags
AC_DEFUN([FC_QT5_DARWIN_LINKTEST],
[
  LIBSADD=" -F$1/lib -framework QtWidgets -framework QtGui -framework QtCore -framework DiskArbitration -framework IOKit -framework OpenGL -framework AGL"

  CPPFLAGS_SAVE="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS $FC_QT5_CPPFLAGS"
  CXXFLAGS_SAVE="$CXXFLAGS"
  CXXFLAGS="$CXXFLAGS $FC_QT5_CXXFLAGS"
  LIBS_SAVE="$LIBS"
  LIBS="${LIBS}${LIBSADD}"
  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <QApplication>]],
[[int a; QApplication app(a, 0);]])],
[qt5_libs=yes
 FC_QT5_LIBS="${FC_QT5_LIBS}${LIBSADD}"])
 LIBS="$LIBS_SAVE"
 CPPFLAGS="${CPPFLAGS_SAVE}"
 CXXFLAGS="${CXXFLAGS_SAVE}"
])

ENDREP
id: 59.5qi.r29105/3150
type: file
pred: 59.5qi.r28501/5905
count: 122
text: 29105 361 88 2152 37de4196ac177a43fb34adfbd41ff78f
props: 10336 4357 111 0 910e8d1010fade384d0a5659f339617e
cpath: /branches/S2_6/Makefile.am
copyroot: 27474 /branches/S2_6

id: 1tp7.5qi.r29105/3400
type: file
count: 0
text: 29105 474 2663 2649 ad1b5b7c3ea414c76dd223d7c6d8606a
cpath: /branches/S2_6/m4/qt5-darwin.m4
copyroot: 27474 /branches/S2_6

id: tqz.5qi.r29105/3575
type: file
pred: tqz.5qi.r28507/1334
count: 7
text: 29105 0 335 5196 e5bd86aaf4426448848f887beaa54861
cpath: /branches/S2_6/m4/qt5.m4
copyroot: 27474 /branches/S2_6

PLAIN
K 8
c++11.m4
V 24
file 18ql.5qi.r28663/655
K 6
c11.m4
V 26
file 17mb.5ck.r25768/35598
K 6
c99.m4
V 23
file 2ez.5qi.r28883/698
K 10
codeset.m4
V 25
file 4es.5ck.r25335/14690
K 11
compiler.m4
V 23
file 4dr.5ck.r20699/340
K 8
debug.m4
V 23
file 158.5qi.r28227/950
K 13
fcdb-mysql.m4
V 25
file 6kl.5ck.r25193/13434
K 16
fcdb-postgres.m4
V 23
file 6km.5qi.r29036/112
K 15
fcdb-sqlite3.m4
V 25
file 6kn.5ck.r25193/14225
K 11
features.m4
V 23
file ug2.5ck.r26253/259
K 12
freetype2.m4
V 22
file 2e2.5ck.r27413/71
K 10
gettext.m4
V 26
file 19jq.5ck.r25866/39558
K 15
gettimeofday.m4
V 25
file 16o.5ck.r19659/29370
K 8
gprof.m4
V 25
file 4jy.5ck.r24590/11309
K 10
gtk-2.0.m4
V 24
file 12w.5qi.r28227/1200
K 10
gtk-3.0.m4
V 23
file 6zi.5qi.r28227/755
K 14
gtk2-client.m4
V 25
file 19f.5ck.r25193/12590
K 14
gtk3-client.m4
V 24
file 6zj.5ck.r26104/4313
K 8
iconv.m4
V 24
file 12y.5qi.r28825/9667
K 9
lib-ld.m4
V 25
file 4e4.5ck.r25335/15243
K 11
lib-link.m4
V 25
file 4e5.5ck.r25335/14871
K 13
lib-prefix.m4
V 25
file 4e6.5ck.r25335/15056
K 9
locale.m4
V 23
file 2cp.5ck.r25389/467
K 13
magickwand.m4
V 24
file 6nb.5ck.r24590/8866
K 20
mapimg-magickwand.m4
V 23
file 6nc.5ck.r25643/168
K 8
mysql.m4
V 23
file 6ko.5ck.r25662/384
K 6
nls.m4
V 26
file 19js.5ck.r25866/39403
K 12
no-client.m4
V 25
file 2cq.5ck.r15640/16763
K 6
pkg.m4
V 24
file 45j.5ck.r22101/3167
K 5
po.m4
V 25
file 19jt.5qi.r28825/9917
K 11
postgres.m4
V 25
file 6kp.5ck.r25193/14829
K 11
progtest.m4
V 26
file 19ju.5ck.r25866/39091
K 12
qt-client.m4
V 23
file 6k7.5ck.r26897/857
K 13
qt5-darwin.m4
V 25
file 1tp7.5qi.r29105/3400
K 6
qt5.m4
V 24
file tqz.5qi.r29105/3575
K 11
readline.m4
V 23
file 133.5ck.r25028/237
K 13
sdl-client.m4
V 23
file 16v.5ck.r26932/591
K 6
sdl.m4
V 24
file 13j.5ck.r24590/9049
K 14
sdl2-client.m4
V 23
file qkc.5ck.r26993/206
K 7
sdl2.m4
V 23
file qwv.5ck.r26294/661
K 8
sound.m4
V 23
file 14o.5ck.r26911/421
K 10
sqlite3.m4
V 23
file 6kq.5ck.r25662/794
K 12
vsnprintf.m4
V 25
file 134.5ck.r21754/19854
K 13
web-client.m4
V 24
file n5w.5qi.r27800/1052
K 4
x.m4
V 23
file 14b.59m.r25662/558
K 13
xaw-client.m4
V 25
file 2j4.5ck.r25193/13798
END
ENDREP
id: 12p.5qi.r29105/5906
type: dir
pred: 12p.5qi.r29036/2400
count: 251
text: 29105 3765 2128 2128 3ed4f3e6d417ff13349c4000d397ae5d
props: 17175 0 94 0 b7d1f67a2107948335edc0c95b3e2bf5
cpath: /branches/S2_6/m4
copyroot: 27474 /branches/S2_6

PLAIN
K 9
ABOUT-NLS
V 24
file fu.5ck.r27270/69307
K 7
AUTHORS
V 24
file 5u.5ck.r22143/14016
K 7
COPYING
V 19
file 1h.0.r9643/400
K 9
ChangeLog
V 26
file 6l.5ck.r27473/7455495
K 7
INSTALL
V 23
file 6.5qi.r29069/19127
K 11
Makefile.am
V 23
file 59.5qi.r29105/3150
K 4
NEWS
V 24
file 6m.5ck.r25634/30702
K 6
README
V 20
file 7.0.r4421/96382
K 2
ai
V 22
dir 8.5qi.r29067/44271
K 10
autogen.sh
V 24
file 12o.5ck.r25794/4003
K 9
bootstrap
V 23
dir 2p5.5qi.r28598/3780
K 6
client
V 21
dir d.5qi.r29081/7981
K 6
common
V 21
dir p.5qi.r29098/6174
K 12
configure.ac
V 23
file 149.5qi.r29004/732
K 4
data
V 21
dir w.5qi.r29068/7571
K 12
dependencies
V 23
dir 2yu.5qi.r28830/5992
K 3
doc
V 22
dir k7.5qi.r29068/3139
K 10
fc_version
V 25
file 2lo.5qj.r29067/44513
K 11
gen_headers
V 24
dir 1hsw.5qi.r28587/4510
K 2
m4
V 23
dir 12p.5qi.r29105/5906
K 7
scripts
V 23
dir 2yo.5qi.r28717/5437
K 6
server
V 21
dir z.5qi.r29101/6219
K 5
tests
V 22
dir 2g9.5ck.r27023/734
K 5
tools
V 23
dir 4pj.5qp.r29029/2315
K 12
translations
V 22
dir t0a.5qi.r28956/840
K 7
utility
V 22
dir 1c.5qi.r28758/4379
K 3
vms
V 25
dir u9.5ck.r21528/1396085
K 5
win32
V 23
dir 2eu.5qi.r28346/1712
END
ENDREP
id: 3.5qi.r29105/7312
type: dir
pred: 3.5qi.r29101/7629
count: 19456
text: 29105 6147 1152 1152 66d29a93b2cb8277ad2e3e7064ed5d1e
props: 28037 14463 292 0 9e1d5de0253c723466868990c52c129f
cpath: /branches/S2_6
copyroot: 27474 /branches/S2_6

PLAIN
K 5
S1_14
V 21
dir 3.21.r18109/18803
K 4
S2_0
V 21
dir 3.10x.r21862/4178
K 4
S2_1
V 22
dir 3.59e.r20026/11014
K 4
S2_2
V 21
dir 3.5cy.r21861/5036
K 4
S2_3
V 21
dir 3.5f2.r24391/5183
K 4
S2_4
V 21
dir 3.5ii.r29087/6492
K 4
S2_5
V 21
dir 3.5kv.r29102/5615
K 4
S2_6
V 21
dir 3.5qi.r29105/7312
K 11
freeciv-web
V 22
dir 3.5bl.r13594/14918
END
ENDREP
id: 1.0.r29105/7905
type: dir
pred: 1.0.r29102/6207
count: 9388
text: 29105 7553 339 339 e11881eceb930133c39369a6eee54b5d
cpath: /branches
copyroot: 0 /

PLAIN
K 8
branches
V 19
dir 1.0.r29105/7905
K 4
tags
V 19
dir 2.0.r28528/6475
K 5
trunk
V 21
dir 3.5ck.r29104/7161
K 7
website
V 21
dir 3ge.0.r22980/2263
END
ENDREP
id: 0.0.r29105/8224
type: dir
pred: 0.0.r29104/7552
count: 29105
text: 29105 8059 152 152 a4443f9aa5c93b8a2fea788c22c40c4f
cpath: /
copyroot: 0 /

tqz.5qi.t29104-1 modify true false /branches/S2_6/m4/qt5.m4

59.5qi.t29104-1 modify true false /branches/S2_6/Makefile.am

_3.5qi.t29104-1 add true false /branches/S2_6/m4/qt5-darwin.m4


8224 8371