DELTA 28588 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 27056 81 637
SVN  •r–% ŒM  …FŒj‹ ~’% l”# c•5-darwin.m4	\
		NEWS-2.5		\
	NEWS-2.5ENDREP
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.5kv.r29106/3136
type: file
pred: 59.5kv.r27141/100
count: 108
text: 29106 361 73 2821 2ebc63e4d5379d447c54b93c0b5bfd1e
props: 10336 4357 111 0 910e8d1010fade384d0a5659f339617e
cpath: /branches/S2_5/Makefile.am
copyroot: 22812 /branches/S2_5

id: 1tpf.5kv.r29106/3385
type: file
count: 0
text: 29106 460 2663 2649 ad1b5b7c3ea414c76dd223d7c6d8606a
cpath: /branches/S2_5/m4/qt5-darwin.m4
copyroot: 22812 /branches/S2_5

id: tr7.5kv.r29106/3560
type: file
pred: tr7.5kv.r28588/1334
count: 7
text: 29106 0 335 5196 e5bd86aaf4426448848f887beaa54861
cpath: /branches/S2_5/m4/qt5.m4
copyroot: 22812 /branches/S2_5

PLAIN
K 14
ac_path_lib.m4
V 25
file 12q.5ck.r19659/29849
K 8
c++11.m4
V 24
file 1gtv.5kv.r28664/282
K 6
c99.m4
V 23
file 2ez.5kv.r28884/698
K 10
codeset.m4
V 25
file 4es.5ck.r21754/19200
K 11
compiler.m4
V 23
file 4dr.5ck.r20699/340
K 8
debug.m4
V 23
file 158.5kv.r24148/193
K 13
fcdb-mysql.m4
V 25
file 6kl.5kv.r25194/38886
K 16
fcdb-postgres.m4
V 23
file 6km.5kv.r29037/112
K 15
fcdb-sqlite3.m4
V 25
file 6kn.5kv.r25194/37129
K 11
features.m4
V 25
file ugf.5kv.r23653/10421
K 12
freetype2.m4
V 23
file 2e2.5ck.r22118/494
K 15
gettimeofday.m4
V 25
file 16o.5ck.r19659/29370
K 6
ggz.m4
V 25
file 399.5kv.r25194/38436
K 15
glib-gettext.m4
V 25
file 12t.5kv.r24848/24739
K 8
gprof.m4
V 23
file 4jy.5ck.r21924/585
K 10
gtk-2.0.m4
V 25
file 12w.5ck.r19659/29611
K 10
gtk-3.0.m4
V 23
file 6zi.5ck.r22687/265
K 14
gtk2-client.m4
V 25
file 19f.5kv.r25194/37979
K 14
gtk3-client.m4
V 25
file 6zj.5kv.r25194/38235
K 8
iconv.m4
V 24
file 12y.5ck.r22244/3548
K 8
imlib.m4
V 25
file 12z.5ck.r19659/27768
K 12
lcmessage.m4
V 25
file 13k.5ck.r21754/20096
K 9
lib-ld.m4
V 25
file 4e4.5bk.r14802/14718
K 11
lib-link.m4
V 25
file 4e5.5ck.r19659/25525
K 13
lib-prefix.m4
V 25
file 4e6.5ck.r19659/28003
K 9
locale.m4
V 25
file 2cp.5ck.r21754/20575
K 13
magickwand.m4
V 24
file 6nb.5ck.r21865/1692
K 20
mapimg-magickwand.m4
V 23
file 6nc.5kv.r25644/168
K 8
mysql.m4
V 23
file 6ko.5kv.r25240/413
K 11
ngettext.m4
V 25
file 131.5ck.r19659/28185
K 12
no-client.m4
V 25
file 2cq.5ck.r15640/16763
K 6
pkg.m4
V 24
file 45j.5ck.r22101/3167
K 11
postgres.m4
V 25
file 6kp.5kv.r25194/37784
K 11
progtest.m4
V 21
file 13l.0.r4453/2479
K 12
qt-client.m4
V 23
file 6k7.5kv.r26898/857
K 5
qt.m4
V 23
file 78p.5ck.r21924/412
K 13
qt5-darwin.m4
V 25
file 1tpf.5kv.r29106/3385
K 6
qt5.m4
V 24
file tr7.5kv.r29106/3560
K 11
readline.m4
V 24
file 133.5kv.r25029/2342
K 13
sdl-client.m4
V 23
file 16v.5kv.r27088/517
K 6
sdl.m4
V 25
file 13j.5ck.r19659/26643
K 7
sdl2.m4
V 24
file sxo.5kv.r23455/8888
K 8
sound.m4
V 25
file 14o.5kv.r23653/10847
K 10
sqlite3.m4
V 25
file 6kq.5kv.r25194/37330
K 12
vsnprintf.m4
V 25
file 134.5ck.r21754/19854
K 13
web-client.m4
V 23
file n5w.5ck.r22636/610
K 4
x.m4
V 25
file 14b.59m.r21754/20338
K 13
xaw-client.m4
V 25
file 2j4.5kv.r25194/39280
END
ENDREP
id: 12p.5kv.r29106/6000
type: dir
pred: 12p.5kv.r29037/2509
count: 209
text: 29106 3750 2237 2237 7f69877ea4e7e64d78bb949a646dab76
props: 17175 0 94 0 b7d1f67a2107948335edc0c95b3e2bf5
cpath: /branches/S2_5/m4
copyroot: 22812 /branches/S2_5

