Changeset 35570 in webkit

Timestamp:

Aug 5, 2008 2:33:35 PM (16 years ago)

Author:

alp@webkit.org

Message:

2008-08-05 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

Check for the .pc file for Xt instead of hard coding -lXt in the
GNUmakefile.am.

Thanks to Dominik Röttsches for the initial patch.

• GNUmakefile.am:
• configure.ac:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (4 diffs)
• configure.ac (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2008-08-05  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
+
+        Check for the .pc file for Xt instead of hard coding -lXt in the
+        GNUmakefile.am.
+
+        Thanks to Dominik Röttsches for the initial patch.
+
+        * GNUmakefile.am:
+        * configure.ac:
+
 2008-07-30  Marco Barisione  <marco.barisione@collabora.co.uk>
 

trunk/GNUmakefile.am

@@ -172 +172 @@
         $(UNICODE_CFLAGS) \
         $(WEBKITDEPS_CFLAGS) \
+        $(XT_CFLAGS) \
         $(LIBCURL_CFLAGS) \
         $(LIBSOUP_CFLAGS) \
@@ -188 +189 @@
         $(UNICODE_CFLAGS) \
         $(WEBKITDEPS_CFLAGS) \
+        $(XT_CFLAGS) \
         $(LIBCURL_CFLAGS) \
         $(LIBSOUP_CFLAGS) \
@@ -209 +211 @@
         $(GLOBALDEPS_LIBS) \
         $(WEBKITDEPS_LIBS) \
+        $(XT_LIBS) \
         $(LIBCURL_LIBS) \
         $(LIBSOUP_LIBS) \
@@ -273 +276 @@
 if TARGET_X11
 global_cppflags += -DXP_UNIX
-webcore_libadd += -lXt
 endif
 

trunk/configure.ac

@@ -284 +284 @@
 AC_SUBST([WEBKITDEPS_CFLAGS])
 AC_SUBST([WEBKITDEPS_LIBS])
+
+# check for Xt if the target is X11
+if test "$with_target" = "x11"; then
+   PKG_CHECK_MODULES([XT],
+                     [xt])
+   AC_SUBST([XT_CFLAGS])
+   AC_SUBST([XT_LIBS])
+fi
 
 # check whether to build with debugging enabled