public
Description: A mirror of QtWebKit
Homepage: http://trac.webkit.org/projects/webkit/wiki/QtWebKit
Clone URL: git://github.com/tronical/qtwebkit.git
2008-08-09  Marco Barisione  <marco.barisione@collabora.co.uk>

        Reviewed by Alp Toker.

        http://bugs.webkit.org/show_bug.cgi?id=19045
        [gtk] ./configure doesn't check for x toolkit availability

        Some old versions of Xt do not provide xt.pc, in this case use
        AC_CHECK_LIB to check if the library is installed and then fall 
        back
        to using just -lXt.

        * configure.ac:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@35656 
268f45cc-cd09-0410-ab3c-d52691b4dbfc
alp@webkit.org (author)
Sat Aug 09 20:11:28 -0700 2008
commit  f996f49ac0439fac1e4fddfad8d8daac1cff7453
tree    7287b8d1763bae5cf2c2f76dbb32e25090a1b61d
parent  5186e841105cbac26fbe1e87174d3e49c72c92fc
...
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
...
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
0
@@ -1,3 +1,16 @@
0
+2008-08-09 Marco Barisione <marco.barisione@collabora.co.uk>
0
+
0
+ Reviewed by Alp Toker.
0
+
0
+ http://bugs.webkit.org/show_bug.cgi?id=19045
0
+ [gtk] ./configure doesn't check for x toolkit availability
0
+
0
+ Some old versions of Xt do not provide xt.pc, in this case use
0
+ AC_CHECK_LIB to check if the library is installed and then fall back
0
+ to using just -lXt.
0
+
0
+ * configure.ac:
0
+
0
 2008-08-09 Alp Toker <alp@nuanti.com>
0
 
0
         GTK+ build fixes.
...
291
292
293
294
 
 
 
 
 
 
 
 
 
 
 
 
 
295
296
297
...
291
292
293
 
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
0
@@ -291,7 +291,19 @@ AC_SUBST([WEBKITDEPS_LIBS])
0
 # check for Xt if the target is X11
0
 if test "$with_target" = "x11"; then
0
    PKG_CHECK_MODULES([XT],
0
- [xt])
0
+ [xt],
0
+ [xt_has_pkg_config=yes],
0
+ [xt_has_pkg_config=no])
0
+ # some old versions of Xt do not provide xt.pc, so try to link against Xt
0
+ # and if it's installed fall back to just adding -lXt
0
+ if test "$xt_has_pkg_config" = "no"; then
0
+ # using AC_CHECK_LIB instead of AC_SEARCH_LIB is fine in this case as
0
+ # we don't care about the XtOpenDisplay symbol but only about the
0
+ # existence of libXt
0
+ AC_CHECK_LIB([Xt], [XtOpenDisplay],
0
+ [XT_CFLAGS=""; XT_LIBS="-lXt"],
0
+ [AC_MSG_ERROR([X Toolkit Intrinsics library (libXt) not found])])
0
+ fi
0
    AC_SUBST([XT_CFLAGS])
0
    AC_SUBST([XT_LIBS])
0
 fi

Comments

    No one has commented yet.