PLAIN
K 9
ABOUT-NLS
V 24
file fu.5kv.r23463/86338
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.5kv.r28526/1139931
K 7
INSTALL
V 21
file 6.5kv.r28850/212
K 11
Makefile.am
V 23
file 59.5kv.r29106/3136
K 4
NEWS
V 22
file 6m.5kv.r28524/894
K 8
NEWS-2.5
V 25
file 1h59.5kv.r28524/1138
K 6
README
V 20
file 7.0.r4421/96382
K 2
ai
V 21
dir 8.5kv.r28989/3528
K 10
autogen.sh
V 23
file 12o.5kv.r24092/228
K 9
bootstrap
V 23
dir 2p5.5kv.r28599/3351
K 6
client
V 21
dir d.5kv.r29082/8466
K 6
common
V 21
dir p.5kv.r29099/5200
K 12
configure.ac
V 23
file 149.5kv.r29005/212
K 4
data
V 22
dir w.5kv.r28937/51887
K 6
debian
V 22
dir 5w.5kv.r23304/4091
K 12
dependencies
V 23
dir 2yu.5kv.r28816/1070
K 11
diff_ignore
V 24
file qq.5ck.r21039/26581
K 3
doc
V 23
dir k7.5kv.r28937/47704
K 10
fc_version
V 22
file 2lo.5kw.r28525/44
K 2
m4
V 23
dir 12p.5kv.r29106/6000
K 7
scripts
V 23
dir 2yo.5kv.r28718/5390
K 6
server
V 21
dir z.5kv.r29102/4129
K 5
tests
V 22
dir 2g9.5kv.r27024/930
K 5
tools
V 23
dir 4pj.5lo.r29030/2274
K 12
translations
V 23
dir t0n.5kv.r28957/9806
K 7
utility
V 23
dir 1c.5kv.r28759/10840
K 3
vms
V 25
dir u9.5ck.r21528/1396085
K 5
win32
V 23
dir 2eu.5kv.r28344/1663
END
ENDREP
id: 3.5kv.r29106/7484
type: dir
pred: 3.5kv.r29102/5615
count: 17945
text: 29106 6241 1230 1230 4c8385a668212c05f1f7a4ec1f7be623
props: 20140 3888 282 0 e4bb46e81629a60eef613b169b23a9ea
cpath: /branches/S2_5
copyroot: 22812 /branches/S2_5

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.r29106/7484
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.r29106/8076
type: dir
pred: 1.0.r29105/7905
count: 9389
text: 29106 7724 339 339 9d1b5c7c7db75ae1201094dd6fe9d7e5
cpath: /branches
copyroot: 0 /

PLAIN
K 8
branches
V 19
dir 1.0.r29106/8076
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.r29106/8395
type: dir
pred: 0.0.r29105/8224
count: 29106
text: 29106 8230 152 152 78faa805846e61b8c6c3d5575d7d2ba4
cpath: /
copyroot: 0 /

tr7.5kv.t29105-1 modify true false /branches/S2_5/m4/qt5.m4

59.5kv.t29105-1 modify true false /branches/S2_5/Makefile.am

_3.5kv.t29105-1 add true false /branches/S2_5/m4/qt5-darwin.m4


8395 8542